diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 73b1050..7a80a23 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,34 +2,17 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="">
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\~$数据库设计说明新需求.docx" afterPath="" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/~$数据库设计说明新需求.docx" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineLengthStatic.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/接口说明新需求.docx" afterPath="$PROJECT_DIR$/接口说明新需求.docx" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainTypeManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainTypeManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources/application.properties" afterPath="$PROJECT_DIR$/src/main/resources/application.properties" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
     </list>
     <ignored path="PgInterface.iws" />
@@ -54,7 +37,67 @@
     <favorites_list name="PgInterface" />
   </component>
   <component name="FileEditorManager">
-    <leaf />
+    <leaf>
+      <file leaf-file-name="PgPipeLineRs.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.0" vertical-offset="2301" max-vertical-offset="3388">
+              <caret line="277" column="9" selection-start-line="277" selection-start-column="9" selection-end-line="277" selection-end-column="9" />
+              <folding>
+                <element signature="method#addLog#0;class#PgPipeLineRs#0" expanded="false" />
+                <element signature="method#editPipeLine#0;class#PgPipeLineRs#0" expanded="false" />
+                <element signature="method#deletePipeLine#0;class#PgPipeLineRs#0" expanded="false" />
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" expanded="false" />
+                <element signature="e#9602#9626#0" expanded="true" />
+                <element signature="e#10329#10337#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="PgPipeLineManager.java" pinned="false" current="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 vertical-scroll-proportion="0.0" vertical-offset="330" max-vertical-offset="1342">
+              <caret line="55" column="42" selection-start-line="55" selection-start-column="42" selection-end-line="55" selection-end-column="42" />
+              <folding>
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" expanded="false" />
+                <element signature="e#1787#1811#0" expanded="true" />
+                <element signature="e#2482#2490#0" expanded="true" />
+                <marker date="1537414540748" expanded="true" signature="1552:1622" placeholder="select LINE_..PG_PIPELINE..." />
+                <marker date="1537414540748" expanded="true" signature="1552:1621" placeholder="select LINE_..PG_PIPELINE..." />
+                <marker date="1537414540748" expanded="true" signature="2310:2352" placeholder="select disti..PG_PIPELINE..." />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="PipeGalleryRs.java" pinned="false" current="true" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.7140151" vertical-offset="4067" max-vertical-offset="4752">
+              <caret line="221" column="27" selection-start-line="221" selection-start-column="27" selection-end-line="221" selection-end-column="27" />
+              <folding>
+                <element signature="e#6945#6964#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="PipeGalleryManager.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.0" vertical-offset="849" max-vertical-offset="1650">
+              <caret line="61" column="56" selection-start-line="61" selection-start-column="56" selection-end-line="61" selection-end-column="56" />
+              <folding>
+                <element signature="e#2433#2452#0" expanded="true" />
+                <marker date="1537414756878" expanded="true" signature="2209:2277" placeholder="select PG_NA..PG_PIPE_GALLERY..." />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+    </leaf>
   </component>
   <component name="FindManager">
     <FindUsagesManager>
@@ -72,9 +115,6 @@
   <component name="IdeDocumentHistory">
     <option name="changedFiles">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
         <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/manager/PgInPgPersonManager.java" />
@@ -86,23 +126,16 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintainType.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/manager/PgPipeLineManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/EquipmentManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgEquipment.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.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/rs/PgPartitionRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.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/PgDeviceTypeRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
         <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.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/PgMaintainTypeRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainTypeManager.java" />
@@ -123,6 +156,16 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.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/dto/PgPipeLineLengthStatic.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/dto/PipeGalleryDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.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" />
       </list>
     </option>
   </component>
@@ -216,7 +259,20 @@
       <sortByType />
     </navigator>
     <panes>
-      <pane id="Scope" />
+      <pane id="PackagesPane">
+        <subPane>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
+            </PATH_ELEMENT>
+          </PATH>
+        </subPane>
+      </pane>
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -331,22 +387,73 @@
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
-        </subPane>
-      </pane>
-      <pane id="PackagesPane">
-        <subPane>
           <PATH>
             <PATH_ELEMENT>
               <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
               <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="devTable" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="devTable" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="dto" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
         </subPane>
       </pane>
+      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -916,7 +1023,12 @@
       <workItem from="1535958569443" duration="219000" />
       <workItem from="1536111554952" duration="23051000" />
       <workItem from="1536143316539" duration="3706000" />
-      <workItem from="1536195067076" duration="23441000" />
+      <workItem from="1536195067076" duration="23586000" />
+      <workItem from="1536802841385" duration="18000" />
+      <workItem from="1537167144071" duration="1232000" />
+      <workItem from="1537236948589" duration="156000" />
+      <workItem from="1537237991303" duration="1733000" />
+      <workItem from="1537407751831" duration="6397000" />
     </task>
     <task id="LOCAL-00001" summary="first commit">
       <created>1510219102698</created>
@@ -1126,11 +1238,15 @@
       <created>1535958368940</created>
       <updated>1535958368940</updated>
     </task>
-    <option name="localTasksCounter" value="53" />
+    <task id="LOCAL-00053" summary="根据华锐王工反馈测试，修改接口">
+      <created>1536224373164</created>
+      <updated>1536224373165</updated>
+    </task>
+    <option name="localTasksCounter" value="54" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="937579000" />
+    <option name="totallyTimeSpent" value="947260000" />
   </component>
   <component name="TodoView" selected-index="1">
     <todo-panel id="selected-file">
@@ -1165,7 +1281,7 @@
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.391453" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.66382253" sideWeight="0.81316185" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.7235495" sideWeight="0.81316185" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="true" content_ui="tabs" />
       <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.6757679" sideWeight="0.18683812" order="7" side_tool="true" content_ui="tabs" />
@@ -1177,8 +1293,8 @@
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24962178" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32980332" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32649574" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2526475" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32593855" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.28441754" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" />
@@ -1192,18 +1308,18 @@
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
     </layout>
     <layout-to-restore>
-      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.63418806" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
-      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
+      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.391453" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
       <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" />
-      <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.50341296" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
+      <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2962963" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
+      <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.52136755" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32649574" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.29425114" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
@@ -1223,8 +1339,8 @@
       <window_info id="Android" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="15" side_tool="false" content_ui="tabs" />
       <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="true" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32980332" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
     </layout-to-restore>
   </component>
@@ -1243,7 +1359,6 @@
     <option name="myTodoPanelSettings">
       <TodoPanelSettings />
     </option>
-    <MESSAGE value="修改人员入廊记录表和功能" />
     <MESSAGE value="Merge remote-tracking branch 'origin/develop' into develop&#10;&#10;Conflicts:&#10;&#9;.idea/workspace.xml&#10;&#9;~$数据库设计说明新需求.docx&#10;&#9;管廊数据库设计说明新需求.docx&#10;" />
     <MESSAGE value="增加统计功能" />
     <MESSAGE value="修改标注" />
@@ -1268,7 +1383,8 @@
     <MESSAGE value="新增维护类别" />
     <MESSAGE value="修改施工数据新增删除编辑" />
     <MESSAGE value="新增工器具耗材" />
-    <option name="LAST_COMMIT_MESSAGE" value="新增工器具耗材" />
+    <MESSAGE value="根据华锐王工反馈测试，修改接口" />
+    <option name="LAST_COMMIT_MESSAGE" value="根据华锐王工反馈测试，修改接口" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1291,14 +1407,8 @@
           <properties />
           <option name="timeStamp" value="359" />
         </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java</url>
-          <line>190</line>
-          <properties />
-          <option name="timeStamp" value="360" />
-        </line-breakpoint>
       </breakpoints>
-      <option name="time" value="390" />
+      <option name="time" value="399" />
     </breakpoint-manager>
   </component>
   <component name="antWorkspaceConfiguration">
@@ -1306,163 +1416,10 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="3119" max-vertical-offset="7128">
-          <caret line="30" column="52" selection-start-line="30" selection-start-column="52" selection-end-line="30" selection-end-column="52" />
-          <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 vertical-scroll-proportion="0.0" vertical-offset="5071" max-vertical-offset="5918">
-          <caret line="268" column="24" selection-start-line="268" selection-start-column="24" selection-end-line="268" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="13" max-vertical-offset="3058">
-          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.5529623" vertical-offset="528" max-vertical-offset="3014">
-          <caret line="26" column="0" selection-start-line="26" selection-start-column="0" selection-end-line="26" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainTypeDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.33213645" vertical-offset="101" max-vertical-offset="1012">
-          <caret line="15" column="11" selection-start-line="15" selection-start-column="11" selection-end-line="15" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="609" max-vertical-offset="1958">
-          <caret line="39" column="50" selection-start-line="39" selection-start-column="50" selection-end-line="39" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.7271095" vertical-offset="167" max-vertical-offset="1342">
-          <caret line="35" column="0" selection-start-line="35" selection-start-column="0" selection-end-line="35" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.63195693" vertical-offset="0" max-vertical-offset="1452">
-          <caret line="19" column="0" selection-start-line="19" selection-start-column="0" selection-end-line="19" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintainDoc.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.69669116" vertical-offset="61" max-vertical-offset="1320">
-          <caret line="24" column="0" selection-start-line="24" selection-start-column="0" selection-end-line="24" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDocDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.27648115" vertical-offset="0" max-vertical-offset="1342">
-          <caret line="9" column="13" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-7.551724" vertical-offset="3125" max-vertical-offset="4048">
-          <caret line="249" column="85" selection-start-line="249" selection-start-column="85" selection-end-line="249" selection-end-column="85" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-9.862069" vertical-offset="3674" max-vertical-offset="5610">
-          <caret line="203" column="58" selection-start-line="203" selection-start-column="58" selection-end-line="203" selection-end-column="58" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.31597847" vertical-offset="0" max-vertical-offset="557">
-          <caret line="8" column="35" selection-start-line="8" selection-start-column="35" selection-end-line="8" selection-end-column="35" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.66360295" vertical-offset="783" max-vertical-offset="3234">
-          <caret line="68" column="71" selection-start-line="68" selection-start-column="71" selection-end-line="68" selection-end-column="71" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="33" max-vertical-offset="968">
-          <caret line="33" column="62" selection-start-line="33" selection-start-column="62" selection-end-line="33" selection-end-column="62" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://C:/Program Files/Java/jdk1.8.0_131/src.zip!/java/lang/NumberFormatException.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.6285178" vertical-offset="479" max-vertical-offset="1012">
-          <caret line="64" column="0" selection-start-line="64" selection-start-column="0" selection-end-line="64" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-tx/4.0.6.RELEASE/spring-tx-4.0.6.RELEASE-sources.jar!/org/springframework/transaction/interceptor/TransactionAspectSupport.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.23639774" vertical-offset="4736" max-vertical-offset="13244">
-          <caret line="263" column="0" selection-start-line="263" selection-start-column="0" selection-end-line="263" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.2504817" vertical-offset="618" max-vertical-offset="1320">
-          <caret line="35" column="28" selection-start-line="35" selection-start-column="28" selection-end-line="35" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://C:/Program Files/Java/jdk1.8.0_131/src.zip!/java/util/ArrayList.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.73967683" vertical-offset="13360" max-vertical-offset="30690">
-          <caret line="663" column="7" selection-start-line="663" selection-start-column="7" selection-end-line="663" selection-end-column="7" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/StringUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.15798923" vertical-offset="330" max-vertical-offset="2178">
-          <caret line="31" column="29" selection-start-line="31" selection-start-column="29" selection-end-line="31" selection-end-column="29" />
-          <folding />
-        </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 vertical-scroll-proportion="0.11143695" vertical-offset="1854" max-vertical-offset="5170">
-          <caret line="103" column="65" selection-start-line="103" selection-start-column="65" selection-end-line="103" selection-end-column="65" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="jar://C:/Program Files/Java/jdk1.8.0_131/src.zip!/java/util/concurrent/ThreadPoolExecutor.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="1.659824" vertical-offset="23436" max-vertical-offset="44594">
           <caret line="1148" column="31" selection-start-line="1148" selection-start-column="31" selection-end-line="1148" selection-end-column="31" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1470,17 +1427,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.2404692" vertical-offset="9532" max-vertical-offset="12958">
           <caret line="497" column="0" selection-start-line="497" selection-start-column="0" selection-end-line="497" selection-end-column="0" />
-          <folding />
-        </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 vertical-scroll-proportion="0.0" vertical-offset="4977" max-vertical-offset="8316">
-          <caret line="263" column="24" selection-start-line="263" selection-start-column="24" selection-end-line="263" selection-end-column="24" />
-          <folding>
-            <element signature="e#10383#10401#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1488,7 +1434,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-2.1782365" vertical-offset="1359" max-vertical-offset="1892">
           <caret line="24" column="13" selection-start-line="24" selection-start-column="13" selection-end-line="24" selection-end-column="13" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1496,7 +1441,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-1.4093357" vertical-offset="1907" max-vertical-offset="2464">
           <caret line="65" column="60" selection-start-line="65" selection-start-column="11" selection-end-line="65" selection-end-column="60" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1504,10 +1448,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-0.011029412" vertical-offset="2228" max-vertical-offset="2838">
           <caret line="111" column="47" selection-start-line="111" selection-start-column="47" selection-end-line="111" selection-end-column="47" />
-          <folding>
-            <marker date="1535944027199" expanded="true" signature="-1:-1" placeholder="select devic..PG_DEVICE..." />
-            <marker date="1535944027199" expanded="true" signature="-1:-1" placeholder="select * fro..PG_DEVICE..." />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1515,7 +1455,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.76301616" vertical-offset="1687" max-vertical-offset="2376">
           <caret line="143" column="16" selection-start-line="143" selection-start-column="16" selection-end-line="143" selection-end-column="16" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1523,7 +1462,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.88509876" vertical-offset="519" max-vertical-offset="1342">
           <caret line="68" column="0" selection-start-line="68" selection-start-column="0" selection-end-line="68" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1531,7 +1469,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.43267503" vertical-offset="23" max-vertical-offset="1672">
           <caret line="15" column="33" selection-start-line="15" selection-start-column="33" selection-end-line="15" selection-end-column="33" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1540,42 +1477,8 @@
         <state vertical-scroll-proportion="0.5257353" vertical-offset="0" max-vertical-offset="4972">
           <caret line="30" column="0" selection-start-line="30" selection-start-column="0" selection-end-line="30" selection-end-column="0" />
           <folding>
-            <element signature="e#3701#3720#0" expanded="true" />
-            <element signature="e#4190#4208#0" expanded="true" />
-            <marker date="1536211271563" expanded="true" signature="-1:-1" placeholder="select count..PG_CONSTRUCTION..." />
-            <marker date="1536211271563" expanded="true" signature="-1:-1" placeholder="select count..Pg_Construction..." />
-            <marker date="1536211271563" expanded="true" signature="-1:-1" placeholder="SELECT t.ID,..PG_CONSTRUCTION..." />
-            <marker date="1536211271563" expanded="true" signature="-1:-1" placeholder="SELECT m.PAR..PG_PARTITION..." />
-            <marker date="1536211271563" expanded="true" signature="-1:-1" placeholder="SELECT n.TYP..PG_CONSTRUCTION_TYPE..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.40754038" vertical-offset="675" max-vertical-offset="1540">
-          <caret line="108" column="52" selection-start-line="108" selection-start-column="52" selection-end-line="108" selection-end-column="52" />
-          <folding>
-            <element signature="method#saveFiles#0;class#PgCsDocumentManager#0" expanded="false" />
-            <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" expanded="false" />
-            <element signature="e#3728#3745#0" expanded="true" />
-            <marker date="1536205913620" expanded="true" signature="-1:-1" placeholder="select * fro..PG_CSDOCUMENT..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.41666666" vertical-offset="2772" max-vertical-offset="3674">
-          <caret line="192" column="13" selection-start-line="192" selection-start-column="13" selection-end-line="192" selection-end-column="13" />
-          <folding>
-            <element signature="method#setPgCsDocumentManager#0;class#PgCsDocumentRs#0" expanded="false" />
-            <element signature="method#setPgConstructionManager#0;class#PgCsDocumentRs#0" expanded="false" />
-            <element signature="e#2023#2039#0" expanded="true" />
-            <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" expanded="false" />
-            <element signature="e#6060#6076#0" expanded="true" />
-            <element signature="e#6145#6162#0" expanded="true" />
-            <element signature="method#downloadFile#0;class#PgCsDocumentRs#0" expanded="false" />
+            <element signature="e#3701#3720#0" expanded="false" />
+            <element signature="e#4190#4208#0" expanded="false" />
           </folding>
         </state>
       </provider>
@@ -1584,24 +1487,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.9640933" vertical-offset="1091" max-vertical-offset="2112">
           <caret line="83" column="62" selection-start-line="83" selection-start-column="62" selection-end-line="83" selection-end-column="62" />
-          <folding>
-            <element signature="e#2170#2184#0" expanded="true" />
-            <marker date="1536213480710" expanded="true" signature="-1:-1" placeholder="select count..PG_ALARM..." />
-            <marker date="1536213480710" expanded="true" signature="-1:-1" placeholder="select count..PG_ALARM..." />
-            <marker date="1536213480710" expanded="true" signature="-1:-1" placeholder="select count..PG_ALARM..." />
-            <marker date="1536213480710" expanded="true" signature="-1:-1" placeholder="select count..PG_ALARM..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.41666666" vertical-offset="990" max-vertical-offset="1672">
-          <caret line="72" column="55" selection-start-line="72" selection-start-column="55" selection-end-line="72" selection-end-column="55" />
-          <folding>
-            <element signature="e#2152#2168#0" expanded="false" />
-            <element signature="e#2257#2271#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1609,10 +1494,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.75" vertical-offset="440" max-vertical-offset="3938">
           <caret line="62" column="13" selection-start-line="62" selection-start-column="13" selection-end-line="62" selection-end-column="13" />
-          <folding>
-            <element signature="e#1393#1394#0" expanded="false" />
-            <element signature="e#1451#1452#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1620,7 +1501,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.35547575" vertical-offset="0" max-vertical-offset="1012">
           <caret line="18" column="0" selection-start-line="18" selection-start-column="0" selection-end-line="18" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1628,9 +1508,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.45421904" vertical-offset="2145" max-vertical-offset="3608">
           <caret line="125" column="29" selection-start-line="125" selection-start-column="29" selection-end-line="125" selection-end-column="29" />
-          <folding>
-            <element signature="e#3094#3110#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1638,7 +1515,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.513465" vertical-offset="0" max-vertical-offset="1276">
           <caret line="22" column="51" selection-start-line="22" selection-start-column="51" selection-end-line="22" selection-end-column="51" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1646,7 +1522,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.5924596" vertical-offset="0" max-vertical-offset="1254">
           <caret line="20" column="28" selection-start-line="20" selection-start-column="28" selection-end-line="20" selection-end-column="28" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1654,18 +1529,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-3.3052065" vertical-offset="4063" max-vertical-offset="4620">
           <caret line="115" column="15" selection-start-line="115" selection-start-column="15" selection-end-line="115" selection-end-column="15" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.20833333" vertical-offset="1892" max-vertical-offset="3850">
-          <caret line="152" column="24" selection-start-line="152" selection-start-column="24" selection-end-line="152" selection-end-column="24" />
-          <folding>
-            <element signature="method#addReservePlan#0;class#PgReservePlanRs#0" expanded="false" />
-            <element signature="e#3206#3222#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1673,7 +1536,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.06147541" vertical-offset="183" max-vertical-offset="506">
           <caret line="10" column="0" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1681,7 +1543,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="3388">
           <caret line="39" column="56" selection-start-line="39" selection-start-column="56" selection-end-line="39" selection-end-column="56" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1689,22 +1550,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.33213645" vertical-offset="959" max-vertical-offset="2508">
           <caret line="71" column="36" selection-start-line="71" selection-start-column="36" selection-end-line="71" selection-end-column="36" />
-          <folding>
-            <marker date="1536217243963" expanded="true" signature="-1:-1" placeholder="select count..PG_RESERVE_PLAN..." />
-          </folding>
-        </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 vertical-scroll-proportion="0.46401516" vertical-offset="1273" max-vertical-offset="1980">
-          <caret line="106" column="70" selection-start-line="106" selection-start-column="70" selection-end-line="106" selection-end-column="70" />
-          <folding>
-            <element signature="imports" expanded="false" />
-            <element signature="method#linkDevice#0;class#PgAlarmLinkRs#0" expanded="false" />
-            <element signature="e#1459#1475#0" expanded="false" />
-            <element signature="method#linkPartitionDevice#0;class#PgAlarmLinkRs#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1712,7 +1557,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.35906643" vertical-offset="1164" max-vertical-offset="3388">
           <caret line="80" column="23" selection-start-line="80" selection-start-column="23" selection-end-line="80" selection-end-column="23" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1720,7 +1564,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.625" vertical-offset="1364" max-vertical-offset="4158">
           <caret line="99" column="37" selection-start-line="99" selection-start-column="37" selection-end-line="99" selection-end-column="37" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1728,7 +1571,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="1553" max-vertical-offset="2134">
           <caret line="98" column="16" selection-start-line="98" selection-start-column="16" selection-end-line="98" selection-end-column="16" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1736,9 +1578,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="837" max-vertical-offset="1276">
           <caret line="59" column="0" selection-start-line="59" selection-start-column="0" selection-end-line="59" selection-end-column="0" />
-          <folding>
-            <element signature="e#1980#1990#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1746,10 +1585,259 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.24955116" vertical-offset="631" max-vertical-offset="1232">
           <caret line="58" column="34" selection-start-line="58" selection-start-column="34" selection-end-line="58" selection-end-column="34" />
+        </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 vertical-scroll-proportion="0.0" vertical-offset="6759" max-vertical-offset="8316">
+          <caret line="268" column="42" selection-start-line="268" selection-start-column="42" selection-end-line="268" selection-end-column="42" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.8779174" vertical-offset="347" max-vertical-offset="2662">
+          <caret line="54" column="9" selection-start-line="54" selection-start-column="9" selection-end-line="54" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="1.9353681" vertical-offset="0" max-vertical-offset="4906">
+          <caret line="70" column="71" selection-start-line="70" selection-start-column="66" selection-end-line="70" selection-end-column="75" />
+        </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 vertical-scroll-proportion="0.32854578" vertical-offset="1115" max-vertical-offset="1672">
+          <caret line="76" column="33" selection-start-line="76" selection-start-column="33" selection-end-line="76" selection-end-column="33" />
+        </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 vertical-scroll-proportion="3.1723518" vertical-offset="81" max-vertical-offset="2354">
+          <caret line="104" column="12" selection-start-line="104" selection-start-column="12" selection-end-line="104" selection-end-column="12" />
           <folding />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.5260323" vertical-offset="4239" max-vertical-offset="4796">
+          <caret line="224" column="0" selection-start-line="224" selection-start-column="0" selection-end-line="224" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.6445242" vertical-offset="1709" max-vertical-offset="2332">
+          <caret line="111" column="53" selection-start-line="111" selection-start-column="53" selection-end-line="111" selection-end-column="53" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-3.5421903" vertical-offset="5515" max-vertical-offset="6072">
+          <caret line="184" column="25" selection-start-line="184" selection-start-column="25" selection-end-line="184" selection-end-column="25" />
+        </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 vertical-scroll-proportion="-0.78994614" vertical-offset="924" max-vertical-offset="7128">
+          <caret line="41" column="5" selection-start-line="41" selection-start-column="5" selection-end-line="41" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.4344704" vertical-offset="748" max-vertical-offset="1474">
+          <caret line="72" column="0" selection-start-line="72" selection-start-column="0" selection-end-line="72" selection-end-column="0" />
+        </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 vertical-scroll-proportion="0.0" vertical-offset="264" max-vertical-offset="1782">
+          <caret line="37" column="57" selection-start-line="37" selection-start-column="57" selection-end-line="37" selection-end-column="57" />
+          <folding>
+            <marker date="1531722832731" expanded="true" signature="-1:-1" placeholder="select id,CH..PG_CH4..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2420">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://C:/Program Files/Java/jdk1.8.0_131/src.zip!/java/sql/Timestamp.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33027524" vertical-offset="4606" max-vertical-offset="12980">
+          <caret line="236" column="0" selection-start-line="236" selection-start-column="0" selection-end-line="236" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="2.2118492" vertical-offset="0" max-vertical-offset="1496">
+          <caret line="87" column="52" selection-start-line="87" selection-start-column="52" selection-end-line="87" selection-end-column="52" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.4901257" vertical-offset="79" max-vertical-offset="1298">
+          <caret line="25" column="25" selection-start-line="25" selection-start-column="25" selection-end-line="25" selection-end-column="25" />
+          <folding>
+            <marker date="1537412037475" expanded="true" signature="-1:-1" placeholder="select equip..PG_EQUIPMENT..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.8330341" vertical-offset="680" max-vertical-offset="4466">
+          <caret line="68" column="29" selection-start-line="68" selection-start-column="29" selection-end-line="68" selection-end-column="29" />
+          <folding>
+            <element signature="e#1490#1506#0" expanded="true" />
+            <element signature="e#6332#6348#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgEquipment.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.3680431" vertical-offset="191" max-vertical-offset="1540">
+          <caret line="20" column="17" selection-start-line="20" selection-start-column="17" selection-end-line="20" selection-end-column="17" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/4.3.6.Final/hibernate-core-4.3.6.Final-sources.jar!/org/hibernate/internal/AbstractQueryImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33333334" vertical-offset="18814" max-vertical-offset="20328">
+          <caret line="974" column="0" selection-start-line="974" selection-start-column="0" selection-end-line="974" selection-end-column="0" />
+          <folding />
+        </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 vertical-scroll-proportion="0.5924596" vertical-offset="0" max-vertical-offset="1980">
+          <caret line="18" column="32" selection-start-line="18" selection-start-column="32" selection-end-line="18" selection-end-column="32" />
+          <folding />
+        </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 vertical-scroll-proportion="0.7109515" vertical-offset="0" max-vertical-offset="704">
+          <caret line="18" column="31" selection-start-line="18" selection-start-column="31" selection-end-line="18" selection-end-column="31" />
+          <folding>
+            <element signature="e#213#214#0" expanded="true" />
+            <element signature="e#244#245#0" expanded="true" />
+            <element signature="e#292#293#0" expanded="true" />
+            <element signature="e#332#333#0" expanded="true" />
+            <element signature="e#394#395#0" expanded="true" />
+            <element signature="e#438#439#0" expanded="true" />
+            <element signature="e#474#475#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://C:/Program Files/Java/jdk1.8.0_131/src.zip!/java/lang/String.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.21139705" vertical-offset="1469" max-vertical-offset="67452">
+          <caret line="107" column="16" selection-start-line="107" selection-start-column="12" selection-end-line="107" selection-end-column="16" />
+          <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 vertical-scroll-proportion="0.0" vertical-offset="2301" max-vertical-offset="3388">
+          <caret line="277" column="9" selection-start-line="277" selection-start-column="9" selection-end-line="277" selection-end-column="9" />
+          <folding>
+            <element signature="method#addLog#0;class#PgPipeLineRs#0" expanded="false" />
+            <element signature="method#editPipeLine#0;class#PgPipeLineRs#0" expanded="false" />
+            <element signature="method#deletePipeLine#0;class#PgPipeLineRs#0" expanded="false" />
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" expanded="false" />
+            <element signature="e#9602#9626#0" expanded="true" />
+            <element signature="e#10329#10337#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.43727598" vertical-offset="120" max-vertical-offset="1122">
+          <caret line="13" column="34" selection-start-line="13" selection-start-column="34" selection-end-line="13" selection-end-column="34" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.8547855" vertical-offset="137" max-vertical-offset="704">
+          <caret line="18" column="31" selection-start-line="18" selection-start-column="31" selection-end-line="18" selection-end-column="31" />
+          <folding>
+            <element signature="e#204#205#0" expanded="true" />
+            <element signature="e#233#234#0" expanded="true" />
+            <element signature="e#277#278#0" expanded="true" />
+            <element signature="e#313#314#0" expanded="true" />
+            <element signature="e#375#376#0" expanded="true" />
+            <element signature="e#419#420#0" expanded="true" />
+            <element signature="e#455#456#0" expanded="true" />
+          </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 vertical-scroll-proportion="0.0" vertical-offset="330" max-vertical-offset="1342">
+          <caret line="55" column="42" selection-start-line="55" selection-start-column="42" selection-end-line="55" selection-end-column="42" />
+          <folding>
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" expanded="false" />
+            <element signature="e#1787#1811#0" expanded="true" />
+            <element signature="e#2482#2490#0" expanded="true" />
+            <marker date="1537414540748" expanded="true" signature="1552:1622" placeholder="select LINE_..PG_PIPELINE..." />
+            <marker date="1537414540748" expanded="true" signature="1552:1621" placeholder="select LINE_..PG_PIPELINE..." />
+            <marker date="1537414540748" expanded="true" signature="2310:2352" placeholder="select disti..PG_PIPELINE..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="849" max-vertical-offset="1650">
+          <caret line="61" column="56" selection-start-line="61" selection-start-column="56" selection-end-line="61" selection-end-column="56" />
+          <folding>
+            <element signature="e#2433#2452#0" expanded="true" />
+            <marker date="1537414756878" expanded="true" signature="2209:2277" placeholder="select PG_NA..PG_PIPE_GALLERY..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.7140151" vertical-offset="4067" max-vertical-offset="4752">
+          <caret line="221" column="27" selection-start-line="221" selection-start-column="27" selection-end-line="221" selection-end-column="27" />
+          <folding>
+            <element signature="e#6945#6964#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 73b1050..7a80a23 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,34 +2,17 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="">
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\~$数据库设计说明新需求.docx" afterPath="" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/~$数据库设计说明新需求.docx" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineLengthStatic.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/接口说明新需求.docx" afterPath="$PROJECT_DIR$/接口说明新需求.docx" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainTypeManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainTypeManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources/application.properties" afterPath="$PROJECT_DIR$/src/main/resources/application.properties" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
     </list>
     <ignored path="PgInterface.iws" />
@@ -54,7 +37,67 @@
     <favorites_list name="PgInterface" />
   </component>
   <component name="FileEditorManager">
-    <leaf />
+    <leaf>
+      <file leaf-file-name="PgPipeLineRs.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.0" vertical-offset="2301" max-vertical-offset="3388">
+              <caret line="277" column="9" selection-start-line="277" selection-start-column="9" selection-end-line="277" selection-end-column="9" />
+              <folding>
+                <element signature="method#addLog#0;class#PgPipeLineRs#0" expanded="false" />
+                <element signature="method#editPipeLine#0;class#PgPipeLineRs#0" expanded="false" />
+                <element signature="method#deletePipeLine#0;class#PgPipeLineRs#0" expanded="false" />
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" expanded="false" />
+                <element signature="e#9602#9626#0" expanded="true" />
+                <element signature="e#10329#10337#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="PgPipeLineManager.java" pinned="false" current="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 vertical-scroll-proportion="0.0" vertical-offset="330" max-vertical-offset="1342">
+              <caret line="55" column="42" selection-start-line="55" selection-start-column="42" selection-end-line="55" selection-end-column="42" />
+              <folding>
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" expanded="false" />
+                <element signature="e#1787#1811#0" expanded="true" />
+                <element signature="e#2482#2490#0" expanded="true" />
+                <marker date="1537414540748" expanded="true" signature="1552:1622" placeholder="select LINE_..PG_PIPELINE..." />
+                <marker date="1537414540748" expanded="true" signature="1552:1621" placeholder="select LINE_..PG_PIPELINE..." />
+                <marker date="1537414540748" expanded="true" signature="2310:2352" placeholder="select disti..PG_PIPELINE..." />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="PipeGalleryRs.java" pinned="false" current="true" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.7140151" vertical-offset="4067" max-vertical-offset="4752">
+              <caret line="221" column="27" selection-start-line="221" selection-start-column="27" selection-end-line="221" selection-end-column="27" />
+              <folding>
+                <element signature="e#6945#6964#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="PipeGalleryManager.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.0" vertical-offset="849" max-vertical-offset="1650">
+              <caret line="61" column="56" selection-start-line="61" selection-start-column="56" selection-end-line="61" selection-end-column="56" />
+              <folding>
+                <element signature="e#2433#2452#0" expanded="true" />
+                <marker date="1537414756878" expanded="true" signature="2209:2277" placeholder="select PG_NA..PG_PIPE_GALLERY..." />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+    </leaf>
   </component>
   <component name="FindManager">
     <FindUsagesManager>
@@ -72,9 +115,6 @@
   <component name="IdeDocumentHistory">
     <option name="changedFiles">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
         <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/manager/PgInPgPersonManager.java" />
@@ -86,23 +126,16 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintainType.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/manager/PgPipeLineManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/EquipmentManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgEquipment.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.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/rs/PgPartitionRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.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/PgDeviceTypeRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
         <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.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/PgMaintainTypeRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainTypeManager.java" />
@@ -123,6 +156,16 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.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/dto/PgPipeLineLengthStatic.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/dto/PipeGalleryDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.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" />
       </list>
     </option>
   </component>
@@ -216,7 +259,20 @@
       <sortByType />
     </navigator>
     <panes>
-      <pane id="Scope" />
+      <pane id="PackagesPane">
+        <subPane>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
+            </PATH_ELEMENT>
+          </PATH>
+        </subPane>
+      </pane>
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -331,22 +387,73 @@
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
-        </subPane>
-      </pane>
-      <pane id="PackagesPane">
-        <subPane>
           <PATH>
             <PATH_ELEMENT>
               <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
               <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="devTable" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="devTable" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="dto" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
         </subPane>
       </pane>
+      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -916,7 +1023,12 @@
       <workItem from="1535958569443" duration="219000" />
       <workItem from="1536111554952" duration="23051000" />
       <workItem from="1536143316539" duration="3706000" />
-      <workItem from="1536195067076" duration="23441000" />
+      <workItem from="1536195067076" duration="23586000" />
+      <workItem from="1536802841385" duration="18000" />
+      <workItem from="1537167144071" duration="1232000" />
+      <workItem from="1537236948589" duration="156000" />
+      <workItem from="1537237991303" duration="1733000" />
+      <workItem from="1537407751831" duration="6397000" />
     </task>
     <task id="LOCAL-00001" summary="first commit">
       <created>1510219102698</created>
@@ -1126,11 +1238,15 @@
       <created>1535958368940</created>
       <updated>1535958368940</updated>
     </task>
-    <option name="localTasksCounter" value="53" />
+    <task id="LOCAL-00053" summary="根据华锐王工反馈测试，修改接口">
+      <created>1536224373164</created>
+      <updated>1536224373165</updated>
+    </task>
+    <option name="localTasksCounter" value="54" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="937579000" />
+    <option name="totallyTimeSpent" value="947260000" />
   </component>
   <component name="TodoView" selected-index="1">
     <todo-panel id="selected-file">
@@ -1165,7 +1281,7 @@
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.391453" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.66382253" sideWeight="0.81316185" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.7235495" sideWeight="0.81316185" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="true" content_ui="tabs" />
       <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.6757679" sideWeight="0.18683812" order="7" side_tool="true" content_ui="tabs" />
@@ -1177,8 +1293,8 @@
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24962178" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32980332" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32649574" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2526475" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32593855" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.28441754" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" />
@@ -1192,18 +1308,18 @@
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
     </layout>
     <layout-to-restore>
-      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.63418806" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
-      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
+      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.391453" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
       <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" />
-      <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.50341296" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
+      <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2962963" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
+      <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.52136755" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32649574" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.29425114" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
@@ -1223,8 +1339,8 @@
       <window_info id="Android" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="15" side_tool="false" content_ui="tabs" />
       <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="true" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32980332" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
     </layout-to-restore>
   </component>
@@ -1243,7 +1359,6 @@
     <option name="myTodoPanelSettings">
       <TodoPanelSettings />
     </option>
-    <MESSAGE value="修改人员入廊记录表和功能" />
     <MESSAGE value="Merge remote-tracking branch 'origin/develop' into develop&#10;&#10;Conflicts:&#10;&#9;.idea/workspace.xml&#10;&#9;~$数据库设计说明新需求.docx&#10;&#9;管廊数据库设计说明新需求.docx&#10;" />
     <MESSAGE value="增加统计功能" />
     <MESSAGE value="修改标注" />
@@ -1268,7 +1383,8 @@
     <MESSAGE value="新增维护类别" />
     <MESSAGE value="修改施工数据新增删除编辑" />
     <MESSAGE value="新增工器具耗材" />
-    <option name="LAST_COMMIT_MESSAGE" value="新增工器具耗材" />
+    <MESSAGE value="根据华锐王工反馈测试，修改接口" />
+    <option name="LAST_COMMIT_MESSAGE" value="根据华锐王工反馈测试，修改接口" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1291,14 +1407,8 @@
           <properties />
           <option name="timeStamp" value="359" />
         </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java</url>
-          <line>190</line>
-          <properties />
-          <option name="timeStamp" value="360" />
-        </line-breakpoint>
       </breakpoints>
-      <option name="time" value="390" />
+      <option name="time" value="399" />
     </breakpoint-manager>
   </component>
   <component name="antWorkspaceConfiguration">
@@ -1306,163 +1416,10 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="3119" max-vertical-offset="7128">
-          <caret line="30" column="52" selection-start-line="30" selection-start-column="52" selection-end-line="30" selection-end-column="52" />
-          <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 vertical-scroll-proportion="0.0" vertical-offset="5071" max-vertical-offset="5918">
-          <caret line="268" column="24" selection-start-line="268" selection-start-column="24" selection-end-line="268" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="13" max-vertical-offset="3058">
-          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.5529623" vertical-offset="528" max-vertical-offset="3014">
-          <caret line="26" column="0" selection-start-line="26" selection-start-column="0" selection-end-line="26" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainTypeDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.33213645" vertical-offset="101" max-vertical-offset="1012">
-          <caret line="15" column="11" selection-start-line="15" selection-start-column="11" selection-end-line="15" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="609" max-vertical-offset="1958">
-          <caret line="39" column="50" selection-start-line="39" selection-start-column="50" selection-end-line="39" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.7271095" vertical-offset="167" max-vertical-offset="1342">
-          <caret line="35" column="0" selection-start-line="35" selection-start-column="0" selection-end-line="35" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.63195693" vertical-offset="0" max-vertical-offset="1452">
-          <caret line="19" column="0" selection-start-line="19" selection-start-column="0" selection-end-line="19" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintainDoc.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.69669116" vertical-offset="61" max-vertical-offset="1320">
-          <caret line="24" column="0" selection-start-line="24" selection-start-column="0" selection-end-line="24" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDocDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.27648115" vertical-offset="0" max-vertical-offset="1342">
-          <caret line="9" column="13" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-7.551724" vertical-offset="3125" max-vertical-offset="4048">
-          <caret line="249" column="85" selection-start-line="249" selection-start-column="85" selection-end-line="249" selection-end-column="85" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-9.862069" vertical-offset="3674" max-vertical-offset="5610">
-          <caret line="203" column="58" selection-start-line="203" selection-start-column="58" selection-end-line="203" selection-end-column="58" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.31597847" vertical-offset="0" max-vertical-offset="557">
-          <caret line="8" column="35" selection-start-line="8" selection-start-column="35" selection-end-line="8" selection-end-column="35" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.66360295" vertical-offset="783" max-vertical-offset="3234">
-          <caret line="68" column="71" selection-start-line="68" selection-start-column="71" selection-end-line="68" selection-end-column="71" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="33" max-vertical-offset="968">
-          <caret line="33" column="62" selection-start-line="33" selection-start-column="62" selection-end-line="33" selection-end-column="62" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://C:/Program Files/Java/jdk1.8.0_131/src.zip!/java/lang/NumberFormatException.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.6285178" vertical-offset="479" max-vertical-offset="1012">
-          <caret line="64" column="0" selection-start-line="64" selection-start-column="0" selection-end-line="64" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-tx/4.0.6.RELEASE/spring-tx-4.0.6.RELEASE-sources.jar!/org/springframework/transaction/interceptor/TransactionAspectSupport.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.23639774" vertical-offset="4736" max-vertical-offset="13244">
-          <caret line="263" column="0" selection-start-line="263" selection-start-column="0" selection-end-line="263" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.2504817" vertical-offset="618" max-vertical-offset="1320">
-          <caret line="35" column="28" selection-start-line="35" selection-start-column="28" selection-end-line="35" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://C:/Program Files/Java/jdk1.8.0_131/src.zip!/java/util/ArrayList.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.73967683" vertical-offset="13360" max-vertical-offset="30690">
-          <caret line="663" column="7" selection-start-line="663" selection-start-column="7" selection-end-line="663" selection-end-column="7" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/StringUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.15798923" vertical-offset="330" max-vertical-offset="2178">
-          <caret line="31" column="29" selection-start-line="31" selection-start-column="29" selection-end-line="31" selection-end-column="29" />
-          <folding />
-        </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 vertical-scroll-proportion="0.11143695" vertical-offset="1854" max-vertical-offset="5170">
-          <caret line="103" column="65" selection-start-line="103" selection-start-column="65" selection-end-line="103" selection-end-column="65" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="jar://C:/Program Files/Java/jdk1.8.0_131/src.zip!/java/util/concurrent/ThreadPoolExecutor.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="1.659824" vertical-offset="23436" max-vertical-offset="44594">
           <caret line="1148" column="31" selection-start-line="1148" selection-start-column="31" selection-end-line="1148" selection-end-column="31" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1470,17 +1427,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.2404692" vertical-offset="9532" max-vertical-offset="12958">
           <caret line="497" column="0" selection-start-line="497" selection-start-column="0" selection-end-line="497" selection-end-column="0" />
-          <folding />
-        </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 vertical-scroll-proportion="0.0" vertical-offset="4977" max-vertical-offset="8316">
-          <caret line="263" column="24" selection-start-line="263" selection-start-column="24" selection-end-line="263" selection-end-column="24" />
-          <folding>
-            <element signature="e#10383#10401#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1488,7 +1434,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-2.1782365" vertical-offset="1359" max-vertical-offset="1892">
           <caret line="24" column="13" selection-start-line="24" selection-start-column="13" selection-end-line="24" selection-end-column="13" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1496,7 +1441,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-1.4093357" vertical-offset="1907" max-vertical-offset="2464">
           <caret line="65" column="60" selection-start-line="65" selection-start-column="11" selection-end-line="65" selection-end-column="60" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1504,10 +1448,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-0.011029412" vertical-offset="2228" max-vertical-offset="2838">
           <caret line="111" column="47" selection-start-line="111" selection-start-column="47" selection-end-line="111" selection-end-column="47" />
-          <folding>
-            <marker date="1535944027199" expanded="true" signature="-1:-1" placeholder="select devic..PG_DEVICE..." />
-            <marker date="1535944027199" expanded="true" signature="-1:-1" placeholder="select * fro..PG_DEVICE..." />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1515,7 +1455,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.76301616" vertical-offset="1687" max-vertical-offset="2376">
           <caret line="143" column="16" selection-start-line="143" selection-start-column="16" selection-end-line="143" selection-end-column="16" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1523,7 +1462,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.88509876" vertical-offset="519" max-vertical-offset="1342">
           <caret line="68" column="0" selection-start-line="68" selection-start-column="0" selection-end-line="68" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1531,7 +1469,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.43267503" vertical-offset="23" max-vertical-offset="1672">
           <caret line="15" column="33" selection-start-line="15" selection-start-column="33" selection-end-line="15" selection-end-column="33" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1540,42 +1477,8 @@
         <state vertical-scroll-proportion="0.5257353" vertical-offset="0" max-vertical-offset="4972">
           <caret line="30" column="0" selection-start-line="30" selection-start-column="0" selection-end-line="30" selection-end-column="0" />
           <folding>
-            <element signature="e#3701#3720#0" expanded="true" />
-            <element signature="e#4190#4208#0" expanded="true" />
-            <marker date="1536211271563" expanded="true" signature="-1:-1" placeholder="select count..PG_CONSTRUCTION..." />
-            <marker date="1536211271563" expanded="true" signature="-1:-1" placeholder="select count..Pg_Construction..." />
-            <marker date="1536211271563" expanded="true" signature="-1:-1" placeholder="SELECT t.ID,..PG_CONSTRUCTION..." />
-            <marker date="1536211271563" expanded="true" signature="-1:-1" placeholder="SELECT m.PAR..PG_PARTITION..." />
-            <marker date="1536211271563" expanded="true" signature="-1:-1" placeholder="SELECT n.TYP..PG_CONSTRUCTION_TYPE..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.40754038" vertical-offset="675" max-vertical-offset="1540">
-          <caret line="108" column="52" selection-start-line="108" selection-start-column="52" selection-end-line="108" selection-end-column="52" />
-          <folding>
-            <element signature="method#saveFiles#0;class#PgCsDocumentManager#0" expanded="false" />
-            <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" expanded="false" />
-            <element signature="e#3728#3745#0" expanded="true" />
-            <marker date="1536205913620" expanded="true" signature="-1:-1" placeholder="select * fro..PG_CSDOCUMENT..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.41666666" vertical-offset="2772" max-vertical-offset="3674">
-          <caret line="192" column="13" selection-start-line="192" selection-start-column="13" selection-end-line="192" selection-end-column="13" />
-          <folding>
-            <element signature="method#setPgCsDocumentManager#0;class#PgCsDocumentRs#0" expanded="false" />
-            <element signature="method#setPgConstructionManager#0;class#PgCsDocumentRs#0" expanded="false" />
-            <element signature="e#2023#2039#0" expanded="true" />
-            <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" expanded="false" />
-            <element signature="e#6060#6076#0" expanded="true" />
-            <element signature="e#6145#6162#0" expanded="true" />
-            <element signature="method#downloadFile#0;class#PgCsDocumentRs#0" expanded="false" />
+            <element signature="e#3701#3720#0" expanded="false" />
+            <element signature="e#4190#4208#0" expanded="false" />
           </folding>
         </state>
       </provider>
@@ -1584,24 +1487,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.9640933" vertical-offset="1091" max-vertical-offset="2112">
           <caret line="83" column="62" selection-start-line="83" selection-start-column="62" selection-end-line="83" selection-end-column="62" />
-          <folding>
-            <element signature="e#2170#2184#0" expanded="true" />
-            <marker date="1536213480710" expanded="true" signature="-1:-1" placeholder="select count..PG_ALARM..." />
-            <marker date="1536213480710" expanded="true" signature="-1:-1" placeholder="select count..PG_ALARM..." />
-            <marker date="1536213480710" expanded="true" signature="-1:-1" placeholder="select count..PG_ALARM..." />
-            <marker date="1536213480710" expanded="true" signature="-1:-1" placeholder="select count..PG_ALARM..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.41666666" vertical-offset="990" max-vertical-offset="1672">
-          <caret line="72" column="55" selection-start-line="72" selection-start-column="55" selection-end-line="72" selection-end-column="55" />
-          <folding>
-            <element signature="e#2152#2168#0" expanded="false" />
-            <element signature="e#2257#2271#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1609,10 +1494,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.75" vertical-offset="440" max-vertical-offset="3938">
           <caret line="62" column="13" selection-start-line="62" selection-start-column="13" selection-end-line="62" selection-end-column="13" />
-          <folding>
-            <element signature="e#1393#1394#0" expanded="false" />
-            <element signature="e#1451#1452#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1620,7 +1501,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.35547575" vertical-offset="0" max-vertical-offset="1012">
           <caret line="18" column="0" selection-start-line="18" selection-start-column="0" selection-end-line="18" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1628,9 +1508,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.45421904" vertical-offset="2145" max-vertical-offset="3608">
           <caret line="125" column="29" selection-start-line="125" selection-start-column="29" selection-end-line="125" selection-end-column="29" />
-          <folding>
-            <element signature="e#3094#3110#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1638,7 +1515,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.513465" vertical-offset="0" max-vertical-offset="1276">
           <caret line="22" column="51" selection-start-line="22" selection-start-column="51" selection-end-line="22" selection-end-column="51" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1646,7 +1522,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.5924596" vertical-offset="0" max-vertical-offset="1254">
           <caret line="20" column="28" selection-start-line="20" selection-start-column="28" selection-end-line="20" selection-end-column="28" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1654,18 +1529,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-3.3052065" vertical-offset="4063" max-vertical-offset="4620">
           <caret line="115" column="15" selection-start-line="115" selection-start-column="15" selection-end-line="115" selection-end-column="15" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.20833333" vertical-offset="1892" max-vertical-offset="3850">
-          <caret line="152" column="24" selection-start-line="152" selection-start-column="24" selection-end-line="152" selection-end-column="24" />
-          <folding>
-            <element signature="method#addReservePlan#0;class#PgReservePlanRs#0" expanded="false" />
-            <element signature="e#3206#3222#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1673,7 +1536,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.06147541" vertical-offset="183" max-vertical-offset="506">
           <caret line="10" column="0" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1681,7 +1543,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="3388">
           <caret line="39" column="56" selection-start-line="39" selection-start-column="56" selection-end-line="39" selection-end-column="56" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1689,22 +1550,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.33213645" vertical-offset="959" max-vertical-offset="2508">
           <caret line="71" column="36" selection-start-line="71" selection-start-column="36" selection-end-line="71" selection-end-column="36" />
-          <folding>
-            <marker date="1536217243963" expanded="true" signature="-1:-1" placeholder="select count..PG_RESERVE_PLAN..." />
-          </folding>
-        </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 vertical-scroll-proportion="0.46401516" vertical-offset="1273" max-vertical-offset="1980">
-          <caret line="106" column="70" selection-start-line="106" selection-start-column="70" selection-end-line="106" selection-end-column="70" />
-          <folding>
-            <element signature="imports" expanded="false" />
-            <element signature="method#linkDevice#0;class#PgAlarmLinkRs#0" expanded="false" />
-            <element signature="e#1459#1475#0" expanded="false" />
-            <element signature="method#linkPartitionDevice#0;class#PgAlarmLinkRs#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1712,7 +1557,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.35906643" vertical-offset="1164" max-vertical-offset="3388">
           <caret line="80" column="23" selection-start-line="80" selection-start-column="23" selection-end-line="80" selection-end-column="23" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1720,7 +1564,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.625" vertical-offset="1364" max-vertical-offset="4158">
           <caret line="99" column="37" selection-start-line="99" selection-start-column="37" selection-end-line="99" selection-end-column="37" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1728,7 +1571,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="1553" max-vertical-offset="2134">
           <caret line="98" column="16" selection-start-line="98" selection-start-column="16" selection-end-line="98" selection-end-column="16" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1736,9 +1578,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="837" max-vertical-offset="1276">
           <caret line="59" column="0" selection-start-line="59" selection-start-column="0" selection-end-line="59" selection-end-column="0" />
-          <folding>
-            <element signature="e#1980#1990#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1746,10 +1585,259 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.24955116" vertical-offset="631" max-vertical-offset="1232">
           <caret line="58" column="34" selection-start-line="58" selection-start-column="34" selection-end-line="58" selection-end-column="34" />
+        </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 vertical-scroll-proportion="0.0" vertical-offset="6759" max-vertical-offset="8316">
+          <caret line="268" column="42" selection-start-line="268" selection-start-column="42" selection-end-line="268" selection-end-column="42" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.8779174" vertical-offset="347" max-vertical-offset="2662">
+          <caret line="54" column="9" selection-start-line="54" selection-start-column="9" selection-end-line="54" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="1.9353681" vertical-offset="0" max-vertical-offset="4906">
+          <caret line="70" column="71" selection-start-line="70" selection-start-column="66" selection-end-line="70" selection-end-column="75" />
+        </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 vertical-scroll-proportion="0.32854578" vertical-offset="1115" max-vertical-offset="1672">
+          <caret line="76" column="33" selection-start-line="76" selection-start-column="33" selection-end-line="76" selection-end-column="33" />
+        </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 vertical-scroll-proportion="3.1723518" vertical-offset="81" max-vertical-offset="2354">
+          <caret line="104" column="12" selection-start-line="104" selection-start-column="12" selection-end-line="104" selection-end-column="12" />
           <folding />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.5260323" vertical-offset="4239" max-vertical-offset="4796">
+          <caret line="224" column="0" selection-start-line="224" selection-start-column="0" selection-end-line="224" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.6445242" vertical-offset="1709" max-vertical-offset="2332">
+          <caret line="111" column="53" selection-start-line="111" selection-start-column="53" selection-end-line="111" selection-end-column="53" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-3.5421903" vertical-offset="5515" max-vertical-offset="6072">
+          <caret line="184" column="25" selection-start-line="184" selection-start-column="25" selection-end-line="184" selection-end-column="25" />
+        </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 vertical-scroll-proportion="-0.78994614" vertical-offset="924" max-vertical-offset="7128">
+          <caret line="41" column="5" selection-start-line="41" selection-start-column="5" selection-end-line="41" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.4344704" vertical-offset="748" max-vertical-offset="1474">
+          <caret line="72" column="0" selection-start-line="72" selection-start-column="0" selection-end-line="72" selection-end-column="0" />
+        </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 vertical-scroll-proportion="0.0" vertical-offset="264" max-vertical-offset="1782">
+          <caret line="37" column="57" selection-start-line="37" selection-start-column="57" selection-end-line="37" selection-end-column="57" />
+          <folding>
+            <marker date="1531722832731" expanded="true" signature="-1:-1" placeholder="select id,CH..PG_CH4..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2420">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://C:/Program Files/Java/jdk1.8.0_131/src.zip!/java/sql/Timestamp.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33027524" vertical-offset="4606" max-vertical-offset="12980">
+          <caret line="236" column="0" selection-start-line="236" selection-start-column="0" selection-end-line="236" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="2.2118492" vertical-offset="0" max-vertical-offset="1496">
+          <caret line="87" column="52" selection-start-line="87" selection-start-column="52" selection-end-line="87" selection-end-column="52" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.4901257" vertical-offset="79" max-vertical-offset="1298">
+          <caret line="25" column="25" selection-start-line="25" selection-start-column="25" selection-end-line="25" selection-end-column="25" />
+          <folding>
+            <marker date="1537412037475" expanded="true" signature="-1:-1" placeholder="select equip..PG_EQUIPMENT..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.8330341" vertical-offset="680" max-vertical-offset="4466">
+          <caret line="68" column="29" selection-start-line="68" selection-start-column="29" selection-end-line="68" selection-end-column="29" />
+          <folding>
+            <element signature="e#1490#1506#0" expanded="true" />
+            <element signature="e#6332#6348#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgEquipment.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.3680431" vertical-offset="191" max-vertical-offset="1540">
+          <caret line="20" column="17" selection-start-line="20" selection-start-column="17" selection-end-line="20" selection-end-column="17" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/4.3.6.Final/hibernate-core-4.3.6.Final-sources.jar!/org/hibernate/internal/AbstractQueryImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33333334" vertical-offset="18814" max-vertical-offset="20328">
+          <caret line="974" column="0" selection-start-line="974" selection-start-column="0" selection-end-line="974" selection-end-column="0" />
+          <folding />
+        </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 vertical-scroll-proportion="0.5924596" vertical-offset="0" max-vertical-offset="1980">
+          <caret line="18" column="32" selection-start-line="18" selection-start-column="32" selection-end-line="18" selection-end-column="32" />
+          <folding />
+        </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 vertical-scroll-proportion="0.7109515" vertical-offset="0" max-vertical-offset="704">
+          <caret line="18" column="31" selection-start-line="18" selection-start-column="31" selection-end-line="18" selection-end-column="31" />
+          <folding>
+            <element signature="e#213#214#0" expanded="true" />
+            <element signature="e#244#245#0" expanded="true" />
+            <element signature="e#292#293#0" expanded="true" />
+            <element signature="e#332#333#0" expanded="true" />
+            <element signature="e#394#395#0" expanded="true" />
+            <element signature="e#438#439#0" expanded="true" />
+            <element signature="e#474#475#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://C:/Program Files/Java/jdk1.8.0_131/src.zip!/java/lang/String.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.21139705" vertical-offset="1469" max-vertical-offset="67452">
+          <caret line="107" column="16" selection-start-line="107" selection-start-column="12" selection-end-line="107" selection-end-column="16" />
+          <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 vertical-scroll-proportion="0.0" vertical-offset="2301" max-vertical-offset="3388">
+          <caret line="277" column="9" selection-start-line="277" selection-start-column="9" selection-end-line="277" selection-end-column="9" />
+          <folding>
+            <element signature="method#addLog#0;class#PgPipeLineRs#0" expanded="false" />
+            <element signature="method#editPipeLine#0;class#PgPipeLineRs#0" expanded="false" />
+            <element signature="method#deletePipeLine#0;class#PgPipeLineRs#0" expanded="false" />
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" expanded="false" />
+            <element signature="e#9602#9626#0" expanded="true" />
+            <element signature="e#10329#10337#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.43727598" vertical-offset="120" max-vertical-offset="1122">
+          <caret line="13" column="34" selection-start-line="13" selection-start-column="34" selection-end-line="13" selection-end-column="34" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.8547855" vertical-offset="137" max-vertical-offset="704">
+          <caret line="18" column="31" selection-start-line="18" selection-start-column="31" selection-end-line="18" selection-end-column="31" />
+          <folding>
+            <element signature="e#204#205#0" expanded="true" />
+            <element signature="e#233#234#0" expanded="true" />
+            <element signature="e#277#278#0" expanded="true" />
+            <element signature="e#313#314#0" expanded="true" />
+            <element signature="e#375#376#0" expanded="true" />
+            <element signature="e#419#420#0" expanded="true" />
+            <element signature="e#455#456#0" expanded="true" />
+          </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 vertical-scroll-proportion="0.0" vertical-offset="330" max-vertical-offset="1342">
+          <caret line="55" column="42" selection-start-line="55" selection-start-column="42" selection-end-line="55" selection-end-column="42" />
+          <folding>
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" expanded="false" />
+            <element signature="e#1787#1811#0" expanded="true" />
+            <element signature="e#2482#2490#0" expanded="true" />
+            <marker date="1537414540748" expanded="true" signature="1552:1622" placeholder="select LINE_..PG_PIPELINE..." />
+            <marker date="1537414540748" expanded="true" signature="1552:1621" placeholder="select LINE_..PG_PIPELINE..." />
+            <marker date="1537414540748" expanded="true" signature="2310:2352" placeholder="select disti..PG_PIPELINE..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="849" max-vertical-offset="1650">
+          <caret line="61" column="56" selection-start-line="61" selection-start-column="56" selection-end-line="61" selection-end-column="56" />
+          <folding>
+            <element signature="e#2433#2452#0" expanded="true" />
+            <marker date="1537414756878" expanded="true" signature="2209:2277" placeholder="select PG_NA..PG_PIPE_GALLERY..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.7140151" vertical-offset="4067" max-vertical-offset="4752">
+          <caret line="221" column="27" selection-start-line="221" selection-start-column="27" selection-end-line="221" selection-end-column="27" />
+          <folding>
+            <element signature="e#6945#6964#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java
index 238bc39..6256b9d 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java
@@ -78,7 +78,7 @@
     public PgEquipmentDto(PgEquipment equipment) {
         if (equipment == null) return;
 
-        SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 
         this.setId(equipment.getId());
         this.setEqName(equipment.getEqName());

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 73b1050..7a80a23 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,34 +2,17 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="">
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\~$数据库设计说明新需求.docx" afterPath="" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/~$数据库设计说明新需求.docx" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineLengthStatic.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/接口说明新需求.docx" afterPath="$PROJECT_DIR$/接口说明新需求.docx" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainTypeManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainTypeManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources/application.properties" afterPath="$PROJECT_DIR$/src/main/resources/application.properties" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
     </list>
     <ignored path="PgInterface.iws" />
@@ -54,7 +37,67 @@
     <favorites_list name="PgInterface" />
   </component>
   <component name="FileEditorManager">
-    <leaf />
+    <leaf>
+      <file leaf-file-name="PgPipeLineRs.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.0" vertical-offset="2301" max-vertical-offset="3388">
+              <caret line="277" column="9" selection-start-line="277" selection-start-column="9" selection-end-line="277" selection-end-column="9" />
+              <folding>
+                <element signature="method#addLog#0;class#PgPipeLineRs#0" expanded="false" />
+                <element signature="method#editPipeLine#0;class#PgPipeLineRs#0" expanded="false" />
+                <element signature="method#deletePipeLine#0;class#PgPipeLineRs#0" expanded="false" />
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" expanded="false" />
+                <element signature="e#9602#9626#0" expanded="true" />
+                <element signature="e#10329#10337#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="PgPipeLineManager.java" pinned="false" current="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 vertical-scroll-proportion="0.0" vertical-offset="330" max-vertical-offset="1342">
+              <caret line="55" column="42" selection-start-line="55" selection-start-column="42" selection-end-line="55" selection-end-column="42" />
+              <folding>
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" expanded="false" />
+                <element signature="e#1787#1811#0" expanded="true" />
+                <element signature="e#2482#2490#0" expanded="true" />
+                <marker date="1537414540748" expanded="true" signature="1552:1622" placeholder="select LINE_..PG_PIPELINE..." />
+                <marker date="1537414540748" expanded="true" signature="1552:1621" placeholder="select LINE_..PG_PIPELINE..." />
+                <marker date="1537414540748" expanded="true" signature="2310:2352" placeholder="select disti..PG_PIPELINE..." />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="PipeGalleryRs.java" pinned="false" current="true" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.7140151" vertical-offset="4067" max-vertical-offset="4752">
+              <caret line="221" column="27" selection-start-line="221" selection-start-column="27" selection-end-line="221" selection-end-column="27" />
+              <folding>
+                <element signature="e#6945#6964#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="PipeGalleryManager.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.0" vertical-offset="849" max-vertical-offset="1650">
+              <caret line="61" column="56" selection-start-line="61" selection-start-column="56" selection-end-line="61" selection-end-column="56" />
+              <folding>
+                <element signature="e#2433#2452#0" expanded="true" />
+                <marker date="1537414756878" expanded="true" signature="2209:2277" placeholder="select PG_NA..PG_PIPE_GALLERY..." />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+    </leaf>
   </component>
   <component name="FindManager">
     <FindUsagesManager>
@@ -72,9 +115,6 @@
   <component name="IdeDocumentHistory">
     <option name="changedFiles">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
         <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/manager/PgInPgPersonManager.java" />
@@ -86,23 +126,16 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintainType.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/manager/PgPipeLineManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/EquipmentManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgEquipment.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.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/rs/PgPartitionRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.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/PgDeviceTypeRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
         <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.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/PgMaintainTypeRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainTypeManager.java" />
@@ -123,6 +156,16 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.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/dto/PgPipeLineLengthStatic.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/dto/PipeGalleryDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.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" />
       </list>
     </option>
   </component>
@@ -216,7 +259,20 @@
       <sortByType />
     </navigator>
     <panes>
-      <pane id="Scope" />
+      <pane id="PackagesPane">
+        <subPane>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
+            </PATH_ELEMENT>
+          </PATH>
+        </subPane>
+      </pane>
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -331,22 +387,73 @@
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
-        </subPane>
-      </pane>
-      <pane id="PackagesPane">
-        <subPane>
           <PATH>
             <PATH_ELEMENT>
               <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
               <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="devTable" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="devTable" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="dto" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
         </subPane>
       </pane>
+      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -916,7 +1023,12 @@
       <workItem from="1535958569443" duration="219000" />
       <workItem from="1536111554952" duration="23051000" />
       <workItem from="1536143316539" duration="3706000" />
-      <workItem from="1536195067076" duration="23441000" />
+      <workItem from="1536195067076" duration="23586000" />
+      <workItem from="1536802841385" duration="18000" />
+      <workItem from="1537167144071" duration="1232000" />
+      <workItem from="1537236948589" duration="156000" />
+      <workItem from="1537237991303" duration="1733000" />
+      <workItem from="1537407751831" duration="6397000" />
     </task>
     <task id="LOCAL-00001" summary="first commit">
       <created>1510219102698</created>
@@ -1126,11 +1238,15 @@
       <created>1535958368940</created>
       <updated>1535958368940</updated>
     </task>
-    <option name="localTasksCounter" value="53" />
+    <task id="LOCAL-00053" summary="根据华锐王工反馈测试，修改接口">
+      <created>1536224373164</created>
+      <updated>1536224373165</updated>
+    </task>
+    <option name="localTasksCounter" value="54" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="937579000" />
+    <option name="totallyTimeSpent" value="947260000" />
   </component>
   <component name="TodoView" selected-index="1">
     <todo-panel id="selected-file">
@@ -1165,7 +1281,7 @@
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.391453" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.66382253" sideWeight="0.81316185" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.7235495" sideWeight="0.81316185" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="true" content_ui="tabs" />
       <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.6757679" sideWeight="0.18683812" order="7" side_tool="true" content_ui="tabs" />
@@ -1177,8 +1293,8 @@
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24962178" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32980332" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32649574" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2526475" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32593855" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.28441754" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" />
@@ -1192,18 +1308,18 @@
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
     </layout>
     <layout-to-restore>
-      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.63418806" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
-      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
+      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.391453" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
       <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" />
-      <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.50341296" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
+      <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2962963" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
+      <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.52136755" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32649574" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.29425114" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
@@ -1223,8 +1339,8 @@
       <window_info id="Android" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="15" side_tool="false" content_ui="tabs" />
       <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="true" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32980332" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
     </layout-to-restore>
   </component>
@@ -1243,7 +1359,6 @@
     <option name="myTodoPanelSettings">
       <TodoPanelSettings />
     </option>
-    <MESSAGE value="修改人员入廊记录表和功能" />
     <MESSAGE value="Merge remote-tracking branch 'origin/develop' into develop&#10;&#10;Conflicts:&#10;&#9;.idea/workspace.xml&#10;&#9;~$数据库设计说明新需求.docx&#10;&#9;管廊数据库设计说明新需求.docx&#10;" />
     <MESSAGE value="增加统计功能" />
     <MESSAGE value="修改标注" />
@@ -1268,7 +1383,8 @@
     <MESSAGE value="新增维护类别" />
     <MESSAGE value="修改施工数据新增删除编辑" />
     <MESSAGE value="新增工器具耗材" />
-    <option name="LAST_COMMIT_MESSAGE" value="新增工器具耗材" />
+    <MESSAGE value="根据华锐王工反馈测试，修改接口" />
+    <option name="LAST_COMMIT_MESSAGE" value="根据华锐王工反馈测试，修改接口" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1291,14 +1407,8 @@
           <properties />
           <option name="timeStamp" value="359" />
         </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java</url>
-          <line>190</line>
-          <properties />
-          <option name="timeStamp" value="360" />
-        </line-breakpoint>
       </breakpoints>
-      <option name="time" value="390" />
+      <option name="time" value="399" />
     </breakpoint-manager>
   </component>
   <component name="antWorkspaceConfiguration">
@@ -1306,163 +1416,10 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="3119" max-vertical-offset="7128">
-          <caret line="30" column="52" selection-start-line="30" selection-start-column="52" selection-end-line="30" selection-end-column="52" />
-          <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 vertical-scroll-proportion="0.0" vertical-offset="5071" max-vertical-offset="5918">
-          <caret line="268" column="24" selection-start-line="268" selection-start-column="24" selection-end-line="268" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="13" max-vertical-offset="3058">
-          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.5529623" vertical-offset="528" max-vertical-offset="3014">
-          <caret line="26" column="0" selection-start-line="26" selection-start-column="0" selection-end-line="26" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainTypeDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.33213645" vertical-offset="101" max-vertical-offset="1012">
-          <caret line="15" column="11" selection-start-line="15" selection-start-column="11" selection-end-line="15" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="609" max-vertical-offset="1958">
-          <caret line="39" column="50" selection-start-line="39" selection-start-column="50" selection-end-line="39" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.7271095" vertical-offset="167" max-vertical-offset="1342">
-          <caret line="35" column="0" selection-start-line="35" selection-start-column="0" selection-end-line="35" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.63195693" vertical-offset="0" max-vertical-offset="1452">
-          <caret line="19" column="0" selection-start-line="19" selection-start-column="0" selection-end-line="19" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintainDoc.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.69669116" vertical-offset="61" max-vertical-offset="1320">
-          <caret line="24" column="0" selection-start-line="24" selection-start-column="0" selection-end-line="24" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDocDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.27648115" vertical-offset="0" max-vertical-offset="1342">
-          <caret line="9" column="13" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-7.551724" vertical-offset="3125" max-vertical-offset="4048">
-          <caret line="249" column="85" selection-start-line="249" selection-start-column="85" selection-end-line="249" selection-end-column="85" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-9.862069" vertical-offset="3674" max-vertical-offset="5610">
-          <caret line="203" column="58" selection-start-line="203" selection-start-column="58" selection-end-line="203" selection-end-column="58" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.31597847" vertical-offset="0" max-vertical-offset="557">
-          <caret line="8" column="35" selection-start-line="8" selection-start-column="35" selection-end-line="8" selection-end-column="35" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.66360295" vertical-offset="783" max-vertical-offset="3234">
-          <caret line="68" column="71" selection-start-line="68" selection-start-column="71" selection-end-line="68" selection-end-column="71" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="33" max-vertical-offset="968">
-          <caret line="33" column="62" selection-start-line="33" selection-start-column="62" selection-end-line="33" selection-end-column="62" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://C:/Program Files/Java/jdk1.8.0_131/src.zip!/java/lang/NumberFormatException.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.6285178" vertical-offset="479" max-vertical-offset="1012">
-          <caret line="64" column="0" selection-start-line="64" selection-start-column="0" selection-end-line="64" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-tx/4.0.6.RELEASE/spring-tx-4.0.6.RELEASE-sources.jar!/org/springframework/transaction/interceptor/TransactionAspectSupport.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.23639774" vertical-offset="4736" max-vertical-offset="13244">
-          <caret line="263" column="0" selection-start-line="263" selection-start-column="0" selection-end-line="263" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.2504817" vertical-offset="618" max-vertical-offset="1320">
-          <caret line="35" column="28" selection-start-line="35" selection-start-column="28" selection-end-line="35" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://C:/Program Files/Java/jdk1.8.0_131/src.zip!/java/util/ArrayList.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.73967683" vertical-offset="13360" max-vertical-offset="30690">
-          <caret line="663" column="7" selection-start-line="663" selection-start-column="7" selection-end-line="663" selection-end-column="7" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/StringUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.15798923" vertical-offset="330" max-vertical-offset="2178">
-          <caret line="31" column="29" selection-start-line="31" selection-start-column="29" selection-end-line="31" selection-end-column="29" />
-          <folding />
-        </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 vertical-scroll-proportion="0.11143695" vertical-offset="1854" max-vertical-offset="5170">
-          <caret line="103" column="65" selection-start-line="103" selection-start-column="65" selection-end-line="103" selection-end-column="65" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="jar://C:/Program Files/Java/jdk1.8.0_131/src.zip!/java/util/concurrent/ThreadPoolExecutor.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="1.659824" vertical-offset="23436" max-vertical-offset="44594">
           <caret line="1148" column="31" selection-start-line="1148" selection-start-column="31" selection-end-line="1148" selection-end-column="31" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1470,17 +1427,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.2404692" vertical-offset="9532" max-vertical-offset="12958">
           <caret line="497" column="0" selection-start-line="497" selection-start-column="0" selection-end-line="497" selection-end-column="0" />
-          <folding />
-        </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 vertical-scroll-proportion="0.0" vertical-offset="4977" max-vertical-offset="8316">
-          <caret line="263" column="24" selection-start-line="263" selection-start-column="24" selection-end-line="263" selection-end-column="24" />
-          <folding>
-            <element signature="e#10383#10401#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1488,7 +1434,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-2.1782365" vertical-offset="1359" max-vertical-offset="1892">
           <caret line="24" column="13" selection-start-line="24" selection-start-column="13" selection-end-line="24" selection-end-column="13" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1496,7 +1441,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-1.4093357" vertical-offset="1907" max-vertical-offset="2464">
           <caret line="65" column="60" selection-start-line="65" selection-start-column="11" selection-end-line="65" selection-end-column="60" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1504,10 +1448,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-0.011029412" vertical-offset="2228" max-vertical-offset="2838">
           <caret line="111" column="47" selection-start-line="111" selection-start-column="47" selection-end-line="111" selection-end-column="47" />
-          <folding>
-            <marker date="1535944027199" expanded="true" signature="-1:-1" placeholder="select devic..PG_DEVICE..." />
-            <marker date="1535944027199" expanded="true" signature="-1:-1" placeholder="select * fro..PG_DEVICE..." />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1515,7 +1455,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.76301616" vertical-offset="1687" max-vertical-offset="2376">
           <caret line="143" column="16" selection-start-line="143" selection-start-column="16" selection-end-line="143" selection-end-column="16" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1523,7 +1462,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.88509876" vertical-offset="519" max-vertical-offset="1342">
           <caret line="68" column="0" selection-start-line="68" selection-start-column="0" selection-end-line="68" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1531,7 +1469,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.43267503" vertical-offset="23" max-vertical-offset="1672">
           <caret line="15" column="33" selection-start-line="15" selection-start-column="33" selection-end-line="15" selection-end-column="33" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1540,42 +1477,8 @@
         <state vertical-scroll-proportion="0.5257353" vertical-offset="0" max-vertical-offset="4972">
           <caret line="30" column="0" selection-start-line="30" selection-start-column="0" selection-end-line="30" selection-end-column="0" />
           <folding>
-            <element signature="e#3701#3720#0" expanded="true" />
-            <element signature="e#4190#4208#0" expanded="true" />
-            <marker date="1536211271563" expanded="true" signature="-1:-1" placeholder="select count..PG_CONSTRUCTION..." />
-            <marker date="1536211271563" expanded="true" signature="-1:-1" placeholder="select count..Pg_Construction..." />
-            <marker date="1536211271563" expanded="true" signature="-1:-1" placeholder="SELECT t.ID,..PG_CONSTRUCTION..." />
-            <marker date="1536211271563" expanded="true" signature="-1:-1" placeholder="SELECT m.PAR..PG_PARTITION..." />
-            <marker date="1536211271563" expanded="true" signature="-1:-1" placeholder="SELECT n.TYP..PG_CONSTRUCTION_TYPE..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.40754038" vertical-offset="675" max-vertical-offset="1540">
-          <caret line="108" column="52" selection-start-line="108" selection-start-column="52" selection-end-line="108" selection-end-column="52" />
-          <folding>
-            <element signature="method#saveFiles#0;class#PgCsDocumentManager#0" expanded="false" />
-            <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" expanded="false" />
-            <element signature="e#3728#3745#0" expanded="true" />
-            <marker date="1536205913620" expanded="true" signature="-1:-1" placeholder="select * fro..PG_CSDOCUMENT..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.41666666" vertical-offset="2772" max-vertical-offset="3674">
-          <caret line="192" column="13" selection-start-line="192" selection-start-column="13" selection-end-line="192" selection-end-column="13" />
-          <folding>
-            <element signature="method#setPgCsDocumentManager#0;class#PgCsDocumentRs#0" expanded="false" />
-            <element signature="method#setPgConstructionManager#0;class#PgCsDocumentRs#0" expanded="false" />
-            <element signature="e#2023#2039#0" expanded="true" />
-            <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" expanded="false" />
-            <element signature="e#6060#6076#0" expanded="true" />
-            <element signature="e#6145#6162#0" expanded="true" />
-            <element signature="method#downloadFile#0;class#PgCsDocumentRs#0" expanded="false" />
+            <element signature="e#3701#3720#0" expanded="false" />
+            <element signature="e#4190#4208#0" expanded="false" />
           </folding>
         </state>
       </provider>
@@ -1584,24 +1487,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.9640933" vertical-offset="1091" max-vertical-offset="2112">
           <caret line="83" column="62" selection-start-line="83" selection-start-column="62" selection-end-line="83" selection-end-column="62" />
-          <folding>
-            <element signature="e#2170#2184#0" expanded="true" />
-            <marker date="1536213480710" expanded="true" signature="-1:-1" placeholder="select count..PG_ALARM..." />
-            <marker date="1536213480710" expanded="true" signature="-1:-1" placeholder="select count..PG_ALARM..." />
-            <marker date="1536213480710" expanded="true" signature="-1:-1" placeholder="select count..PG_ALARM..." />
-            <marker date="1536213480710" expanded="true" signature="-1:-1" placeholder="select count..PG_ALARM..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.41666666" vertical-offset="990" max-vertical-offset="1672">
-          <caret line="72" column="55" selection-start-line="72" selection-start-column="55" selection-end-line="72" selection-end-column="55" />
-          <folding>
-            <element signature="e#2152#2168#0" expanded="false" />
-            <element signature="e#2257#2271#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1609,10 +1494,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.75" vertical-offset="440" max-vertical-offset="3938">
           <caret line="62" column="13" selection-start-line="62" selection-start-column="13" selection-end-line="62" selection-end-column="13" />
-          <folding>
-            <element signature="e#1393#1394#0" expanded="false" />
-            <element signature="e#1451#1452#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1620,7 +1501,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.35547575" vertical-offset="0" max-vertical-offset="1012">
           <caret line="18" column="0" selection-start-line="18" selection-start-column="0" selection-end-line="18" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1628,9 +1508,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.45421904" vertical-offset="2145" max-vertical-offset="3608">
           <caret line="125" column="29" selection-start-line="125" selection-start-column="29" selection-end-line="125" selection-end-column="29" />
-          <folding>
-            <element signature="e#3094#3110#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1638,7 +1515,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.513465" vertical-offset="0" max-vertical-offset="1276">
           <caret line="22" column="51" selection-start-line="22" selection-start-column="51" selection-end-line="22" selection-end-column="51" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1646,7 +1522,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.5924596" vertical-offset="0" max-vertical-offset="1254">
           <caret line="20" column="28" selection-start-line="20" selection-start-column="28" selection-end-line="20" selection-end-column="28" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1654,18 +1529,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-3.3052065" vertical-offset="4063" max-vertical-offset="4620">
           <caret line="115" column="15" selection-start-line="115" selection-start-column="15" selection-end-line="115" selection-end-column="15" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.20833333" vertical-offset="1892" max-vertical-offset="3850">
-          <caret line="152" column="24" selection-start-line="152" selection-start-column="24" selection-end-line="152" selection-end-column="24" />
-          <folding>
-            <element signature="method#addReservePlan#0;class#PgReservePlanRs#0" expanded="false" />
-            <element signature="e#3206#3222#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1673,7 +1536,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.06147541" vertical-offset="183" max-vertical-offset="506">
           <caret line="10" column="0" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1681,7 +1543,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="3388">
           <caret line="39" column="56" selection-start-line="39" selection-start-column="56" selection-end-line="39" selection-end-column="56" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1689,22 +1550,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.33213645" vertical-offset="959" max-vertical-offset="2508">
           <caret line="71" column="36" selection-start-line="71" selection-start-column="36" selection-end-line="71" selection-end-column="36" />
-          <folding>
-            <marker date="1536217243963" expanded="true" signature="-1:-1" placeholder="select count..PG_RESERVE_PLAN..." />
-          </folding>
-        </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 vertical-scroll-proportion="0.46401516" vertical-offset="1273" max-vertical-offset="1980">
-          <caret line="106" column="70" selection-start-line="106" selection-start-column="70" selection-end-line="106" selection-end-column="70" />
-          <folding>
-            <element signature="imports" expanded="false" />
-            <element signature="method#linkDevice#0;class#PgAlarmLinkRs#0" expanded="false" />
-            <element signature="e#1459#1475#0" expanded="false" />
-            <element signature="method#linkPartitionDevice#0;class#PgAlarmLinkRs#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1712,7 +1557,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.35906643" vertical-offset="1164" max-vertical-offset="3388">
           <caret line="80" column="23" selection-start-line="80" selection-start-column="23" selection-end-line="80" selection-end-column="23" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1720,7 +1564,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.625" vertical-offset="1364" max-vertical-offset="4158">
           <caret line="99" column="37" selection-start-line="99" selection-start-column="37" selection-end-line="99" selection-end-column="37" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1728,7 +1571,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="1553" max-vertical-offset="2134">
           <caret line="98" column="16" selection-start-line="98" selection-start-column="16" selection-end-line="98" selection-end-column="16" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1736,9 +1578,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="837" max-vertical-offset="1276">
           <caret line="59" column="0" selection-start-line="59" selection-start-column="0" selection-end-line="59" selection-end-column="0" />
-          <folding>
-            <element signature="e#1980#1990#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1746,10 +1585,259 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.24955116" vertical-offset="631" max-vertical-offset="1232">
           <caret line="58" column="34" selection-start-line="58" selection-start-column="34" selection-end-line="58" selection-end-column="34" />
+        </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 vertical-scroll-proportion="0.0" vertical-offset="6759" max-vertical-offset="8316">
+          <caret line="268" column="42" selection-start-line="268" selection-start-column="42" selection-end-line="268" selection-end-column="42" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.8779174" vertical-offset="347" max-vertical-offset="2662">
+          <caret line="54" column="9" selection-start-line="54" selection-start-column="9" selection-end-line="54" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="1.9353681" vertical-offset="0" max-vertical-offset="4906">
+          <caret line="70" column="71" selection-start-line="70" selection-start-column="66" selection-end-line="70" selection-end-column="75" />
+        </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 vertical-scroll-proportion="0.32854578" vertical-offset="1115" max-vertical-offset="1672">
+          <caret line="76" column="33" selection-start-line="76" selection-start-column="33" selection-end-line="76" selection-end-column="33" />
+        </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 vertical-scroll-proportion="3.1723518" vertical-offset="81" max-vertical-offset="2354">
+          <caret line="104" column="12" selection-start-line="104" selection-start-column="12" selection-end-line="104" selection-end-column="12" />
           <folding />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.5260323" vertical-offset="4239" max-vertical-offset="4796">
+          <caret line="224" column="0" selection-start-line="224" selection-start-column="0" selection-end-line="224" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.6445242" vertical-offset="1709" max-vertical-offset="2332">
+          <caret line="111" column="53" selection-start-line="111" selection-start-column="53" selection-end-line="111" selection-end-column="53" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-3.5421903" vertical-offset="5515" max-vertical-offset="6072">
+          <caret line="184" column="25" selection-start-line="184" selection-start-column="25" selection-end-line="184" selection-end-column="25" />
+        </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 vertical-scroll-proportion="-0.78994614" vertical-offset="924" max-vertical-offset="7128">
+          <caret line="41" column="5" selection-start-line="41" selection-start-column="5" selection-end-line="41" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.4344704" vertical-offset="748" max-vertical-offset="1474">
+          <caret line="72" column="0" selection-start-line="72" selection-start-column="0" selection-end-line="72" selection-end-column="0" />
+        </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 vertical-scroll-proportion="0.0" vertical-offset="264" max-vertical-offset="1782">
+          <caret line="37" column="57" selection-start-line="37" selection-start-column="57" selection-end-line="37" selection-end-column="57" />
+          <folding>
+            <marker date="1531722832731" expanded="true" signature="-1:-1" placeholder="select id,CH..PG_CH4..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2420">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://C:/Program Files/Java/jdk1.8.0_131/src.zip!/java/sql/Timestamp.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33027524" vertical-offset="4606" max-vertical-offset="12980">
+          <caret line="236" column="0" selection-start-line="236" selection-start-column="0" selection-end-line="236" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="2.2118492" vertical-offset="0" max-vertical-offset="1496">
+          <caret line="87" column="52" selection-start-line="87" selection-start-column="52" selection-end-line="87" selection-end-column="52" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.4901257" vertical-offset="79" max-vertical-offset="1298">
+          <caret line="25" column="25" selection-start-line="25" selection-start-column="25" selection-end-line="25" selection-end-column="25" />
+          <folding>
+            <marker date="1537412037475" expanded="true" signature="-1:-1" placeholder="select equip..PG_EQUIPMENT..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.8330341" vertical-offset="680" max-vertical-offset="4466">
+          <caret line="68" column="29" selection-start-line="68" selection-start-column="29" selection-end-line="68" selection-end-column="29" />
+          <folding>
+            <element signature="e#1490#1506#0" expanded="true" />
+            <element signature="e#6332#6348#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgEquipment.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.3680431" vertical-offset="191" max-vertical-offset="1540">
+          <caret line="20" column="17" selection-start-line="20" selection-start-column="17" selection-end-line="20" selection-end-column="17" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/4.3.6.Final/hibernate-core-4.3.6.Final-sources.jar!/org/hibernate/internal/AbstractQueryImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33333334" vertical-offset="18814" max-vertical-offset="20328">
+          <caret line="974" column="0" selection-start-line="974" selection-start-column="0" selection-end-line="974" selection-end-column="0" />
+          <folding />
+        </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 vertical-scroll-proportion="0.5924596" vertical-offset="0" max-vertical-offset="1980">
+          <caret line="18" column="32" selection-start-line="18" selection-start-column="32" selection-end-line="18" selection-end-column="32" />
+          <folding />
+        </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 vertical-scroll-proportion="0.7109515" vertical-offset="0" max-vertical-offset="704">
+          <caret line="18" column="31" selection-start-line="18" selection-start-column="31" selection-end-line="18" selection-end-column="31" />
+          <folding>
+            <element signature="e#213#214#0" expanded="true" />
+            <element signature="e#244#245#0" expanded="true" />
+            <element signature="e#292#293#0" expanded="true" />
+            <element signature="e#332#333#0" expanded="true" />
+            <element signature="e#394#395#0" expanded="true" />
+            <element signature="e#438#439#0" expanded="true" />
+            <element signature="e#474#475#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://C:/Program Files/Java/jdk1.8.0_131/src.zip!/java/lang/String.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.21139705" vertical-offset="1469" max-vertical-offset="67452">
+          <caret line="107" column="16" selection-start-line="107" selection-start-column="12" selection-end-line="107" selection-end-column="16" />
+          <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 vertical-scroll-proportion="0.0" vertical-offset="2301" max-vertical-offset="3388">
+          <caret line="277" column="9" selection-start-line="277" selection-start-column="9" selection-end-line="277" selection-end-column="9" />
+          <folding>
+            <element signature="method#addLog#0;class#PgPipeLineRs#0" expanded="false" />
+            <element signature="method#editPipeLine#0;class#PgPipeLineRs#0" expanded="false" />
+            <element signature="method#deletePipeLine#0;class#PgPipeLineRs#0" expanded="false" />
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" expanded="false" />
+            <element signature="e#9602#9626#0" expanded="true" />
+            <element signature="e#10329#10337#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.43727598" vertical-offset="120" max-vertical-offset="1122">
+          <caret line="13" column="34" selection-start-line="13" selection-start-column="34" selection-end-line="13" selection-end-column="34" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.8547855" vertical-offset="137" max-vertical-offset="704">
+          <caret line="18" column="31" selection-start-line="18" selection-start-column="31" selection-end-line="18" selection-end-column="31" />
+          <folding>
+            <element signature="e#204#205#0" expanded="true" />
+            <element signature="e#233#234#0" expanded="true" />
+            <element signature="e#277#278#0" expanded="true" />
+            <element signature="e#313#314#0" expanded="true" />
+            <element signature="e#375#376#0" expanded="true" />
+            <element signature="e#419#420#0" expanded="true" />
+            <element signature="e#455#456#0" expanded="true" />
+          </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 vertical-scroll-proportion="0.0" vertical-offset="330" max-vertical-offset="1342">
+          <caret line="55" column="42" selection-start-line="55" selection-start-column="42" selection-end-line="55" selection-end-column="42" />
+          <folding>
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" expanded="false" />
+            <element signature="e#1787#1811#0" expanded="true" />
+            <element signature="e#2482#2490#0" expanded="true" />
+            <marker date="1537414540748" expanded="true" signature="1552:1622" placeholder="select LINE_..PG_PIPELINE..." />
+            <marker date="1537414540748" expanded="true" signature="1552:1621" placeholder="select LINE_..PG_PIPELINE..." />
+            <marker date="1537414540748" expanded="true" signature="2310:2352" placeholder="select disti..PG_PIPELINE..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="849" max-vertical-offset="1650">
+          <caret line="61" column="56" selection-start-line="61" selection-start-column="56" selection-end-line="61" selection-end-column="56" />
+          <folding>
+            <element signature="e#2433#2452#0" expanded="true" />
+            <marker date="1537414756878" expanded="true" signature="2209:2277" placeholder="select PG_NA..PG_PIPE_GALLERY..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.7140151" vertical-offset="4067" max-vertical-offset="4752">
+          <caret line="221" column="27" selection-start-line="221" selection-start-column="27" selection-end-line="221" selection-end-column="27" />
+          <folding>
+            <element signature="e#6945#6964#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java
index 238bc39..6256b9d 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java
@@ -78,7 +78,7 @@
     public PgEquipmentDto(PgEquipment equipment) {
         if (equipment == null) return;
 
-        SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 
         this.setId(equipment.getId());
         this.setEqName(equipment.getEqName());
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineLengthStatic.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineLengthStatic.java
new file mode 100644
index 0000000..a25538f
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineLengthStatic.java
@@ -0,0 +1,26 @@
+package com.casic.PgInterface.devTable.dto;
+
+/**
+ * Created by yxw on 2018/9/20.
+ */
+public class PgPipeLineLengthStatic {
+
+    private String lineType;
+    private String length;
+
+    public String getLineType() {
+        return lineType;
+    }
+
+    public void setLineType(String lineType) {
+        this.lineType = lineType;
+    }
+
+    public String getLength() {
+        return length;
+    }
+
+    public void setLength(String length) {
+        this.length = length;
+    }
+}

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 73b1050..7a80a23 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,34 +2,17 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="">
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\~$数据库设计说明新需求.docx" afterPath="" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/~$数据库设计说明新需求.docx" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineLengthStatic.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/接口说明新需求.docx" afterPath="$PROJECT_DIR$/接口说明新需求.docx" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainTypeManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainTypeManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources/application.properties" afterPath="$PROJECT_DIR$/src/main/resources/application.properties" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
     </list>
     <ignored path="PgInterface.iws" />
@@ -54,7 +37,67 @@
     <favorites_list name="PgInterface" />
   </component>
   <component name="FileEditorManager">
-    <leaf />
+    <leaf>
+      <file leaf-file-name="PgPipeLineRs.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.0" vertical-offset="2301" max-vertical-offset="3388">
+              <caret line="277" column="9" selection-start-line="277" selection-start-column="9" selection-end-line="277" selection-end-column="9" />
+              <folding>
+                <element signature="method#addLog#0;class#PgPipeLineRs#0" expanded="false" />
+                <element signature="method#editPipeLine#0;class#PgPipeLineRs#0" expanded="false" />
+                <element signature="method#deletePipeLine#0;class#PgPipeLineRs#0" expanded="false" />
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" expanded="false" />
+                <element signature="e#9602#9626#0" expanded="true" />
+                <element signature="e#10329#10337#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="PgPipeLineManager.java" pinned="false" current="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 vertical-scroll-proportion="0.0" vertical-offset="330" max-vertical-offset="1342">
+              <caret line="55" column="42" selection-start-line="55" selection-start-column="42" selection-end-line="55" selection-end-column="42" />
+              <folding>
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" expanded="false" />
+                <element signature="e#1787#1811#0" expanded="true" />
+                <element signature="e#2482#2490#0" expanded="true" />
+                <marker date="1537414540748" expanded="true" signature="1552:1622" placeholder="select LINE_..PG_PIPELINE..." />
+                <marker date="1537414540748" expanded="true" signature="1552:1621" placeholder="select LINE_..PG_PIPELINE..." />
+                <marker date="1537414540748" expanded="true" signature="2310:2352" placeholder="select disti..PG_PIPELINE..." />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="PipeGalleryRs.java" pinned="false" current="true" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.7140151" vertical-offset="4067" max-vertical-offset="4752">
+              <caret line="221" column="27" selection-start-line="221" selection-start-column="27" selection-end-line="221" selection-end-column="27" />
+              <folding>
+                <element signature="e#6945#6964#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="PipeGalleryManager.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.0" vertical-offset="849" max-vertical-offset="1650">
+              <caret line="61" column="56" selection-start-line="61" selection-start-column="56" selection-end-line="61" selection-end-column="56" />
+              <folding>
+                <element signature="e#2433#2452#0" expanded="true" />
+                <marker date="1537414756878" expanded="true" signature="2209:2277" placeholder="select PG_NA..PG_PIPE_GALLERY..." />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+    </leaf>
   </component>
   <component name="FindManager">
     <FindUsagesManager>
@@ -72,9 +115,6 @@
   <component name="IdeDocumentHistory">
     <option name="changedFiles">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
         <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/manager/PgInPgPersonManager.java" />
@@ -86,23 +126,16 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintainType.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/manager/PgPipeLineManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/EquipmentManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgEquipment.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.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/rs/PgPartitionRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.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/PgDeviceTypeRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
         <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.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/PgMaintainTypeRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainTypeManager.java" />
@@ -123,6 +156,16 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.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/dto/PgPipeLineLengthStatic.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/dto/PipeGalleryDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.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" />
       </list>
     </option>
   </component>
@@ -216,7 +259,20 @@
       <sortByType />
     </navigator>
     <panes>
-      <pane id="Scope" />
+      <pane id="PackagesPane">
+        <subPane>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
+            </PATH_ELEMENT>
+          </PATH>
+        </subPane>
+      </pane>
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -331,22 +387,73 @@
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
-        </subPane>
-      </pane>
-      <pane id="PackagesPane">
-        <subPane>
           <PATH>
             <PATH_ELEMENT>
               <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
               <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="devTable" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="devTable" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="dto" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
         </subPane>
       </pane>
+      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -916,7 +1023,12 @@
       <workItem from="1535958569443" duration="219000" />
       <workItem from="1536111554952" duration="23051000" />
       <workItem from="1536143316539" duration="3706000" />
-      <workItem from="1536195067076" duration="23441000" />
+      <workItem from="1536195067076" duration="23586000" />
+      <workItem from="1536802841385" duration="18000" />
+      <workItem from="1537167144071" duration="1232000" />
+      <workItem from="1537236948589" duration="156000" />
+      <workItem from="1537237991303" duration="1733000" />
+      <workItem from="1537407751831" duration="6397000" />
     </task>
     <task id="LOCAL-00001" summary="first commit">
       <created>1510219102698</created>
@@ -1126,11 +1238,15 @@
       <created>1535958368940</created>
       <updated>1535958368940</updated>
     </task>
-    <option name="localTasksCounter" value="53" />
+    <task id="LOCAL-00053" summary="根据华锐王工反馈测试，修改接口">
+      <created>1536224373164</created>
+      <updated>1536224373165</updated>
+    </task>
+    <option name="localTasksCounter" value="54" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="937579000" />
+    <option name="totallyTimeSpent" value="947260000" />
   </component>
   <component name="TodoView" selected-index="1">
     <todo-panel id="selected-file">
@@ -1165,7 +1281,7 @@
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.391453" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.66382253" sideWeight="0.81316185" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.7235495" sideWeight="0.81316185" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="true" content_ui="tabs" />
       <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.6757679" sideWeight="0.18683812" order="7" side_tool="true" content_ui="tabs" />
@@ -1177,8 +1293,8 @@
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24962178" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32980332" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32649574" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2526475" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32593855" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.28441754" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" />
@@ -1192,18 +1308,18 @@
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
     </layout>
     <layout-to-restore>
-      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.63418806" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
-      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
+      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.391453" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
       <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" />
-      <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.50341296" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
+      <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2962963" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
+      <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.52136755" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32649574" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.29425114" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
@@ -1223,8 +1339,8 @@
       <window_info id="Android" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="15" side_tool="false" content_ui="tabs" />
       <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="true" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32980332" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
     </layout-to-restore>
   </component>
@@ -1243,7 +1359,6 @@
     <option name="myTodoPanelSettings">
       <TodoPanelSettings />
     </option>
-    <MESSAGE value="修改人员入廊记录表和功能" />
     <MESSAGE value="Merge remote-tracking branch 'origin/develop' into develop&#10;&#10;Conflicts:&#10;&#9;.idea/workspace.xml&#10;&#9;~$数据库设计说明新需求.docx&#10;&#9;管廊数据库设计说明新需求.docx&#10;" />
     <MESSAGE value="增加统计功能" />
     <MESSAGE value="修改标注" />
@@ -1268,7 +1383,8 @@
     <MESSAGE value="新增维护类别" />
     <MESSAGE value="修改施工数据新增删除编辑" />
     <MESSAGE value="新增工器具耗材" />
-    <option name="LAST_COMMIT_MESSAGE" value="新增工器具耗材" />
+    <MESSAGE value="根据华锐王工反馈测试，修改接口" />
+    <option name="LAST_COMMIT_MESSAGE" value="根据华锐王工反馈测试，修改接口" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1291,14 +1407,8 @@
           <properties />
           <option name="timeStamp" value="359" />
         </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java</url>
-          <line>190</line>
-          <properties />
-          <option name="timeStamp" value="360" />
-        </line-breakpoint>
       </breakpoints>
-      <option name="time" value="390" />
+      <option name="time" value="399" />
     </breakpoint-manager>
   </component>
   <component name="antWorkspaceConfiguration">
@@ -1306,163 +1416,10 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="3119" max-vertical-offset="7128">
-          <caret line="30" column="52" selection-start-line="30" selection-start-column="52" selection-end-line="30" selection-end-column="52" />
-          <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 vertical-scroll-proportion="0.0" vertical-offset="5071" max-vertical-offset="5918">
-          <caret line="268" column="24" selection-start-line="268" selection-start-column="24" selection-end-line="268" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="13" max-vertical-offset="3058">
-          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.5529623" vertical-offset="528" max-vertical-offset="3014">
-          <caret line="26" column="0" selection-start-line="26" selection-start-column="0" selection-end-line="26" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainTypeDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.33213645" vertical-offset="101" max-vertical-offset="1012">
-          <caret line="15" column="11" selection-start-line="15" selection-start-column="11" selection-end-line="15" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="609" max-vertical-offset="1958">
-          <caret line="39" column="50" selection-start-line="39" selection-start-column="50" selection-end-line="39" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.7271095" vertical-offset="167" max-vertical-offset="1342">
-          <caret line="35" column="0" selection-start-line="35" selection-start-column="0" selection-end-line="35" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.63195693" vertical-offset="0" max-vertical-offset="1452">
-          <caret line="19" column="0" selection-start-line="19" selection-start-column="0" selection-end-line="19" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintainDoc.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.69669116" vertical-offset="61" max-vertical-offset="1320">
-          <caret line="24" column="0" selection-start-line="24" selection-start-column="0" selection-end-line="24" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDocDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.27648115" vertical-offset="0" max-vertical-offset="1342">
-          <caret line="9" column="13" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-7.551724" vertical-offset="3125" max-vertical-offset="4048">
-          <caret line="249" column="85" selection-start-line="249" selection-start-column="85" selection-end-line="249" selection-end-column="85" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-9.862069" vertical-offset="3674" max-vertical-offset="5610">
-          <caret line="203" column="58" selection-start-line="203" selection-start-column="58" selection-end-line="203" selection-end-column="58" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.31597847" vertical-offset="0" max-vertical-offset="557">
-          <caret line="8" column="35" selection-start-line="8" selection-start-column="35" selection-end-line="8" selection-end-column="35" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.66360295" vertical-offset="783" max-vertical-offset="3234">
-          <caret line="68" column="71" selection-start-line="68" selection-start-column="71" selection-end-line="68" selection-end-column="71" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="33" max-vertical-offset="968">
-          <caret line="33" column="62" selection-start-line="33" selection-start-column="62" selection-end-line="33" selection-end-column="62" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://C:/Program Files/Java/jdk1.8.0_131/src.zip!/java/lang/NumberFormatException.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.6285178" vertical-offset="479" max-vertical-offset="1012">
-          <caret line="64" column="0" selection-start-line="64" selection-start-column="0" selection-end-line="64" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-tx/4.0.6.RELEASE/spring-tx-4.0.6.RELEASE-sources.jar!/org/springframework/transaction/interceptor/TransactionAspectSupport.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.23639774" vertical-offset="4736" max-vertical-offset="13244">
-          <caret line="263" column="0" selection-start-line="263" selection-start-column="0" selection-end-line="263" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.2504817" vertical-offset="618" max-vertical-offset="1320">
-          <caret line="35" column="28" selection-start-line="35" selection-start-column="28" selection-end-line="35" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://C:/Program Files/Java/jdk1.8.0_131/src.zip!/java/util/ArrayList.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.73967683" vertical-offset="13360" max-vertical-offset="30690">
-          <caret line="663" column="7" selection-start-line="663" selection-start-column="7" selection-end-line="663" selection-end-column="7" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/StringUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.15798923" vertical-offset="330" max-vertical-offset="2178">
-          <caret line="31" column="29" selection-start-line="31" selection-start-column="29" selection-end-line="31" selection-end-column="29" />
-          <folding />
-        </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 vertical-scroll-proportion="0.11143695" vertical-offset="1854" max-vertical-offset="5170">
-          <caret line="103" column="65" selection-start-line="103" selection-start-column="65" selection-end-line="103" selection-end-column="65" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="jar://C:/Program Files/Java/jdk1.8.0_131/src.zip!/java/util/concurrent/ThreadPoolExecutor.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="1.659824" vertical-offset="23436" max-vertical-offset="44594">
           <caret line="1148" column="31" selection-start-line="1148" selection-start-column="31" selection-end-line="1148" selection-end-column="31" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1470,17 +1427,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.2404692" vertical-offset="9532" max-vertical-offset="12958">
           <caret line="497" column="0" selection-start-line="497" selection-start-column="0" selection-end-line="497" selection-end-column="0" />
-          <folding />
-        </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 vertical-scroll-proportion="0.0" vertical-offset="4977" max-vertical-offset="8316">
-          <caret line="263" column="24" selection-start-line="263" selection-start-column="24" selection-end-line="263" selection-end-column="24" />
-          <folding>
-            <element signature="e#10383#10401#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1488,7 +1434,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-2.1782365" vertical-offset="1359" max-vertical-offset="1892">
           <caret line="24" column="13" selection-start-line="24" selection-start-column="13" selection-end-line="24" selection-end-column="13" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1496,7 +1441,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-1.4093357" vertical-offset="1907" max-vertical-offset="2464">
           <caret line="65" column="60" selection-start-line="65" selection-start-column="11" selection-end-line="65" selection-end-column="60" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1504,10 +1448,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-0.011029412" vertical-offset="2228" max-vertical-offset="2838">
           <caret line="111" column="47" selection-start-line="111" selection-start-column="47" selection-end-line="111" selection-end-column="47" />
-          <folding>
-            <marker date="1535944027199" expanded="true" signature="-1:-1" placeholder="select devic..PG_DEVICE..." />
-            <marker date="1535944027199" expanded="true" signature="-1:-1" placeholder="select * fro..PG_DEVICE..." />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1515,7 +1455,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.76301616" vertical-offset="1687" max-vertical-offset="2376">
           <caret line="143" column="16" selection-start-line="143" selection-start-column="16" selection-end-line="143" selection-end-column="16" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1523,7 +1462,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.88509876" vertical-offset="519" max-vertical-offset="1342">
           <caret line="68" column="0" selection-start-line="68" selection-start-column="0" selection-end-line="68" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1531,7 +1469,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.43267503" vertical-offset="23" max-vertical-offset="1672">
           <caret line="15" column="33" selection-start-line="15" selection-start-column="33" selection-end-line="15" selection-end-column="33" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1540,42 +1477,8 @@
         <state vertical-scroll-proportion="0.5257353" vertical-offset="0" max-vertical-offset="4972">
           <caret line="30" column="0" selection-start-line="30" selection-start-column="0" selection-end-line="30" selection-end-column="0" />
           <folding>
-            <element signature="e#3701#3720#0" expanded="true" />
-            <element signature="e#4190#4208#0" expanded="true" />
-            <marker date="1536211271563" expanded="true" signature="-1:-1" placeholder="select count..PG_CONSTRUCTION..." />
-            <marker date="1536211271563" expanded="true" signature="-1:-1" placeholder="select count..Pg_Construction..." />
-            <marker date="1536211271563" expanded="true" signature="-1:-1" placeholder="SELECT t.ID,..PG_CONSTRUCTION..." />
-            <marker date="1536211271563" expanded="true" signature="-1:-1" placeholder="SELECT m.PAR..PG_PARTITION..." />
-            <marker date="1536211271563" expanded="true" signature="-1:-1" placeholder="SELECT n.TYP..PG_CONSTRUCTION_TYPE..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.40754038" vertical-offset="675" max-vertical-offset="1540">
-          <caret line="108" column="52" selection-start-line="108" selection-start-column="52" selection-end-line="108" selection-end-column="52" />
-          <folding>
-            <element signature="method#saveFiles#0;class#PgCsDocumentManager#0" expanded="false" />
-            <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" expanded="false" />
-            <element signature="e#3728#3745#0" expanded="true" />
-            <marker date="1536205913620" expanded="true" signature="-1:-1" placeholder="select * fro..PG_CSDOCUMENT..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.41666666" vertical-offset="2772" max-vertical-offset="3674">
-          <caret line="192" column="13" selection-start-line="192" selection-start-column="13" selection-end-line="192" selection-end-column="13" />
-          <folding>
-            <element signature="method#setPgCsDocumentManager#0;class#PgCsDocumentRs#0" expanded="false" />
-            <element signature="method#setPgConstructionManager#0;class#PgCsDocumentRs#0" expanded="false" />
-            <element signature="e#2023#2039#0" expanded="true" />
-            <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" expanded="false" />
-            <element signature="e#6060#6076#0" expanded="true" />
-            <element signature="e#6145#6162#0" expanded="true" />
-            <element signature="method#downloadFile#0;class#PgCsDocumentRs#0" expanded="false" />
+            <element signature="e#3701#3720#0" expanded="false" />
+            <element signature="e#4190#4208#0" expanded="false" />
           </folding>
         </state>
       </provider>
@@ -1584,24 +1487,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.9640933" vertical-offset="1091" max-vertical-offset="2112">
           <caret line="83" column="62" selection-start-line="83" selection-start-column="62" selection-end-line="83" selection-end-column="62" />
-          <folding>
-            <element signature="e#2170#2184#0" expanded="true" />
-            <marker date="1536213480710" expanded="true" signature="-1:-1" placeholder="select count..PG_ALARM..." />
-            <marker date="1536213480710" expanded="true" signature="-1:-1" placeholder="select count..PG_ALARM..." />
-            <marker date="1536213480710" expanded="true" signature="-1:-1" placeholder="select count..PG_ALARM..." />
-            <marker date="1536213480710" expanded="true" signature="-1:-1" placeholder="select count..PG_ALARM..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.41666666" vertical-offset="990" max-vertical-offset="1672">
-          <caret line="72" column="55" selection-start-line="72" selection-start-column="55" selection-end-line="72" selection-end-column="55" />
-          <folding>
-            <element signature="e#2152#2168#0" expanded="false" />
-            <element signature="e#2257#2271#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1609,10 +1494,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.75" vertical-offset="440" max-vertical-offset="3938">
           <caret line="62" column="13" selection-start-line="62" selection-start-column="13" selection-end-line="62" selection-end-column="13" />
-          <folding>
-            <element signature="e#1393#1394#0" expanded="false" />
-            <element signature="e#1451#1452#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1620,7 +1501,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.35547575" vertical-offset="0" max-vertical-offset="1012">
           <caret line="18" column="0" selection-start-line="18" selection-start-column="0" selection-end-line="18" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1628,9 +1508,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.45421904" vertical-offset="2145" max-vertical-offset="3608">
           <caret line="125" column="29" selection-start-line="125" selection-start-column="29" selection-end-line="125" selection-end-column="29" />
-          <folding>
-            <element signature="e#3094#3110#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1638,7 +1515,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.513465" vertical-offset="0" max-vertical-offset="1276">
           <caret line="22" column="51" selection-start-line="22" selection-start-column="51" selection-end-line="22" selection-end-column="51" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1646,7 +1522,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.5924596" vertical-offset="0" max-vertical-offset="1254">
           <caret line="20" column="28" selection-start-line="20" selection-start-column="28" selection-end-line="20" selection-end-column="28" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1654,18 +1529,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-3.3052065" vertical-offset="4063" max-vertical-offset="4620">
           <caret line="115" column="15" selection-start-line="115" selection-start-column="15" selection-end-line="115" selection-end-column="15" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.20833333" vertical-offset="1892" max-vertical-offset="3850">
-          <caret line="152" column="24" selection-start-line="152" selection-start-column="24" selection-end-line="152" selection-end-column="24" />
-          <folding>
-            <element signature="method#addReservePlan#0;class#PgReservePlanRs#0" expanded="false" />
-            <element signature="e#3206#3222#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1673,7 +1536,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.06147541" vertical-offset="183" max-vertical-offset="506">
           <caret line="10" column="0" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1681,7 +1543,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="3388">
           <caret line="39" column="56" selection-start-line="39" selection-start-column="56" selection-end-line="39" selection-end-column="56" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1689,22 +1550,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.33213645" vertical-offset="959" max-vertical-offset="2508">
           <caret line="71" column="36" selection-start-line="71" selection-start-column="36" selection-end-line="71" selection-end-column="36" />
-          <folding>
-            <marker date="1536217243963" expanded="true" signature="-1:-1" placeholder="select count..PG_RESERVE_PLAN..." />
-          </folding>
-        </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 vertical-scroll-proportion="0.46401516" vertical-offset="1273" max-vertical-offset="1980">
-          <caret line="106" column="70" selection-start-line="106" selection-start-column="70" selection-end-line="106" selection-end-column="70" />
-          <folding>
-            <element signature="imports" expanded="false" />
-            <element signature="method#linkDevice#0;class#PgAlarmLinkRs#0" expanded="false" />
-            <element signature="e#1459#1475#0" expanded="false" />
-            <element signature="method#linkPartitionDevice#0;class#PgAlarmLinkRs#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1712,7 +1557,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.35906643" vertical-offset="1164" max-vertical-offset="3388">
           <caret line="80" column="23" selection-start-line="80" selection-start-column="23" selection-end-line="80" selection-end-column="23" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1720,7 +1564,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.625" vertical-offset="1364" max-vertical-offset="4158">
           <caret line="99" column="37" selection-start-line="99" selection-start-column="37" selection-end-line="99" selection-end-column="37" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1728,7 +1571,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="1553" max-vertical-offset="2134">
           <caret line="98" column="16" selection-start-line="98" selection-start-column="16" selection-end-line="98" selection-end-column="16" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1736,9 +1578,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="837" max-vertical-offset="1276">
           <caret line="59" column="0" selection-start-line="59" selection-start-column="0" selection-end-line="59" selection-end-column="0" />
-          <folding>
-            <element signature="e#1980#1990#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1746,10 +1585,259 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.24955116" vertical-offset="631" max-vertical-offset="1232">
           <caret line="58" column="34" selection-start-line="58" selection-start-column="34" selection-end-line="58" selection-end-column="34" />
+        </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 vertical-scroll-proportion="0.0" vertical-offset="6759" max-vertical-offset="8316">
+          <caret line="268" column="42" selection-start-line="268" selection-start-column="42" selection-end-line="268" selection-end-column="42" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.8779174" vertical-offset="347" max-vertical-offset="2662">
+          <caret line="54" column="9" selection-start-line="54" selection-start-column="9" selection-end-line="54" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="1.9353681" vertical-offset="0" max-vertical-offset="4906">
+          <caret line="70" column="71" selection-start-line="70" selection-start-column="66" selection-end-line="70" selection-end-column="75" />
+        </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 vertical-scroll-proportion="0.32854578" vertical-offset="1115" max-vertical-offset="1672">
+          <caret line="76" column="33" selection-start-line="76" selection-start-column="33" selection-end-line="76" selection-end-column="33" />
+        </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 vertical-scroll-proportion="3.1723518" vertical-offset="81" max-vertical-offset="2354">
+          <caret line="104" column="12" selection-start-line="104" selection-start-column="12" selection-end-line="104" selection-end-column="12" />
           <folding />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.5260323" vertical-offset="4239" max-vertical-offset="4796">
+          <caret line="224" column="0" selection-start-line="224" selection-start-column="0" selection-end-line="224" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.6445242" vertical-offset="1709" max-vertical-offset="2332">
+          <caret line="111" column="53" selection-start-line="111" selection-start-column="53" selection-end-line="111" selection-end-column="53" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-3.5421903" vertical-offset="5515" max-vertical-offset="6072">
+          <caret line="184" column="25" selection-start-line="184" selection-start-column="25" selection-end-line="184" selection-end-column="25" />
+        </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 vertical-scroll-proportion="-0.78994614" vertical-offset="924" max-vertical-offset="7128">
+          <caret line="41" column="5" selection-start-line="41" selection-start-column="5" selection-end-line="41" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.4344704" vertical-offset="748" max-vertical-offset="1474">
+          <caret line="72" column="0" selection-start-line="72" selection-start-column="0" selection-end-line="72" selection-end-column="0" />
+        </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 vertical-scroll-proportion="0.0" vertical-offset="264" max-vertical-offset="1782">
+          <caret line="37" column="57" selection-start-line="37" selection-start-column="57" selection-end-line="37" selection-end-column="57" />
+          <folding>
+            <marker date="1531722832731" expanded="true" signature="-1:-1" placeholder="select id,CH..PG_CH4..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2420">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://C:/Program Files/Java/jdk1.8.0_131/src.zip!/java/sql/Timestamp.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33027524" vertical-offset="4606" max-vertical-offset="12980">
+          <caret line="236" column="0" selection-start-line="236" selection-start-column="0" selection-end-line="236" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="2.2118492" vertical-offset="0" max-vertical-offset="1496">
+          <caret line="87" column="52" selection-start-line="87" selection-start-column="52" selection-end-line="87" selection-end-column="52" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.4901257" vertical-offset="79" max-vertical-offset="1298">
+          <caret line="25" column="25" selection-start-line="25" selection-start-column="25" selection-end-line="25" selection-end-column="25" />
+          <folding>
+            <marker date="1537412037475" expanded="true" signature="-1:-1" placeholder="select equip..PG_EQUIPMENT..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.8330341" vertical-offset="680" max-vertical-offset="4466">
+          <caret line="68" column="29" selection-start-line="68" selection-start-column="29" selection-end-line="68" selection-end-column="29" />
+          <folding>
+            <element signature="e#1490#1506#0" expanded="true" />
+            <element signature="e#6332#6348#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgEquipment.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.3680431" vertical-offset="191" max-vertical-offset="1540">
+          <caret line="20" column="17" selection-start-line="20" selection-start-column="17" selection-end-line="20" selection-end-column="17" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/4.3.6.Final/hibernate-core-4.3.6.Final-sources.jar!/org/hibernate/internal/AbstractQueryImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33333334" vertical-offset="18814" max-vertical-offset="20328">
+          <caret line="974" column="0" selection-start-line="974" selection-start-column="0" selection-end-line="974" selection-end-column="0" />
+          <folding />
+        </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 vertical-scroll-proportion="0.5924596" vertical-offset="0" max-vertical-offset="1980">
+          <caret line="18" column="32" selection-start-line="18" selection-start-column="32" selection-end-line="18" selection-end-column="32" />
+          <folding />
+        </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 vertical-scroll-proportion="0.7109515" vertical-offset="0" max-vertical-offset="704">
+          <caret line="18" column="31" selection-start-line="18" selection-start-column="31" selection-end-line="18" selection-end-column="31" />
+          <folding>
+            <element signature="e#213#214#0" expanded="true" />
+            <element signature="e#244#245#0" expanded="true" />
+            <element signature="e#292#293#0" expanded="true" />
+            <element signature="e#332#333#0" expanded="true" />
+            <element signature="e#394#395#0" expanded="true" />
+            <element signature="e#438#439#0" expanded="true" />
+            <element signature="e#474#475#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://C:/Program Files/Java/jdk1.8.0_131/src.zip!/java/lang/String.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.21139705" vertical-offset="1469" max-vertical-offset="67452">
+          <caret line="107" column="16" selection-start-line="107" selection-start-column="12" selection-end-line="107" selection-end-column="16" />
+          <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 vertical-scroll-proportion="0.0" vertical-offset="2301" max-vertical-offset="3388">
+          <caret line="277" column="9" selection-start-line="277" selection-start-column="9" selection-end-line="277" selection-end-column="9" />
+          <folding>
+            <element signature="method#addLog#0;class#PgPipeLineRs#0" expanded="false" />
+            <element signature="method#editPipeLine#0;class#PgPipeLineRs#0" expanded="false" />
+            <element signature="method#deletePipeLine#0;class#PgPipeLineRs#0" expanded="false" />
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" expanded="false" />
+            <element signature="e#9602#9626#0" expanded="true" />
+            <element signature="e#10329#10337#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.43727598" vertical-offset="120" max-vertical-offset="1122">
+          <caret line="13" column="34" selection-start-line="13" selection-start-column="34" selection-end-line="13" selection-end-column="34" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.8547855" vertical-offset="137" max-vertical-offset="704">
+          <caret line="18" column="31" selection-start-line="18" selection-start-column="31" selection-end-line="18" selection-end-column="31" />
+          <folding>
+            <element signature="e#204#205#0" expanded="true" />
+            <element signature="e#233#234#0" expanded="true" />
+            <element signature="e#277#278#0" expanded="true" />
+            <element signature="e#313#314#0" expanded="true" />
+            <element signature="e#375#376#0" expanded="true" />
+            <element signature="e#419#420#0" expanded="true" />
+            <element signature="e#455#456#0" expanded="true" />
+          </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 vertical-scroll-proportion="0.0" vertical-offset="330" max-vertical-offset="1342">
+          <caret line="55" column="42" selection-start-line="55" selection-start-column="42" selection-end-line="55" selection-end-column="42" />
+          <folding>
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" expanded="false" />
+            <element signature="e#1787#1811#0" expanded="true" />
+            <element signature="e#2482#2490#0" expanded="true" />
+            <marker date="1537414540748" expanded="true" signature="1552:1622" placeholder="select LINE_..PG_PIPELINE..." />
+            <marker date="1537414540748" expanded="true" signature="1552:1621" placeholder="select LINE_..PG_PIPELINE..." />
+            <marker date="1537414540748" expanded="true" signature="2310:2352" placeholder="select disti..PG_PIPELINE..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="849" max-vertical-offset="1650">
+          <caret line="61" column="56" selection-start-line="61" selection-start-column="56" selection-end-line="61" selection-end-column="56" />
+          <folding>
+            <element signature="e#2433#2452#0" expanded="true" />
+            <marker date="1537414756878" expanded="true" signature="2209:2277" placeholder="select PG_NA..PG_PIPE_GALLERY..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.7140151" vertical-offset="4067" max-vertical-offset="4752">
+          <caret line="221" column="27" selection-start-line="221" selection-start-column="27" selection-end-line="221" selection-end-column="27" />
+          <folding>
+            <element signature="e#6945#6964#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java
index 238bc39..6256b9d 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java
@@ -78,7 +78,7 @@
     public PgEquipmentDto(PgEquipment equipment) {
         if (equipment == null) return;
 
-        SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 
         this.setId(equipment.getId());
         this.setEqName(equipment.getEqName());
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineLengthStatic.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineLengthStatic.java
new file mode 100644
index 0000000..a25538f
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineLengthStatic.java
@@ -0,0 +1,26 @@
+package com.casic.PgInterface.devTable.dto;
+
+/**
+ * Created by yxw on 2018/9/20.
+ */
+public class PgPipeLineLengthStatic {
+
+    private String lineType;
+    private String length;
+
+    public String getLineType() {
+        return lineType;
+    }
+
+    public void setLineType(String lineType) {
+        this.lineType = lineType;
+    }
+
+    public String getLength() {
+        return length;
+    }
+
+    public void setLength(String length) {
+        this.length = length;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.java b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.java
new file mode 100644
index 0000000..bd65ff4
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.java
@@ -0,0 +1,26 @@
+package com.casic.PgInterface.devTable.dto;
+
+/**
+ * Created by yxw on 2018/9/20.
+ */
+public class PipeGalleryStatic {
+
+    private String pgName;
+    private String length;
+
+    public String getPgName() {
+        return pgName;
+    }
+
+    public void setPgName(String pgName) {
+        this.pgName = pgName;
+    }
+
+    public String getLength() {
+        return length;
+    }
+
+    public void setLength(String length) {
+        this.length = length;
+    }
+}

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 73b1050..7a80a23 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,34 +2,17 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="">
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\~$数据库设计说明新需求.docx" afterPath="" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/~$数据库设计说明新需求.docx" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineLengthStatic.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/接口说明新需求.docx" afterPath="$PROJECT_DIR$/接口说明新需求.docx" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainTypeManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainTypeManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources/application.properties" afterPath="$PROJECT_DIR$/src/main/resources/application.properties" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
     </list>
     <ignored path="PgInterface.iws" />
@@ -54,7 +37,67 @@
     <favorites_list name="PgInterface" />
   </component>
   <component name="FileEditorManager">
-    <leaf />
+    <leaf>
+      <file leaf-file-name="PgPipeLineRs.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.0" vertical-offset="2301" max-vertical-offset="3388">
+              <caret line="277" column="9" selection-start-line="277" selection-start-column="9" selection-end-line="277" selection-end-column="9" />
+              <folding>
+                <element signature="method#addLog#0;class#PgPipeLineRs#0" expanded="false" />
+                <element signature="method#editPipeLine#0;class#PgPipeLineRs#0" expanded="false" />
+                <element signature="method#deletePipeLine#0;class#PgPipeLineRs#0" expanded="false" />
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" expanded="false" />
+                <element signature="e#9602#9626#0" expanded="true" />
+                <element signature="e#10329#10337#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="PgPipeLineManager.java" pinned="false" current="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 vertical-scroll-proportion="0.0" vertical-offset="330" max-vertical-offset="1342">
+              <caret line="55" column="42" selection-start-line="55" selection-start-column="42" selection-end-line="55" selection-end-column="42" />
+              <folding>
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" expanded="false" />
+                <element signature="e#1787#1811#0" expanded="true" />
+                <element signature="e#2482#2490#0" expanded="true" />
+                <marker date="1537414540748" expanded="true" signature="1552:1622" placeholder="select LINE_..PG_PIPELINE..." />
+                <marker date="1537414540748" expanded="true" signature="1552:1621" placeholder="select LINE_..PG_PIPELINE..." />
+                <marker date="1537414540748" expanded="true" signature="2310:2352" placeholder="select disti..PG_PIPELINE..." />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="PipeGalleryRs.java" pinned="false" current="true" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.7140151" vertical-offset="4067" max-vertical-offset="4752">
+              <caret line="221" column="27" selection-start-line="221" selection-start-column="27" selection-end-line="221" selection-end-column="27" />
+              <folding>
+                <element signature="e#6945#6964#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="PipeGalleryManager.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.0" vertical-offset="849" max-vertical-offset="1650">
+              <caret line="61" column="56" selection-start-line="61" selection-start-column="56" selection-end-line="61" selection-end-column="56" />
+              <folding>
+                <element signature="e#2433#2452#0" expanded="true" />
+                <marker date="1537414756878" expanded="true" signature="2209:2277" placeholder="select PG_NA..PG_PIPE_GALLERY..." />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+    </leaf>
   </component>
   <component name="FindManager">
     <FindUsagesManager>
@@ -72,9 +115,6 @@
   <component name="IdeDocumentHistory">
     <option name="changedFiles">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
         <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/manager/PgInPgPersonManager.java" />
@@ -86,23 +126,16 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintainType.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/manager/PgPipeLineManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/EquipmentManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgEquipment.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.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/rs/PgPartitionRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.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/PgDeviceTypeRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
         <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.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/PgMaintainTypeRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainTypeManager.java" />
@@ -123,6 +156,16 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.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/dto/PgPipeLineLengthStatic.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/dto/PipeGalleryDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.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" />
       </list>
     </option>
   </component>
@@ -216,7 +259,20 @@
       <sortByType />
     </navigator>
     <panes>
-      <pane id="Scope" />
+      <pane id="PackagesPane">
+        <subPane>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
+            </PATH_ELEMENT>
+          </PATH>
+        </subPane>
+      </pane>
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -331,22 +387,73 @@
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
-        </subPane>
-      </pane>
-      <pane id="PackagesPane">
-        <subPane>
           <PATH>
             <PATH_ELEMENT>
               <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
               <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="devTable" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="devTable" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="dto" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
         </subPane>
       </pane>
+      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -916,7 +1023,12 @@
       <workItem from="1535958569443" duration="219000" />
       <workItem from="1536111554952" duration="23051000" />
       <workItem from="1536143316539" duration="3706000" />
-      <workItem from="1536195067076" duration="23441000" />
+      <workItem from="1536195067076" duration="23586000" />
+      <workItem from="1536802841385" duration="18000" />
+      <workItem from="1537167144071" duration="1232000" />
+      <workItem from="1537236948589" duration="156000" />
+      <workItem from="1537237991303" duration="1733000" />
+      <workItem from="1537407751831" duration="6397000" />
     </task>
     <task id="LOCAL-00001" summary="first commit">
       <created>1510219102698</created>
@@ -1126,11 +1238,15 @@
       <created>1535958368940</created>
       <updated>1535958368940</updated>
     </task>
-    <option name="localTasksCounter" value="53" />
+    <task id="LOCAL-00053" summary="根据华锐王工反馈测试，修改接口">
+      <created>1536224373164</created>
+      <updated>1536224373165</updated>
+    </task>
+    <option name="localTasksCounter" value="54" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="937579000" />
+    <option name="totallyTimeSpent" value="947260000" />
   </component>
   <component name="TodoView" selected-index="1">
     <todo-panel id="selected-file">
@@ -1165,7 +1281,7 @@
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.391453" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.66382253" sideWeight="0.81316185" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.7235495" sideWeight="0.81316185" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="true" content_ui="tabs" />
       <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.6757679" sideWeight="0.18683812" order="7" side_tool="true" content_ui="tabs" />
@@ -1177,8 +1293,8 @@
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24962178" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32980332" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32649574" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2526475" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32593855" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.28441754" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" />
@@ -1192,18 +1308,18 @@
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
     </layout>
     <layout-to-restore>
-      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.63418806" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
-      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
+      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.391453" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
       <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" />
-      <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.50341296" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
+      <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2962963" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
+      <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.52136755" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32649574" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.29425114" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
@@ -1223,8 +1339,8 @@
       <window_info id="Android" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="15" side_tool="false" content_ui="tabs" />
       <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="true" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32980332" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
     </layout-to-restore>
   </component>
@@ -1243,7 +1359,6 @@
     <option name="myTodoPanelSettings">
       <TodoPanelSettings />
     </option>
-    <MESSAGE value="修改人员入廊记录表和功能" />
     <MESSAGE value="Merge remote-tracking branch 'origin/develop' into develop&#10;&#10;Conflicts:&#10;&#9;.idea/workspace.xml&#10;&#9;~$数据库设计说明新需求.docx&#10;&#9;管廊数据库设计说明新需求.docx&#10;" />
     <MESSAGE value="增加统计功能" />
     <MESSAGE value="修改标注" />
@@ -1268,7 +1383,8 @@
     <MESSAGE value="新增维护类别" />
     <MESSAGE value="修改施工数据新增删除编辑" />
     <MESSAGE value="新增工器具耗材" />
-    <option name="LAST_COMMIT_MESSAGE" value="新增工器具耗材" />
+    <MESSAGE value="根据华锐王工反馈测试，修改接口" />
+    <option name="LAST_COMMIT_MESSAGE" value="根据华锐王工反馈测试，修改接口" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1291,14 +1407,8 @@
           <properties />
           <option name="timeStamp" value="359" />
         </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java</url>
-          <line>190</line>
-          <properties />
-          <option name="timeStamp" value="360" />
-        </line-breakpoint>
       </breakpoints>
-      <option name="time" value="390" />
+      <option name="time" value="399" />
     </breakpoint-manager>
   </component>
   <component name="antWorkspaceConfiguration">
@@ -1306,163 +1416,10 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="3119" max-vertical-offset="7128">
-          <caret line="30" column="52" selection-start-line="30" selection-start-column="52" selection-end-line="30" selection-end-column="52" />
-          <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 vertical-scroll-proportion="0.0" vertical-offset="5071" max-vertical-offset="5918">
-          <caret line="268" column="24" selection-start-line="268" selection-start-column="24" selection-end-line="268" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="13" max-vertical-offset="3058">
-          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.5529623" vertical-offset="528" max-vertical-offset="3014">
-          <caret line="26" column="0" selection-start-line="26" selection-start-column="0" selection-end-line="26" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainTypeDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.33213645" vertical-offset="101" max-vertical-offset="1012">
-          <caret line="15" column="11" selection-start-line="15" selection-start-column="11" selection-end-line="15" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="609" max-vertical-offset="1958">
-          <caret line="39" column="50" selection-start-line="39" selection-start-column="50" selection-end-line="39" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.7271095" vertical-offset="167" max-vertical-offset="1342">
-          <caret line="35" column="0" selection-start-line="35" selection-start-column="0" selection-end-line="35" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.63195693" vertical-offset="0" max-vertical-offset="1452">
-          <caret line="19" column="0" selection-start-line="19" selection-start-column="0" selection-end-line="19" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintainDoc.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.69669116" vertical-offset="61" max-vertical-offset="1320">
-          <caret line="24" column="0" selection-start-line="24" selection-start-column="0" selection-end-line="24" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDocDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.27648115" vertical-offset="0" max-vertical-offset="1342">
-          <caret line="9" column="13" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-7.551724" vertical-offset="3125" max-vertical-offset="4048">
-          <caret line="249" column="85" selection-start-line="249" selection-start-column="85" selection-end-line="249" selection-end-column="85" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-9.862069" vertical-offset="3674" max-vertical-offset="5610">
-          <caret line="203" column="58" selection-start-line="203" selection-start-column="58" selection-end-line="203" selection-end-column="58" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.31597847" vertical-offset="0" max-vertical-offset="557">
-          <caret line="8" column="35" selection-start-line="8" selection-start-column="35" selection-end-line="8" selection-end-column="35" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.66360295" vertical-offset="783" max-vertical-offset="3234">
-          <caret line="68" column="71" selection-start-line="68" selection-start-column="71" selection-end-line="68" selection-end-column="71" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="33" max-vertical-offset="968">
-          <caret line="33" column="62" selection-start-line="33" selection-start-column="62" selection-end-line="33" selection-end-column="62" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://C:/Program Files/Java/jdk1.8.0_131/src.zip!/java/lang/NumberFormatException.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.6285178" vertical-offset="479" max-vertical-offset="1012">
-          <caret line="64" column="0" selection-start-line="64" selection-start-column="0" selection-end-line="64" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-tx/4.0.6.RELEASE/spring-tx-4.0.6.RELEASE-sources.jar!/org/springframework/transaction/interceptor/TransactionAspectSupport.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.23639774" vertical-offset="4736" max-vertical-offset="13244">
-          <caret line="263" column="0" selection-start-line="263" selection-start-column="0" selection-end-line="263" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.2504817" vertical-offset="618" max-vertical-offset="1320">
-          <caret line="35" column="28" selection-start-line="35" selection-start-column="28" selection-end-line="35" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://C:/Program Files/Java/jdk1.8.0_131/src.zip!/java/util/ArrayList.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.73967683" vertical-offset="13360" max-vertical-offset="30690">
-          <caret line="663" column="7" selection-start-line="663" selection-start-column="7" selection-end-line="663" selection-end-column="7" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/StringUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.15798923" vertical-offset="330" max-vertical-offset="2178">
-          <caret line="31" column="29" selection-start-line="31" selection-start-column="29" selection-end-line="31" selection-end-column="29" />
-          <folding />
-        </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 vertical-scroll-proportion="0.11143695" vertical-offset="1854" max-vertical-offset="5170">
-          <caret line="103" column="65" selection-start-line="103" selection-start-column="65" selection-end-line="103" selection-end-column="65" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="jar://C:/Program Files/Java/jdk1.8.0_131/src.zip!/java/util/concurrent/ThreadPoolExecutor.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="1.659824" vertical-offset="23436" max-vertical-offset="44594">
           <caret line="1148" column="31" selection-start-line="1148" selection-start-column="31" selection-end-line="1148" selection-end-column="31" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1470,17 +1427,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.2404692" vertical-offset="9532" max-vertical-offset="12958">
           <caret line="497" column="0" selection-start-line="497" selection-start-column="0" selection-end-line="497" selection-end-column="0" />
-          <folding />
-        </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 vertical-scroll-proportion="0.0" vertical-offset="4977" max-vertical-offset="8316">
-          <caret line="263" column="24" selection-start-line="263" selection-start-column="24" selection-end-line="263" selection-end-column="24" />
-          <folding>
-            <element signature="e#10383#10401#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1488,7 +1434,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-2.1782365" vertical-offset="1359" max-vertical-offset="1892">
           <caret line="24" column="13" selection-start-line="24" selection-start-column="13" selection-end-line="24" selection-end-column="13" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1496,7 +1441,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-1.4093357" vertical-offset="1907" max-vertical-offset="2464">
           <caret line="65" column="60" selection-start-line="65" selection-start-column="11" selection-end-line="65" selection-end-column="60" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1504,10 +1448,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-0.011029412" vertical-offset="2228" max-vertical-offset="2838">
           <caret line="111" column="47" selection-start-line="111" selection-start-column="47" selection-end-line="111" selection-end-column="47" />
-          <folding>
-            <marker date="1535944027199" expanded="true" signature="-1:-1" placeholder="select devic..PG_DEVICE..." />
-            <marker date="1535944027199" expanded="true" signature="-1:-1" placeholder="select * fro..PG_DEVICE..." />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1515,7 +1455,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.76301616" vertical-offset="1687" max-vertical-offset="2376">
           <caret line="143" column="16" selection-start-line="143" selection-start-column="16" selection-end-line="143" selection-end-column="16" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1523,7 +1462,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.88509876" vertical-offset="519" max-vertical-offset="1342">
           <caret line="68" column="0" selection-start-line="68" selection-start-column="0" selection-end-line="68" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1531,7 +1469,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.43267503" vertical-offset="23" max-vertical-offset="1672">
           <caret line="15" column="33" selection-start-line="15" selection-start-column="33" selection-end-line="15" selection-end-column="33" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1540,42 +1477,8 @@
         <state vertical-scroll-proportion="0.5257353" vertical-offset="0" max-vertical-offset="4972">
           <caret line="30" column="0" selection-start-line="30" selection-start-column="0" selection-end-line="30" selection-end-column="0" />
           <folding>
-            <element signature="e#3701#3720#0" expanded="true" />
-            <element signature="e#4190#4208#0" expanded="true" />
-            <marker date="1536211271563" expanded="true" signature="-1:-1" placeholder="select count..PG_CONSTRUCTION..." />
-            <marker date="1536211271563" expanded="true" signature="-1:-1" placeholder="select count..Pg_Construction..." />
-            <marker date="1536211271563" expanded="true" signature="-1:-1" placeholder="SELECT t.ID,..PG_CONSTRUCTION..." />
-            <marker date="1536211271563" expanded="true" signature="-1:-1" placeholder="SELECT m.PAR..PG_PARTITION..." />
-            <marker date="1536211271563" expanded="true" signature="-1:-1" placeholder="SELECT n.TYP..PG_CONSTRUCTION_TYPE..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.40754038" vertical-offset="675" max-vertical-offset="1540">
-          <caret line="108" column="52" selection-start-line="108" selection-start-column="52" selection-end-line="108" selection-end-column="52" />
-          <folding>
-            <element signature="method#saveFiles#0;class#PgCsDocumentManager#0" expanded="false" />
-            <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" expanded="false" />
-            <element signature="e#3728#3745#0" expanded="true" />
-            <marker date="1536205913620" expanded="true" signature="-1:-1" placeholder="select * fro..PG_CSDOCUMENT..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.41666666" vertical-offset="2772" max-vertical-offset="3674">
-          <caret line="192" column="13" selection-start-line="192" selection-start-column="13" selection-end-line="192" selection-end-column="13" />
-          <folding>
-            <element signature="method#setPgCsDocumentManager#0;class#PgCsDocumentRs#0" expanded="false" />
-            <element signature="method#setPgConstructionManager#0;class#PgCsDocumentRs#0" expanded="false" />
-            <element signature="e#2023#2039#0" expanded="true" />
-            <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" expanded="false" />
-            <element signature="e#6060#6076#0" expanded="true" />
-            <element signature="e#6145#6162#0" expanded="true" />
-            <element signature="method#downloadFile#0;class#PgCsDocumentRs#0" expanded="false" />
+            <element signature="e#3701#3720#0" expanded="false" />
+            <element signature="e#4190#4208#0" expanded="false" />
           </folding>
         </state>
       </provider>
@@ -1584,24 +1487,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.9640933" vertical-offset="1091" max-vertical-offset="2112">
           <caret line="83" column="62" selection-start-line="83" selection-start-column="62" selection-end-line="83" selection-end-column="62" />
-          <folding>
-            <element signature="e#2170#2184#0" expanded="true" />
-            <marker date="1536213480710" expanded="true" signature="-1:-1" placeholder="select count..PG_ALARM..." />
-            <marker date="1536213480710" expanded="true" signature="-1:-1" placeholder="select count..PG_ALARM..." />
-            <marker date="1536213480710" expanded="true" signature="-1:-1" placeholder="select count..PG_ALARM..." />
-            <marker date="1536213480710" expanded="true" signature="-1:-1" placeholder="select count..PG_ALARM..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.41666666" vertical-offset="990" max-vertical-offset="1672">
-          <caret line="72" column="55" selection-start-line="72" selection-start-column="55" selection-end-line="72" selection-end-column="55" />
-          <folding>
-            <element signature="e#2152#2168#0" expanded="false" />
-            <element signature="e#2257#2271#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1609,10 +1494,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.75" vertical-offset="440" max-vertical-offset="3938">
           <caret line="62" column="13" selection-start-line="62" selection-start-column="13" selection-end-line="62" selection-end-column="13" />
-          <folding>
-            <element signature="e#1393#1394#0" expanded="false" />
-            <element signature="e#1451#1452#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1620,7 +1501,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.35547575" vertical-offset="0" max-vertical-offset="1012">
           <caret line="18" column="0" selection-start-line="18" selection-start-column="0" selection-end-line="18" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1628,9 +1508,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.45421904" vertical-offset="2145" max-vertical-offset="3608">
           <caret line="125" column="29" selection-start-line="125" selection-start-column="29" selection-end-line="125" selection-end-column="29" />
-          <folding>
-            <element signature="e#3094#3110#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1638,7 +1515,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.513465" vertical-offset="0" max-vertical-offset="1276">
           <caret line="22" column="51" selection-start-line="22" selection-start-column="51" selection-end-line="22" selection-end-column="51" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1646,7 +1522,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.5924596" vertical-offset="0" max-vertical-offset="1254">
           <caret line="20" column="28" selection-start-line="20" selection-start-column="28" selection-end-line="20" selection-end-column="28" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1654,18 +1529,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-3.3052065" vertical-offset="4063" max-vertical-offset="4620">
           <caret line="115" column="15" selection-start-line="115" selection-start-column="15" selection-end-line="115" selection-end-column="15" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.20833333" vertical-offset="1892" max-vertical-offset="3850">
-          <caret line="152" column="24" selection-start-line="152" selection-start-column="24" selection-end-line="152" selection-end-column="24" />
-          <folding>
-            <element signature="method#addReservePlan#0;class#PgReservePlanRs#0" expanded="false" />
-            <element signature="e#3206#3222#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1673,7 +1536,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.06147541" vertical-offset="183" max-vertical-offset="506">
           <caret line="10" column="0" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1681,7 +1543,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="3388">
           <caret line="39" column="56" selection-start-line="39" selection-start-column="56" selection-end-line="39" selection-end-column="56" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1689,22 +1550,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.33213645" vertical-offset="959" max-vertical-offset="2508">
           <caret line="71" column="36" selection-start-line="71" selection-start-column="36" selection-end-line="71" selection-end-column="36" />
-          <folding>
-            <marker date="1536217243963" expanded="true" signature="-1:-1" placeholder="select count..PG_RESERVE_PLAN..." />
-          </folding>
-        </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 vertical-scroll-proportion="0.46401516" vertical-offset="1273" max-vertical-offset="1980">
-          <caret line="106" column="70" selection-start-line="106" selection-start-column="70" selection-end-line="106" selection-end-column="70" />
-          <folding>
-            <element signature="imports" expanded="false" />
-            <element signature="method#linkDevice#0;class#PgAlarmLinkRs#0" expanded="false" />
-            <element signature="e#1459#1475#0" expanded="false" />
-            <element signature="method#linkPartitionDevice#0;class#PgAlarmLinkRs#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1712,7 +1557,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.35906643" vertical-offset="1164" max-vertical-offset="3388">
           <caret line="80" column="23" selection-start-line="80" selection-start-column="23" selection-end-line="80" selection-end-column="23" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1720,7 +1564,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.625" vertical-offset="1364" max-vertical-offset="4158">
           <caret line="99" column="37" selection-start-line="99" selection-start-column="37" selection-end-line="99" selection-end-column="37" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1728,7 +1571,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="1553" max-vertical-offset="2134">
           <caret line="98" column="16" selection-start-line="98" selection-start-column="16" selection-end-line="98" selection-end-column="16" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1736,9 +1578,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="837" max-vertical-offset="1276">
           <caret line="59" column="0" selection-start-line="59" selection-start-column="0" selection-end-line="59" selection-end-column="0" />
-          <folding>
-            <element signature="e#1980#1990#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1746,10 +1585,259 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.24955116" vertical-offset="631" max-vertical-offset="1232">
           <caret line="58" column="34" selection-start-line="58" selection-start-column="34" selection-end-line="58" selection-end-column="34" />
+        </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 vertical-scroll-proportion="0.0" vertical-offset="6759" max-vertical-offset="8316">
+          <caret line="268" column="42" selection-start-line="268" selection-start-column="42" selection-end-line="268" selection-end-column="42" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.8779174" vertical-offset="347" max-vertical-offset="2662">
+          <caret line="54" column="9" selection-start-line="54" selection-start-column="9" selection-end-line="54" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="1.9353681" vertical-offset="0" max-vertical-offset="4906">
+          <caret line="70" column="71" selection-start-line="70" selection-start-column="66" selection-end-line="70" selection-end-column="75" />
+        </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 vertical-scroll-proportion="0.32854578" vertical-offset="1115" max-vertical-offset="1672">
+          <caret line="76" column="33" selection-start-line="76" selection-start-column="33" selection-end-line="76" selection-end-column="33" />
+        </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 vertical-scroll-proportion="3.1723518" vertical-offset="81" max-vertical-offset="2354">
+          <caret line="104" column="12" selection-start-line="104" selection-start-column="12" selection-end-line="104" selection-end-column="12" />
           <folding />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.5260323" vertical-offset="4239" max-vertical-offset="4796">
+          <caret line="224" column="0" selection-start-line="224" selection-start-column="0" selection-end-line="224" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.6445242" vertical-offset="1709" max-vertical-offset="2332">
+          <caret line="111" column="53" selection-start-line="111" selection-start-column="53" selection-end-line="111" selection-end-column="53" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-3.5421903" vertical-offset="5515" max-vertical-offset="6072">
+          <caret line="184" column="25" selection-start-line="184" selection-start-column="25" selection-end-line="184" selection-end-column="25" />
+        </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 vertical-scroll-proportion="-0.78994614" vertical-offset="924" max-vertical-offset="7128">
+          <caret line="41" column="5" selection-start-line="41" selection-start-column="5" selection-end-line="41" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.4344704" vertical-offset="748" max-vertical-offset="1474">
+          <caret line="72" column="0" selection-start-line="72" selection-start-column="0" selection-end-line="72" selection-end-column="0" />
+        </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 vertical-scroll-proportion="0.0" vertical-offset="264" max-vertical-offset="1782">
+          <caret line="37" column="57" selection-start-line="37" selection-start-column="57" selection-end-line="37" selection-end-column="57" />
+          <folding>
+            <marker date="1531722832731" expanded="true" signature="-1:-1" placeholder="select id,CH..PG_CH4..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2420">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://C:/Program Files/Java/jdk1.8.0_131/src.zip!/java/sql/Timestamp.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33027524" vertical-offset="4606" max-vertical-offset="12980">
+          <caret line="236" column="0" selection-start-line="236" selection-start-column="0" selection-end-line="236" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="2.2118492" vertical-offset="0" max-vertical-offset="1496">
+          <caret line="87" column="52" selection-start-line="87" selection-start-column="52" selection-end-line="87" selection-end-column="52" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.4901257" vertical-offset="79" max-vertical-offset="1298">
+          <caret line="25" column="25" selection-start-line="25" selection-start-column="25" selection-end-line="25" selection-end-column="25" />
+          <folding>
+            <marker date="1537412037475" expanded="true" signature="-1:-1" placeholder="select equip..PG_EQUIPMENT..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.8330341" vertical-offset="680" max-vertical-offset="4466">
+          <caret line="68" column="29" selection-start-line="68" selection-start-column="29" selection-end-line="68" selection-end-column="29" />
+          <folding>
+            <element signature="e#1490#1506#0" expanded="true" />
+            <element signature="e#6332#6348#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgEquipment.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.3680431" vertical-offset="191" max-vertical-offset="1540">
+          <caret line="20" column="17" selection-start-line="20" selection-start-column="17" selection-end-line="20" selection-end-column="17" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/4.3.6.Final/hibernate-core-4.3.6.Final-sources.jar!/org/hibernate/internal/AbstractQueryImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33333334" vertical-offset="18814" max-vertical-offset="20328">
+          <caret line="974" column="0" selection-start-line="974" selection-start-column="0" selection-end-line="974" selection-end-column="0" />
+          <folding />
+        </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 vertical-scroll-proportion="0.5924596" vertical-offset="0" max-vertical-offset="1980">
+          <caret line="18" column="32" selection-start-line="18" selection-start-column="32" selection-end-line="18" selection-end-column="32" />
+          <folding />
+        </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 vertical-scroll-proportion="0.7109515" vertical-offset="0" max-vertical-offset="704">
+          <caret line="18" column="31" selection-start-line="18" selection-start-column="31" selection-end-line="18" selection-end-column="31" />
+          <folding>
+            <element signature="e#213#214#0" expanded="true" />
+            <element signature="e#244#245#0" expanded="true" />
+            <element signature="e#292#293#0" expanded="true" />
+            <element signature="e#332#333#0" expanded="true" />
+            <element signature="e#394#395#0" expanded="true" />
+            <element signature="e#438#439#0" expanded="true" />
+            <element signature="e#474#475#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://C:/Program Files/Java/jdk1.8.0_131/src.zip!/java/lang/String.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.21139705" vertical-offset="1469" max-vertical-offset="67452">
+          <caret line="107" column="16" selection-start-line="107" selection-start-column="12" selection-end-line="107" selection-end-column="16" />
+          <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 vertical-scroll-proportion="0.0" vertical-offset="2301" max-vertical-offset="3388">
+          <caret line="277" column="9" selection-start-line="277" selection-start-column="9" selection-end-line="277" selection-end-column="9" />
+          <folding>
+            <element signature="method#addLog#0;class#PgPipeLineRs#0" expanded="false" />
+            <element signature="method#editPipeLine#0;class#PgPipeLineRs#0" expanded="false" />
+            <element signature="method#deletePipeLine#0;class#PgPipeLineRs#0" expanded="false" />
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" expanded="false" />
+            <element signature="e#9602#9626#0" expanded="true" />
+            <element signature="e#10329#10337#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.43727598" vertical-offset="120" max-vertical-offset="1122">
+          <caret line="13" column="34" selection-start-line="13" selection-start-column="34" selection-end-line="13" selection-end-column="34" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.8547855" vertical-offset="137" max-vertical-offset="704">
+          <caret line="18" column="31" selection-start-line="18" selection-start-column="31" selection-end-line="18" selection-end-column="31" />
+          <folding>
+            <element signature="e#204#205#0" expanded="true" />
+            <element signature="e#233#234#0" expanded="true" />
+            <element signature="e#277#278#0" expanded="true" />
+            <element signature="e#313#314#0" expanded="true" />
+            <element signature="e#375#376#0" expanded="true" />
+            <element signature="e#419#420#0" expanded="true" />
+            <element signature="e#455#456#0" expanded="true" />
+          </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 vertical-scroll-proportion="0.0" vertical-offset="330" max-vertical-offset="1342">
+          <caret line="55" column="42" selection-start-line="55" selection-start-column="42" selection-end-line="55" selection-end-column="42" />
+          <folding>
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" expanded="false" />
+            <element signature="e#1787#1811#0" expanded="true" />
+            <element signature="e#2482#2490#0" expanded="true" />
+            <marker date="1537414540748" expanded="true" signature="1552:1622" placeholder="select LINE_..PG_PIPELINE..." />
+            <marker date="1537414540748" expanded="true" signature="1552:1621" placeholder="select LINE_..PG_PIPELINE..." />
+            <marker date="1537414540748" expanded="true" signature="2310:2352" placeholder="select disti..PG_PIPELINE..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="849" max-vertical-offset="1650">
+          <caret line="61" column="56" selection-start-line="61" selection-start-column="56" selection-end-line="61" selection-end-column="56" />
+          <folding>
+            <element signature="e#2433#2452#0" expanded="true" />
+            <marker date="1537414756878" expanded="true" signature="2209:2277" placeholder="select PG_NA..PG_PIPE_GALLERY..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.7140151" vertical-offset="4067" max-vertical-offset="4752">
+          <caret line="221" column="27" selection-start-line="221" selection-start-column="27" selection-end-line="221" selection-end-column="27" />
+          <folding>
+            <element signature="e#6945#6964#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java
index 238bc39..6256b9d 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java
@@ -78,7 +78,7 @@
     public PgEquipmentDto(PgEquipment equipment) {
         if (equipment == null) return;
 
-        SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 
         this.setId(equipment.getId());
         this.setEqName(equipment.getEqName());
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineLengthStatic.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineLengthStatic.java
new file mode 100644
index 0000000..a25538f
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineLengthStatic.java
@@ -0,0 +1,26 @@
+package com.casic.PgInterface.devTable.dto;
+
+/**
+ * Created by yxw on 2018/9/20.
+ */
+public class PgPipeLineLengthStatic {
+
+    private String lineType;
+    private String length;
+
+    public String getLineType() {
+        return lineType;
+    }
+
+    public void setLineType(String lineType) {
+        this.lineType = lineType;
+    }
+
+    public String getLength() {
+        return length;
+    }
+
+    public void setLength(String length) {
+        this.length = length;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.java b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.java
new file mode 100644
index 0000000..bd65ff4
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.java
@@ -0,0 +1,26 @@
+package com.casic.PgInterface.devTable.dto;
+
+/**
+ * Created by yxw on 2018/9/20.
+ */
+public class PipeGalleryStatic {
+
+    private String pgName;
+    private String length;
+
+    public String getPgName() {
+        return pgName;
+    }
+
+    public void setPgName(String pgName) {
+        this.pgName = pgName;
+    }
+
+    public String getLength() {
+        return length;
+    }
+
+    public void setLength(String length) {
+        this.length = length;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
index e46742c..ab0908b 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
@@ -23,7 +23,7 @@
         criteria.add(Restrictions.eq("eqCode", eqCode));
         criteria.add(Restrictions.eq("active",1));
 
-        List<PgEquipment> pgEquipmentList = criteria.list();
+        List<PgEquipment> pgEquipmentList = (List<PgEquipment>)criteria.list();
 
         if(pgEquipmentList!=null&&pgEquipmentList.size()!=0)
             return pgEquipmentList.get(0);
@@ -49,10 +49,10 @@
 
     //统计工器具耗材数量
     public List<PgDeviceTypeStatisticDto> getDeviceStatisticByDevType(String eqType){
-        String eqType1=eqType.equals("0")?"工器具":"耗材";
+        //String eqType1=eqType.equals("0")?"工器具":"耗材";
 
         String hql="select equipment.EQ_NAME,count(*) from PG_EQUIPMENT equipment where equipment.EQ_TYPE = '"
-        +eqType1+"' group by equipment.EQ_NAME";
+        +eqType+"' group by equipment.EQ_NAME";
 
         List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list();
 

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 73b1050..7a80a23 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,34 +2,17 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="">
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\~$数据库设计说明新需求.docx" afterPath="" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/~$数据库设计说明新需求.docx" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineLengthStatic.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/接口说明新需求.docx" afterPath="$PROJECT_DIR$/接口说明新需求.docx" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainTypeManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainTypeManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources/application.properties" afterPath="$PROJECT_DIR$/src/main/resources/application.properties" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
     </list>
     <ignored path="PgInterface.iws" />
@@ -54,7 +37,67 @@
     <favorites_list name="PgInterface" />
   </component>
   <component name="FileEditorManager">
-    <leaf />
+    <leaf>
+      <file leaf-file-name="PgPipeLineRs.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.0" vertical-offset="2301" max-vertical-offset="3388">
+              <caret line="277" column="9" selection-start-line="277" selection-start-column="9" selection-end-line="277" selection-end-column="9" />
+              <folding>
+                <element signature="method#addLog#0;class#PgPipeLineRs#0" expanded="false" />
+                <element signature="method#editPipeLine#0;class#PgPipeLineRs#0" expanded="false" />
+                <element signature="method#deletePipeLine#0;class#PgPipeLineRs#0" expanded="false" />
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" expanded="false" />
+                <element signature="e#9602#9626#0" expanded="true" />
+                <element signature="e#10329#10337#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="PgPipeLineManager.java" pinned="false" current="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 vertical-scroll-proportion="0.0" vertical-offset="330" max-vertical-offset="1342">
+              <caret line="55" column="42" selection-start-line="55" selection-start-column="42" selection-end-line="55" selection-end-column="42" />
+              <folding>
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" expanded="false" />
+                <element signature="e#1787#1811#0" expanded="true" />
+                <element signature="e#2482#2490#0" expanded="true" />
+                <marker date="1537414540748" expanded="true" signature="1552:1622" placeholder="select LINE_..PG_PIPELINE..." />
+                <marker date="1537414540748" expanded="true" signature="1552:1621" placeholder="select LINE_..PG_PIPELINE..." />
+                <marker date="1537414540748" expanded="true" signature="2310:2352" placeholder="select disti..PG_PIPELINE..." />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="PipeGalleryRs.java" pinned="false" current="true" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.7140151" vertical-offset="4067" max-vertical-offset="4752">
+              <caret line="221" column="27" selection-start-line="221" selection-start-column="27" selection-end-line="221" selection-end-column="27" />
+              <folding>
+                <element signature="e#6945#6964#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="PipeGalleryManager.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.0" vertical-offset="849" max-vertical-offset="1650">
+              <caret line="61" column="56" selection-start-line="61" selection-start-column="56" selection-end-line="61" selection-end-column="56" />
+              <folding>
+                <element signature="e#2433#2452#0" expanded="true" />
+                <marker date="1537414756878" expanded="true" signature="2209:2277" placeholder="select PG_NA..PG_PIPE_GALLERY..." />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+    </leaf>
   </component>
   <component name="FindManager">
     <FindUsagesManager>
@@ -72,9 +115,6 @@
   <component name="IdeDocumentHistory">
     <option name="changedFiles">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
         <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/manager/PgInPgPersonManager.java" />
@@ -86,23 +126,16 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintainType.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/manager/PgPipeLineManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/EquipmentManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgEquipment.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.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/rs/PgPartitionRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.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/PgDeviceTypeRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
         <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.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/PgMaintainTypeRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainTypeManager.java" />
@@ -123,6 +156,16 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.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/dto/PgPipeLineLengthStatic.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/dto/PipeGalleryDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.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" />
       </list>
     </option>
   </component>
@@ -216,7 +259,20 @@
       <sortByType />
     </navigator>
     <panes>
-      <pane id="Scope" />
+      <pane id="PackagesPane">
+        <subPane>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
+            </PATH_ELEMENT>
+          </PATH>
+        </subPane>
+      </pane>
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -331,22 +387,73 @@
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
-        </subPane>
-      </pane>
-      <pane id="PackagesPane">
-        <subPane>
           <PATH>
             <PATH_ELEMENT>
               <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
               <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="devTable" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="devTable" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="dto" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
         </subPane>
       </pane>
+      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -916,7 +1023,12 @@
       <workItem from="1535958569443" duration="219000" />
       <workItem from="1536111554952" duration="23051000" />
       <workItem from="1536143316539" duration="3706000" />
-      <workItem from="1536195067076" duration="23441000" />
+      <workItem from="1536195067076" duration="23586000" />
+      <workItem from="1536802841385" duration="18000" />
+      <workItem from="1537167144071" duration="1232000" />
+      <workItem from="1537236948589" duration="156000" />
+      <workItem from="1537237991303" duration="1733000" />
+      <workItem from="1537407751831" duration="6397000" />
     </task>
     <task id="LOCAL-00001" summary="first commit">
       <created>1510219102698</created>
@@ -1126,11 +1238,15 @@
       <created>1535958368940</created>
       <updated>1535958368940</updated>
     </task>
-    <option name="localTasksCounter" value="53" />
+    <task id="LOCAL-00053" summary="根据华锐王工反馈测试，修改接口">
+      <created>1536224373164</created>
+      <updated>1536224373165</updated>
+    </task>
+    <option name="localTasksCounter" value="54" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="937579000" />
+    <option name="totallyTimeSpent" value="947260000" />
   </component>
   <component name="TodoView" selected-index="1">
     <todo-panel id="selected-file">
@@ -1165,7 +1281,7 @@
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.391453" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.66382253" sideWeight="0.81316185" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.7235495" sideWeight="0.81316185" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="true" content_ui="tabs" />
       <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.6757679" sideWeight="0.18683812" order="7" side_tool="true" content_ui="tabs" />
@@ -1177,8 +1293,8 @@
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24962178" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32980332" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32649574" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2526475" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32593855" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.28441754" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" />
@@ -1192,18 +1308,18 @@
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
     </layout>
     <layout-to-restore>
-      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.63418806" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
-      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
+      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.391453" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
       <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" />
-      <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.50341296" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
+      <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2962963" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
+      <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.52136755" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32649574" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.29425114" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
@@ -1223,8 +1339,8 @@
       <window_info id="Android" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="15" side_tool="false" content_ui="tabs" />
       <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="true" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32980332" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
     </layout-to-restore>
   </component>
@@ -1243,7 +1359,6 @@
     <option name="myTodoPanelSettings">
       <TodoPanelSettings />
     </option>
-    <MESSAGE value="修改人员入廊记录表和功能" />
     <MESSAGE value="Merge remote-tracking branch 'origin/develop' into develop&#10;&#10;Conflicts:&#10;&#9;.idea/workspace.xml&#10;&#9;~$数据库设计说明新需求.docx&#10;&#9;管廊数据库设计说明新需求.docx&#10;" />
     <MESSAGE value="增加统计功能" />
     <MESSAGE value="修改标注" />
@@ -1268,7 +1383,8 @@
     <MESSAGE value="新增维护类别" />
     <MESSAGE value="修改施工数据新增删除编辑" />
     <MESSAGE value="新增工器具耗材" />
-    <option name="LAST_COMMIT_MESSAGE" value="新增工器具耗材" />
+    <MESSAGE value="根据华锐王工反馈测试，修改接口" />
+    <option name="LAST_COMMIT_MESSAGE" value="根据华锐王工反馈测试，修改接口" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1291,14 +1407,8 @@
           <properties />
           <option name="timeStamp" value="359" />
         </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java</url>
-          <line>190</line>
-          <properties />
-          <option name="timeStamp" value="360" />
-        </line-breakpoint>
       </breakpoints>
-      <option name="time" value="390" />
+      <option name="time" value="399" />
     </breakpoint-manager>
   </component>
   <component name="antWorkspaceConfiguration">
@@ -1306,163 +1416,10 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="3119" max-vertical-offset="7128">
-          <caret line="30" column="52" selection-start-line="30" selection-start-column="52" selection-end-line="30" selection-end-column="52" />
-          <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 vertical-scroll-proportion="0.0" vertical-offset="5071" max-vertical-offset="5918">
-          <caret line="268" column="24" selection-start-line="268" selection-start-column="24" selection-end-line="268" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="13" max-vertical-offset="3058">
-          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.5529623" vertical-offset="528" max-vertical-offset="3014">
-          <caret line="26" column="0" selection-start-line="26" selection-start-column="0" selection-end-line="26" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainTypeDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.33213645" vertical-offset="101" max-vertical-offset="1012">
-          <caret line="15" column="11" selection-start-line="15" selection-start-column="11" selection-end-line="15" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="609" max-vertical-offset="1958">
-          <caret line="39" column="50" selection-start-line="39" selection-start-column="50" selection-end-line="39" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.7271095" vertical-offset="167" max-vertical-offset="1342">
-          <caret line="35" column="0" selection-start-line="35" selection-start-column="0" selection-end-line="35" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.63195693" vertical-offset="0" max-vertical-offset="1452">
-          <caret line="19" column="0" selection-start-line="19" selection-start-column="0" selection-end-line="19" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintainDoc.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.69669116" vertical-offset="61" max-vertical-offset="1320">
-          <caret line="24" column="0" selection-start-line="24" selection-start-column="0" selection-end-line="24" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDocDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.27648115" vertical-offset="0" max-vertical-offset="1342">
-          <caret line="9" column="13" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-7.551724" vertical-offset="3125" max-vertical-offset="4048">
-          <caret line="249" column="85" selection-start-line="249" selection-start-column="85" selection-end-line="249" selection-end-column="85" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-9.862069" vertical-offset="3674" max-vertical-offset="5610">
-          <caret line="203" column="58" selection-start-line="203" selection-start-column="58" selection-end-line="203" selection-end-column="58" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.31597847" vertical-offset="0" max-vertical-offset="557">
-          <caret line="8" column="35" selection-start-line="8" selection-start-column="35" selection-end-line="8" selection-end-column="35" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.66360295" vertical-offset="783" max-vertical-offset="3234">
-          <caret line="68" column="71" selection-start-line="68" selection-start-column="71" selection-end-line="68" selection-end-column="71" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="33" max-vertical-offset="968">
-          <caret line="33" column="62" selection-start-line="33" selection-start-column="62" selection-end-line="33" selection-end-column="62" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://C:/Program Files/Java/jdk1.8.0_131/src.zip!/java/lang/NumberFormatException.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.6285178" vertical-offset="479" max-vertical-offset="1012">
-          <caret line="64" column="0" selection-start-line="64" selection-start-column="0" selection-end-line="64" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-tx/4.0.6.RELEASE/spring-tx-4.0.6.RELEASE-sources.jar!/org/springframework/transaction/interceptor/TransactionAspectSupport.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.23639774" vertical-offset="4736" max-vertical-offset="13244">
-          <caret line="263" column="0" selection-start-line="263" selection-start-column="0" selection-end-line="263" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.2504817" vertical-offset="618" max-vertical-offset="1320">
-          <caret line="35" column="28" selection-start-line="35" selection-start-column="28" selection-end-line="35" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://C:/Program Files/Java/jdk1.8.0_131/src.zip!/java/util/ArrayList.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.73967683" vertical-offset="13360" max-vertical-offset="30690">
-          <caret line="663" column="7" selection-start-line="663" selection-start-column="7" selection-end-line="663" selection-end-column="7" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/StringUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.15798923" vertical-offset="330" max-vertical-offset="2178">
-          <caret line="31" column="29" selection-start-line="31" selection-start-column="29" selection-end-line="31" selection-end-column="29" />
-          <folding />
-        </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 vertical-scroll-proportion="0.11143695" vertical-offset="1854" max-vertical-offset="5170">
-          <caret line="103" column="65" selection-start-line="103" selection-start-column="65" selection-end-line="103" selection-end-column="65" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="jar://C:/Program Files/Java/jdk1.8.0_131/src.zip!/java/util/concurrent/ThreadPoolExecutor.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="1.659824" vertical-offset="23436" max-vertical-offset="44594">
           <caret line="1148" column="31" selection-start-line="1148" selection-start-column="31" selection-end-line="1148" selection-end-column="31" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1470,17 +1427,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.2404692" vertical-offset="9532" max-vertical-offset="12958">
           <caret line="497" column="0" selection-start-line="497" selection-start-column="0" selection-end-line="497" selection-end-column="0" />
-          <folding />
-        </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 vertical-scroll-proportion="0.0" vertical-offset="4977" max-vertical-offset="8316">
-          <caret line="263" column="24" selection-start-line="263" selection-start-column="24" selection-end-line="263" selection-end-column="24" />
-          <folding>
-            <element signature="e#10383#10401#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1488,7 +1434,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-2.1782365" vertical-offset="1359" max-vertical-offset="1892">
           <caret line="24" column="13" selection-start-line="24" selection-start-column="13" selection-end-line="24" selection-end-column="13" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1496,7 +1441,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-1.4093357" vertical-offset="1907" max-vertical-offset="2464">
           <caret line="65" column="60" selection-start-line="65" selection-start-column="11" selection-end-line="65" selection-end-column="60" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1504,10 +1448,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-0.011029412" vertical-offset="2228" max-vertical-offset="2838">
           <caret line="111" column="47" selection-start-line="111" selection-start-column="47" selection-end-line="111" selection-end-column="47" />
-          <folding>
-            <marker date="1535944027199" expanded="true" signature="-1:-1" placeholder="select devic..PG_DEVICE..." />
-            <marker date="1535944027199" expanded="true" signature="-1:-1" placeholder="select * fro..PG_DEVICE..." />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1515,7 +1455,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.76301616" vertical-offset="1687" max-vertical-offset="2376">
           <caret line="143" column="16" selection-start-line="143" selection-start-column="16" selection-end-line="143" selection-end-column="16" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1523,7 +1462,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.88509876" vertical-offset="519" max-vertical-offset="1342">
           <caret line="68" column="0" selection-start-line="68" selection-start-column="0" selection-end-line="68" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1531,7 +1469,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.43267503" vertical-offset="23" max-vertical-offset="1672">
           <caret line="15" column="33" selection-start-line="15" selection-start-column="33" selection-end-line="15" selection-end-column="33" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1540,42 +1477,8 @@
         <state vertical-scroll-proportion="0.5257353" vertical-offset="0" max-vertical-offset="4972">
           <caret line="30" column="0" selection-start-line="30" selection-start-column="0" selection-end-line="30" selection-end-column="0" />
           <folding>
-            <element signature="e#3701#3720#0" expanded="true" />
-            <element signature="e#4190#4208#0" expanded="true" />
-            <marker date="1536211271563" expanded="true" signature="-1:-1" placeholder="select count..PG_CONSTRUCTION..." />
-            <marker date="1536211271563" expanded="true" signature="-1:-1" placeholder="select count..Pg_Construction..." />
-            <marker date="1536211271563" expanded="true" signature="-1:-1" placeholder="SELECT t.ID,..PG_CONSTRUCTION..." />
-            <marker date="1536211271563" expanded="true" signature="-1:-1" placeholder="SELECT m.PAR..PG_PARTITION..." />
-            <marker date="1536211271563" expanded="true" signature="-1:-1" placeholder="SELECT n.TYP..PG_CONSTRUCTION_TYPE..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.40754038" vertical-offset="675" max-vertical-offset="1540">
-          <caret line="108" column="52" selection-start-line="108" selection-start-column="52" selection-end-line="108" selection-end-column="52" />
-          <folding>
-            <element signature="method#saveFiles#0;class#PgCsDocumentManager#0" expanded="false" />
-            <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" expanded="false" />
-            <element signature="e#3728#3745#0" expanded="true" />
-            <marker date="1536205913620" expanded="true" signature="-1:-1" placeholder="select * fro..PG_CSDOCUMENT..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.41666666" vertical-offset="2772" max-vertical-offset="3674">
-          <caret line="192" column="13" selection-start-line="192" selection-start-column="13" selection-end-line="192" selection-end-column="13" />
-          <folding>
-            <element signature="method#setPgCsDocumentManager#0;class#PgCsDocumentRs#0" expanded="false" />
-            <element signature="method#setPgConstructionManager#0;class#PgCsDocumentRs#0" expanded="false" />
-            <element signature="e#2023#2039#0" expanded="true" />
-            <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" expanded="false" />
-            <element signature="e#6060#6076#0" expanded="true" />
-            <element signature="e#6145#6162#0" expanded="true" />
-            <element signature="method#downloadFile#0;class#PgCsDocumentRs#0" expanded="false" />
+            <element signature="e#3701#3720#0" expanded="false" />
+            <element signature="e#4190#4208#0" expanded="false" />
           </folding>
         </state>
       </provider>
@@ -1584,24 +1487,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.9640933" vertical-offset="1091" max-vertical-offset="2112">
           <caret line="83" column="62" selection-start-line="83" selection-start-column="62" selection-end-line="83" selection-end-column="62" />
-          <folding>
-            <element signature="e#2170#2184#0" expanded="true" />
-            <marker date="1536213480710" expanded="true" signature="-1:-1" placeholder="select count..PG_ALARM..." />
-            <marker date="1536213480710" expanded="true" signature="-1:-1" placeholder="select count..PG_ALARM..." />
-            <marker date="1536213480710" expanded="true" signature="-1:-1" placeholder="select count..PG_ALARM..." />
-            <marker date="1536213480710" expanded="true" signature="-1:-1" placeholder="select count..PG_ALARM..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.41666666" vertical-offset="990" max-vertical-offset="1672">
-          <caret line="72" column="55" selection-start-line="72" selection-start-column="55" selection-end-line="72" selection-end-column="55" />
-          <folding>
-            <element signature="e#2152#2168#0" expanded="false" />
-            <element signature="e#2257#2271#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1609,10 +1494,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.75" vertical-offset="440" max-vertical-offset="3938">
           <caret line="62" column="13" selection-start-line="62" selection-start-column="13" selection-end-line="62" selection-end-column="13" />
-          <folding>
-            <element signature="e#1393#1394#0" expanded="false" />
-            <element signature="e#1451#1452#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1620,7 +1501,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.35547575" vertical-offset="0" max-vertical-offset="1012">
           <caret line="18" column="0" selection-start-line="18" selection-start-column="0" selection-end-line="18" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1628,9 +1508,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.45421904" vertical-offset="2145" max-vertical-offset="3608">
           <caret line="125" column="29" selection-start-line="125" selection-start-column="29" selection-end-line="125" selection-end-column="29" />
-          <folding>
-            <element signature="e#3094#3110#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1638,7 +1515,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.513465" vertical-offset="0" max-vertical-offset="1276">
           <caret line="22" column="51" selection-start-line="22" selection-start-column="51" selection-end-line="22" selection-end-column="51" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1646,7 +1522,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.5924596" vertical-offset="0" max-vertical-offset="1254">
           <caret line="20" column="28" selection-start-line="20" selection-start-column="28" selection-end-line="20" selection-end-column="28" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1654,18 +1529,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-3.3052065" vertical-offset="4063" max-vertical-offset="4620">
           <caret line="115" column="15" selection-start-line="115" selection-start-column="15" selection-end-line="115" selection-end-column="15" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.20833333" vertical-offset="1892" max-vertical-offset="3850">
-          <caret line="152" column="24" selection-start-line="152" selection-start-column="24" selection-end-line="152" selection-end-column="24" />
-          <folding>
-            <element signature="method#addReservePlan#0;class#PgReservePlanRs#0" expanded="false" />
-            <element signature="e#3206#3222#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1673,7 +1536,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.06147541" vertical-offset="183" max-vertical-offset="506">
           <caret line="10" column="0" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1681,7 +1543,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="3388">
           <caret line="39" column="56" selection-start-line="39" selection-start-column="56" selection-end-line="39" selection-end-column="56" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1689,22 +1550,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.33213645" vertical-offset="959" max-vertical-offset="2508">
           <caret line="71" column="36" selection-start-line="71" selection-start-column="36" selection-end-line="71" selection-end-column="36" />
-          <folding>
-            <marker date="1536217243963" expanded="true" signature="-1:-1" placeholder="select count..PG_RESERVE_PLAN..." />
-          </folding>
-        </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 vertical-scroll-proportion="0.46401516" vertical-offset="1273" max-vertical-offset="1980">
-          <caret line="106" column="70" selection-start-line="106" selection-start-column="70" selection-end-line="106" selection-end-column="70" />
-          <folding>
-            <element signature="imports" expanded="false" />
-            <element signature="method#linkDevice#0;class#PgAlarmLinkRs#0" expanded="false" />
-            <element signature="e#1459#1475#0" expanded="false" />
-            <element signature="method#linkPartitionDevice#0;class#PgAlarmLinkRs#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1712,7 +1557,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.35906643" vertical-offset="1164" max-vertical-offset="3388">
           <caret line="80" column="23" selection-start-line="80" selection-start-column="23" selection-end-line="80" selection-end-column="23" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1720,7 +1564,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.625" vertical-offset="1364" max-vertical-offset="4158">
           <caret line="99" column="37" selection-start-line="99" selection-start-column="37" selection-end-line="99" selection-end-column="37" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1728,7 +1571,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="1553" max-vertical-offset="2134">
           <caret line="98" column="16" selection-start-line="98" selection-start-column="16" selection-end-line="98" selection-end-column="16" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1736,9 +1578,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="837" max-vertical-offset="1276">
           <caret line="59" column="0" selection-start-line="59" selection-start-column="0" selection-end-line="59" selection-end-column="0" />
-          <folding>
-            <element signature="e#1980#1990#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1746,10 +1585,259 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.24955116" vertical-offset="631" max-vertical-offset="1232">
           <caret line="58" column="34" selection-start-line="58" selection-start-column="34" selection-end-line="58" selection-end-column="34" />
+        </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 vertical-scroll-proportion="0.0" vertical-offset="6759" max-vertical-offset="8316">
+          <caret line="268" column="42" selection-start-line="268" selection-start-column="42" selection-end-line="268" selection-end-column="42" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.8779174" vertical-offset="347" max-vertical-offset="2662">
+          <caret line="54" column="9" selection-start-line="54" selection-start-column="9" selection-end-line="54" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="1.9353681" vertical-offset="0" max-vertical-offset="4906">
+          <caret line="70" column="71" selection-start-line="70" selection-start-column="66" selection-end-line="70" selection-end-column="75" />
+        </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 vertical-scroll-proportion="0.32854578" vertical-offset="1115" max-vertical-offset="1672">
+          <caret line="76" column="33" selection-start-line="76" selection-start-column="33" selection-end-line="76" selection-end-column="33" />
+        </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 vertical-scroll-proportion="3.1723518" vertical-offset="81" max-vertical-offset="2354">
+          <caret line="104" column="12" selection-start-line="104" selection-start-column="12" selection-end-line="104" selection-end-column="12" />
           <folding />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.5260323" vertical-offset="4239" max-vertical-offset="4796">
+          <caret line="224" column="0" selection-start-line="224" selection-start-column="0" selection-end-line="224" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.6445242" vertical-offset="1709" max-vertical-offset="2332">
+          <caret line="111" column="53" selection-start-line="111" selection-start-column="53" selection-end-line="111" selection-end-column="53" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-3.5421903" vertical-offset="5515" max-vertical-offset="6072">
+          <caret line="184" column="25" selection-start-line="184" selection-start-column="25" selection-end-line="184" selection-end-column="25" />
+        </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 vertical-scroll-proportion="-0.78994614" vertical-offset="924" max-vertical-offset="7128">
+          <caret line="41" column="5" selection-start-line="41" selection-start-column="5" selection-end-line="41" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.4344704" vertical-offset="748" max-vertical-offset="1474">
+          <caret line="72" column="0" selection-start-line="72" selection-start-column="0" selection-end-line="72" selection-end-column="0" />
+        </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 vertical-scroll-proportion="0.0" vertical-offset="264" max-vertical-offset="1782">
+          <caret line="37" column="57" selection-start-line="37" selection-start-column="57" selection-end-line="37" selection-end-column="57" />
+          <folding>
+            <marker date="1531722832731" expanded="true" signature="-1:-1" placeholder="select id,CH..PG_CH4..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2420">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://C:/Program Files/Java/jdk1.8.0_131/src.zip!/java/sql/Timestamp.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33027524" vertical-offset="4606" max-vertical-offset="12980">
+          <caret line="236" column="0" selection-start-line="236" selection-start-column="0" selection-end-line="236" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="2.2118492" vertical-offset="0" max-vertical-offset="1496">
+          <caret line="87" column="52" selection-start-line="87" selection-start-column="52" selection-end-line="87" selection-end-column="52" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.4901257" vertical-offset="79" max-vertical-offset="1298">
+          <caret line="25" column="25" selection-start-line="25" selection-start-column="25" selection-end-line="25" selection-end-column="25" />
+          <folding>
+            <marker date="1537412037475" expanded="true" signature="-1:-1" placeholder="select equip..PG_EQUIPMENT..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.8330341" vertical-offset="680" max-vertical-offset="4466">
+          <caret line="68" column="29" selection-start-line="68" selection-start-column="29" selection-end-line="68" selection-end-column="29" />
+          <folding>
+            <element signature="e#1490#1506#0" expanded="true" />
+            <element signature="e#6332#6348#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgEquipment.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.3680431" vertical-offset="191" max-vertical-offset="1540">
+          <caret line="20" column="17" selection-start-line="20" selection-start-column="17" selection-end-line="20" selection-end-column="17" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/4.3.6.Final/hibernate-core-4.3.6.Final-sources.jar!/org/hibernate/internal/AbstractQueryImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33333334" vertical-offset="18814" max-vertical-offset="20328">
+          <caret line="974" column="0" selection-start-line="974" selection-start-column="0" selection-end-line="974" selection-end-column="0" />
+          <folding />
+        </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 vertical-scroll-proportion="0.5924596" vertical-offset="0" max-vertical-offset="1980">
+          <caret line="18" column="32" selection-start-line="18" selection-start-column="32" selection-end-line="18" selection-end-column="32" />
+          <folding />
+        </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 vertical-scroll-proportion="0.7109515" vertical-offset="0" max-vertical-offset="704">
+          <caret line="18" column="31" selection-start-line="18" selection-start-column="31" selection-end-line="18" selection-end-column="31" />
+          <folding>
+            <element signature="e#213#214#0" expanded="true" />
+            <element signature="e#244#245#0" expanded="true" />
+            <element signature="e#292#293#0" expanded="true" />
+            <element signature="e#332#333#0" expanded="true" />
+            <element signature="e#394#395#0" expanded="true" />
+            <element signature="e#438#439#0" expanded="true" />
+            <element signature="e#474#475#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://C:/Program Files/Java/jdk1.8.0_131/src.zip!/java/lang/String.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.21139705" vertical-offset="1469" max-vertical-offset="67452">
+          <caret line="107" column="16" selection-start-line="107" selection-start-column="12" selection-end-line="107" selection-end-column="16" />
+          <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 vertical-scroll-proportion="0.0" vertical-offset="2301" max-vertical-offset="3388">
+          <caret line="277" column="9" selection-start-line="277" selection-start-column="9" selection-end-line="277" selection-end-column="9" />
+          <folding>
+            <element signature="method#addLog#0;class#PgPipeLineRs#0" expanded="false" />
+            <element signature="method#editPipeLine#0;class#PgPipeLineRs#0" expanded="false" />
+            <element signature="method#deletePipeLine#0;class#PgPipeLineRs#0" expanded="false" />
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" expanded="false" />
+            <element signature="e#9602#9626#0" expanded="true" />
+            <element signature="e#10329#10337#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.43727598" vertical-offset="120" max-vertical-offset="1122">
+          <caret line="13" column="34" selection-start-line="13" selection-start-column="34" selection-end-line="13" selection-end-column="34" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.8547855" vertical-offset="137" max-vertical-offset="704">
+          <caret line="18" column="31" selection-start-line="18" selection-start-column="31" selection-end-line="18" selection-end-column="31" />
+          <folding>
+            <element signature="e#204#205#0" expanded="true" />
+            <element signature="e#233#234#0" expanded="true" />
+            <element signature="e#277#278#0" expanded="true" />
+            <element signature="e#313#314#0" expanded="true" />
+            <element signature="e#375#376#0" expanded="true" />
+            <element signature="e#419#420#0" expanded="true" />
+            <element signature="e#455#456#0" expanded="true" />
+          </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 vertical-scroll-proportion="0.0" vertical-offset="330" max-vertical-offset="1342">
+          <caret line="55" column="42" selection-start-line="55" selection-start-column="42" selection-end-line="55" selection-end-column="42" />
+          <folding>
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" expanded="false" />
+            <element signature="e#1787#1811#0" expanded="true" />
+            <element signature="e#2482#2490#0" expanded="true" />
+            <marker date="1537414540748" expanded="true" signature="1552:1622" placeholder="select LINE_..PG_PIPELINE..." />
+            <marker date="1537414540748" expanded="true" signature="1552:1621" placeholder="select LINE_..PG_PIPELINE..." />
+            <marker date="1537414540748" expanded="true" signature="2310:2352" placeholder="select disti..PG_PIPELINE..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="849" max-vertical-offset="1650">
+          <caret line="61" column="56" selection-start-line="61" selection-start-column="56" selection-end-line="61" selection-end-column="56" />
+          <folding>
+            <element signature="e#2433#2452#0" expanded="true" />
+            <marker date="1537414756878" expanded="true" signature="2209:2277" placeholder="select PG_NA..PG_PIPE_GALLERY..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.7140151" vertical-offset="4067" max-vertical-offset="4752">
+          <caret line="221" column="27" selection-start-line="221" selection-start-column="27" selection-end-line="221" selection-end-column="27" />
+          <folding>
+            <element signature="e#6945#6964#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java
index 238bc39..6256b9d 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java
@@ -78,7 +78,7 @@
     public PgEquipmentDto(PgEquipment equipment) {
         if (equipment == null) return;
 
-        SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 
         this.setId(equipment.getId());
         this.setEqName(equipment.getEqName());
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineLengthStatic.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineLengthStatic.java
new file mode 100644
index 0000000..a25538f
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineLengthStatic.java
@@ -0,0 +1,26 @@
+package com.casic.PgInterface.devTable.dto;
+
+/**
+ * Created by yxw on 2018/9/20.
+ */
+public class PgPipeLineLengthStatic {
+
+    private String lineType;
+    private String length;
+
+    public String getLineType() {
+        return lineType;
+    }
+
+    public void setLineType(String lineType) {
+        this.lineType = lineType;
+    }
+
+    public String getLength() {
+        return length;
+    }
+
+    public void setLength(String length) {
+        this.length = length;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.java b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.java
new file mode 100644
index 0000000..bd65ff4
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.java
@@ -0,0 +1,26 @@
+package com.casic.PgInterface.devTable.dto;
+
+/**
+ * Created by yxw on 2018/9/20.
+ */
+public class PipeGalleryStatic {
+
+    private String pgName;
+    private String length;
+
+    public String getPgName() {
+        return pgName;
+    }
+
+    public void setPgName(String pgName) {
+        this.pgName = pgName;
+    }
+
+    public String getLength() {
+        return length;
+    }
+
+    public void setLength(String length) {
+        this.length = length;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
index e46742c..ab0908b 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
@@ -23,7 +23,7 @@
         criteria.add(Restrictions.eq("eqCode", eqCode));
         criteria.add(Restrictions.eq("active",1));
 
-        List<PgEquipment> pgEquipmentList = criteria.list();
+        List<PgEquipment> pgEquipmentList = (List<PgEquipment>)criteria.list();
 
         if(pgEquipmentList!=null&&pgEquipmentList.size()!=0)
             return pgEquipmentList.get(0);
@@ -49,10 +49,10 @@
 
     //统计工器具耗材数量
     public List<PgDeviceTypeStatisticDto> getDeviceStatisticByDevType(String eqType){
-        String eqType1=eqType.equals("0")?"工器具":"耗材";
+        //String eqType1=eqType.equals("0")?"工器具":"耗材";
 
         String hql="select equipment.EQ_NAME,count(*) from PG_EQUIPMENT equipment where equipment.EQ_TYPE = '"
-        +eqType1+"' group by equipment.EQ_NAME";
+        +eqType+"' group by equipment.EQ_NAME";
 
         List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list();
 
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 8d8db5d..4cfa880 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
@@ -3,6 +3,7 @@
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
 import com.casic.PgInterface.devTable.domain.PgPipeLine;
 import com.casic.PgInterface.devTable.dto.PgPipeLineDto;
+import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
@@ -39,13 +40,35 @@
         return pgPipeLineDtoList;
     }
 
-   public String getPipeLengthByName(String lineType) {
-       String sql = "select SUM(PIPE_LENGTH) from PG_PIPELINE where LINE_TYPE = '" + lineType + "'";
+    public List<PgPipeLineLengthStatic> getPipeLengthByName() {
+        String sql = "select LINE_TYPE,SUM(PIPE_LENGTH) from PG_PIPELINE group by LINE_TYPE ";
 
-       String sumLength = String.valueOf(this.getSession().createSQLQuery(sql).uniqueResult());
+        List<Object[]> objectList = this.getSession().createSQLQuery(sql).list();
+        List<PgPipeLineLengthStatic> pgPipeLineLengthStaticList = new ArrayList<PgPipeLineLengthStatic>();
 
-       return sumLength;
-   }
+        for(Object[] objectArray : objectList)
+        {
+            PgPipeLineLengthStatic pgPipeLineLengthStatic=new PgPipeLineLengthStatic();
+            pgPipeLineLengthStatic.setLineType(String.valueOf(objectArray[0]));
+            pgPipeLineLengthStatic.setLength(String.valueOf(objectArray[1]));
+            pgPipeLineLengthStaticList.add(pgPipeLineLengthStatic);
+        }
+        return pgPipeLineLengthStaticList;
+    }
+
+    public  List<String> getPipeType() {
+        String sql = "select distinct LINE_TYPE from PG_PIPELINE";
+
+        List<Object> objectList = this.getSession().createSQLQuery(sql).list();
+
+        List<String> stringList=new ArrayList<String>();
+
+        for(Object ob : objectList)
+        {
+            stringList.add(String.valueOf(ob));
+        }
+        return stringList;
+    }
 
 }
 

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 73b1050..7a80a23 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,34 +2,17 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="">
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\~$数据库设计说明新需求.docx" afterPath="" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/~$数据库设计说明新需求.docx" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineLengthStatic.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/接口说明新需求.docx" afterPath="$PROJECT_DIR$/接口说明新需求.docx" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainTypeManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainTypeManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources/application.properties" afterPath="$PROJECT_DIR$/src/main/resources/application.properties" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
     </list>
     <ignored path="PgInterface.iws" />
@@ -54,7 +37,67 @@
     <favorites_list name="PgInterface" />
   </component>
   <component name="FileEditorManager">
-    <leaf />
+    <leaf>
+      <file leaf-file-name="PgPipeLineRs.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.0" vertical-offset="2301" max-vertical-offset="3388">
+              <caret line="277" column="9" selection-start-line="277" selection-start-column="9" selection-end-line="277" selection-end-column="9" />
+              <folding>
+                <element signature="method#addLog#0;class#PgPipeLineRs#0" expanded="false" />
+                <element signature="method#editPipeLine#0;class#PgPipeLineRs#0" expanded="false" />
+                <element signature="method#deletePipeLine#0;class#PgPipeLineRs#0" expanded="false" />
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" expanded="false" />
+                <element signature="e#9602#9626#0" expanded="true" />
+                <element signature="e#10329#10337#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="PgPipeLineManager.java" pinned="false" current="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 vertical-scroll-proportion="0.0" vertical-offset="330" max-vertical-offset="1342">
+              <caret line="55" column="42" selection-start-line="55" selection-start-column="42" selection-end-line="55" selection-end-column="42" />
+              <folding>
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" expanded="false" />
+                <element signature="e#1787#1811#0" expanded="true" />
+                <element signature="e#2482#2490#0" expanded="true" />
+                <marker date="1537414540748" expanded="true" signature="1552:1622" placeholder="select LINE_..PG_PIPELINE..." />
+                <marker date="1537414540748" expanded="true" signature="1552:1621" placeholder="select LINE_..PG_PIPELINE..." />
+                <marker date="1537414540748" expanded="true" signature="2310:2352" placeholder="select disti..PG_PIPELINE..." />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="PipeGalleryRs.java" pinned="false" current="true" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.7140151" vertical-offset="4067" max-vertical-offset="4752">
+              <caret line="221" column="27" selection-start-line="221" selection-start-column="27" selection-end-line="221" selection-end-column="27" />
+              <folding>
+                <element signature="e#6945#6964#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="PipeGalleryManager.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.0" vertical-offset="849" max-vertical-offset="1650">
+              <caret line="61" column="56" selection-start-line="61" selection-start-column="56" selection-end-line="61" selection-end-column="56" />
+              <folding>
+                <element signature="e#2433#2452#0" expanded="true" />
+                <marker date="1537414756878" expanded="true" signature="2209:2277" placeholder="select PG_NA..PG_PIPE_GALLERY..." />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+    </leaf>
   </component>
   <component name="FindManager">
     <FindUsagesManager>
@@ -72,9 +115,6 @@
   <component name="IdeDocumentHistory">
     <option name="changedFiles">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
         <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/manager/PgInPgPersonManager.java" />
@@ -86,23 +126,16 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintainType.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/manager/PgPipeLineManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/EquipmentManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgEquipment.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.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/rs/PgPartitionRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.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/PgDeviceTypeRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
         <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.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/PgMaintainTypeRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainTypeManager.java" />
@@ -123,6 +156,16 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.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/dto/PgPipeLineLengthStatic.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/dto/PipeGalleryDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.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" />
       </list>
     </option>
   </component>
@@ -216,7 +259,20 @@
       <sortByType />
     </navigator>
     <panes>
-      <pane id="Scope" />
+      <pane id="PackagesPane">
+        <subPane>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
+            </PATH_ELEMENT>
+          </PATH>
+        </subPane>
+      </pane>
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -331,22 +387,73 @@
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
-        </subPane>
-      </pane>
-      <pane id="PackagesPane">
-        <subPane>
           <PATH>
             <PATH_ELEMENT>
               <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
               <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="devTable" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="devTable" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="dto" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
         </subPane>
       </pane>
+      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -916,7 +1023,12 @@
       <workItem from="1535958569443" duration="219000" />
       <workItem from="1536111554952" duration="23051000" />
       <workItem from="1536143316539" duration="3706000" />
-      <workItem from="1536195067076" duration="23441000" />
+      <workItem from="1536195067076" duration="23586000" />
+      <workItem from="1536802841385" duration="18000" />
+      <workItem from="1537167144071" duration="1232000" />
+      <workItem from="1537236948589" duration="156000" />
+      <workItem from="1537237991303" duration="1733000" />
+      <workItem from="1537407751831" duration="6397000" />
     </task>
     <task id="LOCAL-00001" summary="first commit">
       <created>1510219102698</created>
@@ -1126,11 +1238,15 @@
       <created>1535958368940</created>
       <updated>1535958368940</updated>
     </task>
-    <option name="localTasksCounter" value="53" />
+    <task id="LOCAL-00053" summary="根据华锐王工反馈测试，修改接口">
+      <created>1536224373164</created>
+      <updated>1536224373165</updated>
+    </task>
+    <option name="localTasksCounter" value="54" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="937579000" />
+    <option name="totallyTimeSpent" value="947260000" />
   </component>
   <component name="TodoView" selected-index="1">
     <todo-panel id="selected-file">
@@ -1165,7 +1281,7 @@
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.391453" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.66382253" sideWeight="0.81316185" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.7235495" sideWeight="0.81316185" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="true" content_ui="tabs" />
       <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.6757679" sideWeight="0.18683812" order="7" side_tool="true" content_ui="tabs" />
@@ -1177,8 +1293,8 @@
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24962178" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32980332" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32649574" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2526475" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32593855" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.28441754" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" />
@@ -1192,18 +1308,18 @@
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
     </layout>
     <layout-to-restore>
-      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.63418806" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
-      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
+      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.391453" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
       <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" />
-      <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.50341296" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
+      <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2962963" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
+      <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.52136755" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32649574" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.29425114" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
@@ -1223,8 +1339,8 @@
       <window_info id="Android" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="15" side_tool="false" content_ui="tabs" />
       <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="true" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32980332" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
     </layout-to-restore>
   </component>
@@ -1243,7 +1359,6 @@
     <option name="myTodoPanelSettings">
       <TodoPanelSettings />
     </option>
-    <MESSAGE value="修改人员入廊记录表和功能" />
     <MESSAGE value="Merge remote-tracking branch 'origin/develop' into develop&#10;&#10;Conflicts:&#10;&#9;.idea/workspace.xml&#10;&#9;~$数据库设计说明新需求.docx&#10;&#9;管廊数据库设计说明新需求.docx&#10;" />
     <MESSAGE value="增加统计功能" />
     <MESSAGE value="修改标注" />
@@ -1268,7 +1383,8 @@
     <MESSAGE value="新增维护类别" />
     <MESSAGE value="修改施工数据新增删除编辑" />
     <MESSAGE value="新增工器具耗材" />
-    <option name="LAST_COMMIT_MESSAGE" value="新增工器具耗材" />
+    <MESSAGE value="根据华锐王工反馈测试，修改接口" />
+    <option name="LAST_COMMIT_MESSAGE" value="根据华锐王工反馈测试，修改接口" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1291,14 +1407,8 @@
           <properties />
           <option name="timeStamp" value="359" />
         </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java</url>
-          <line>190</line>
-          <properties />
-          <option name="timeStamp" value="360" />
-        </line-breakpoint>
       </breakpoints>
-      <option name="time" value="390" />
+      <option name="time" value="399" />
     </breakpoint-manager>
   </component>
   <component name="antWorkspaceConfiguration">
@@ -1306,163 +1416,10 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="3119" max-vertical-offset="7128">
-          <caret line="30" column="52" selection-start-line="30" selection-start-column="52" selection-end-line="30" selection-end-column="52" />
-          <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 vertical-scroll-proportion="0.0" vertical-offset="5071" max-vertical-offset="5918">
-          <caret line="268" column="24" selection-start-line="268" selection-start-column="24" selection-end-line="268" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="13" max-vertical-offset="3058">
-          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.5529623" vertical-offset="528" max-vertical-offset="3014">
-          <caret line="26" column="0" selection-start-line="26" selection-start-column="0" selection-end-line="26" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainTypeDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.33213645" vertical-offset="101" max-vertical-offset="1012">
-          <caret line="15" column="11" selection-start-line="15" selection-start-column="11" selection-end-line="15" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="609" max-vertical-offset="1958">
-          <caret line="39" column="50" selection-start-line="39" selection-start-column="50" selection-end-line="39" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.7271095" vertical-offset="167" max-vertical-offset="1342">
-          <caret line="35" column="0" selection-start-line="35" selection-start-column="0" selection-end-line="35" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.63195693" vertical-offset="0" max-vertical-offset="1452">
-          <caret line="19" column="0" selection-start-line="19" selection-start-column="0" selection-end-line="19" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintainDoc.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.69669116" vertical-offset="61" max-vertical-offset="1320">
-          <caret line="24" column="0" selection-start-line="24" selection-start-column="0" selection-end-line="24" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDocDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.27648115" vertical-offset="0" max-vertical-offset="1342">
-          <caret line="9" column="13" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-7.551724" vertical-offset="3125" max-vertical-offset="4048">
-          <caret line="249" column="85" selection-start-line="249" selection-start-column="85" selection-end-line="249" selection-end-column="85" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-9.862069" vertical-offset="3674" max-vertical-offset="5610">
-          <caret line="203" column="58" selection-start-line="203" selection-start-column="58" selection-end-line="203" selection-end-column="58" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.31597847" vertical-offset="0" max-vertical-offset="557">
-          <caret line="8" column="35" selection-start-line="8" selection-start-column="35" selection-end-line="8" selection-end-column="35" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.66360295" vertical-offset="783" max-vertical-offset="3234">
-          <caret line="68" column="71" selection-start-line="68" selection-start-column="71" selection-end-line="68" selection-end-column="71" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="33" max-vertical-offset="968">
-          <caret line="33" column="62" selection-start-line="33" selection-start-column="62" selection-end-line="33" selection-end-column="62" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://C:/Program Files/Java/jdk1.8.0_131/src.zip!/java/lang/NumberFormatException.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.6285178" vertical-offset="479" max-vertical-offset="1012">
-          <caret line="64" column="0" selection-start-line="64" selection-start-column="0" selection-end-line="64" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-tx/4.0.6.RELEASE/spring-tx-4.0.6.RELEASE-sources.jar!/org/springframework/transaction/interceptor/TransactionAspectSupport.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.23639774" vertical-offset="4736" max-vertical-offset="13244">
-          <caret line="263" column="0" selection-start-line="263" selection-start-column="0" selection-end-line="263" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.2504817" vertical-offset="618" max-vertical-offset="1320">
-          <caret line="35" column="28" selection-start-line="35" selection-start-column="28" selection-end-line="35" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://C:/Program Files/Java/jdk1.8.0_131/src.zip!/java/util/ArrayList.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.73967683" vertical-offset="13360" max-vertical-offset="30690">
-          <caret line="663" column="7" selection-start-line="663" selection-start-column="7" selection-end-line="663" selection-end-column="7" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/StringUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.15798923" vertical-offset="330" max-vertical-offset="2178">
-          <caret line="31" column="29" selection-start-line="31" selection-start-column="29" selection-end-line="31" selection-end-column="29" />
-          <folding />
-        </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 vertical-scroll-proportion="0.11143695" vertical-offset="1854" max-vertical-offset="5170">
-          <caret line="103" column="65" selection-start-line="103" selection-start-column="65" selection-end-line="103" selection-end-column="65" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="jar://C:/Program Files/Java/jdk1.8.0_131/src.zip!/java/util/concurrent/ThreadPoolExecutor.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="1.659824" vertical-offset="23436" max-vertical-offset="44594">
           <caret line="1148" column="31" selection-start-line="1148" selection-start-column="31" selection-end-line="1148" selection-end-column="31" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1470,17 +1427,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.2404692" vertical-offset="9532" max-vertical-offset="12958">
           <caret line="497" column="0" selection-start-line="497" selection-start-column="0" selection-end-line="497" selection-end-column="0" />
-          <folding />
-        </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 vertical-scroll-proportion="0.0" vertical-offset="4977" max-vertical-offset="8316">
-          <caret line="263" column="24" selection-start-line="263" selection-start-column="24" selection-end-line="263" selection-end-column="24" />
-          <folding>
-            <element signature="e#10383#10401#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1488,7 +1434,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-2.1782365" vertical-offset="1359" max-vertical-offset="1892">
           <caret line="24" column="13" selection-start-line="24" selection-start-column="13" selection-end-line="24" selection-end-column="13" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1496,7 +1441,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-1.4093357" vertical-offset="1907" max-vertical-offset="2464">
           <caret line="65" column="60" selection-start-line="65" selection-start-column="11" selection-end-line="65" selection-end-column="60" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1504,10 +1448,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-0.011029412" vertical-offset="2228" max-vertical-offset="2838">
           <caret line="111" column="47" selection-start-line="111" selection-start-column="47" selection-end-line="111" selection-end-column="47" />
-          <folding>
-            <marker date="1535944027199" expanded="true" signature="-1:-1" placeholder="select devic..PG_DEVICE..." />
-            <marker date="1535944027199" expanded="true" signature="-1:-1" placeholder="select * fro..PG_DEVICE..." />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1515,7 +1455,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.76301616" vertical-offset="1687" max-vertical-offset="2376">
           <caret line="143" column="16" selection-start-line="143" selection-start-column="16" selection-end-line="143" selection-end-column="16" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1523,7 +1462,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.88509876" vertical-offset="519" max-vertical-offset="1342">
           <caret line="68" column="0" selection-start-line="68" selection-start-column="0" selection-end-line="68" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1531,7 +1469,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.43267503" vertical-offset="23" max-vertical-offset="1672">
           <caret line="15" column="33" selection-start-line="15" selection-start-column="33" selection-end-line="15" selection-end-column="33" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1540,42 +1477,8 @@
         <state vertical-scroll-proportion="0.5257353" vertical-offset="0" max-vertical-offset="4972">
           <caret line="30" column="0" selection-start-line="30" selection-start-column="0" selection-end-line="30" selection-end-column="0" />
           <folding>
-            <element signature="e#3701#3720#0" expanded="true" />
-            <element signature="e#4190#4208#0" expanded="true" />
-            <marker date="1536211271563" expanded="true" signature="-1:-1" placeholder="select count..PG_CONSTRUCTION..." />
-            <marker date="1536211271563" expanded="true" signature="-1:-1" placeholder="select count..Pg_Construction..." />
-            <marker date="1536211271563" expanded="true" signature="-1:-1" placeholder="SELECT t.ID,..PG_CONSTRUCTION..." />
-            <marker date="1536211271563" expanded="true" signature="-1:-1" placeholder="SELECT m.PAR..PG_PARTITION..." />
-            <marker date="1536211271563" expanded="true" signature="-1:-1" placeholder="SELECT n.TYP..PG_CONSTRUCTION_TYPE..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.40754038" vertical-offset="675" max-vertical-offset="1540">
-          <caret line="108" column="52" selection-start-line="108" selection-start-column="52" selection-end-line="108" selection-end-column="52" />
-          <folding>
-            <element signature="method#saveFiles#0;class#PgCsDocumentManager#0" expanded="false" />
-            <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" expanded="false" />
-            <element signature="e#3728#3745#0" expanded="true" />
-            <marker date="1536205913620" expanded="true" signature="-1:-1" placeholder="select * fro..PG_CSDOCUMENT..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.41666666" vertical-offset="2772" max-vertical-offset="3674">
-          <caret line="192" column="13" selection-start-line="192" selection-start-column="13" selection-end-line="192" selection-end-column="13" />
-          <folding>
-            <element signature="method#setPgCsDocumentManager#0;class#PgCsDocumentRs#0" expanded="false" />
-            <element signature="method#setPgConstructionManager#0;class#PgCsDocumentRs#0" expanded="false" />
-            <element signature="e#2023#2039#0" expanded="true" />
-            <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" expanded="false" />
-            <element signature="e#6060#6076#0" expanded="true" />
-            <element signature="e#6145#6162#0" expanded="true" />
-            <element signature="method#downloadFile#0;class#PgCsDocumentRs#0" expanded="false" />
+            <element signature="e#3701#3720#0" expanded="false" />
+            <element signature="e#4190#4208#0" expanded="false" />
           </folding>
         </state>
       </provider>
@@ -1584,24 +1487,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.9640933" vertical-offset="1091" max-vertical-offset="2112">
           <caret line="83" column="62" selection-start-line="83" selection-start-column="62" selection-end-line="83" selection-end-column="62" />
-          <folding>
-            <element signature="e#2170#2184#0" expanded="true" />
-            <marker date="1536213480710" expanded="true" signature="-1:-1" placeholder="select count..PG_ALARM..." />
-            <marker date="1536213480710" expanded="true" signature="-1:-1" placeholder="select count..PG_ALARM..." />
-            <marker date="1536213480710" expanded="true" signature="-1:-1" placeholder="select count..PG_ALARM..." />
-            <marker date="1536213480710" expanded="true" signature="-1:-1" placeholder="select count..PG_ALARM..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.41666666" vertical-offset="990" max-vertical-offset="1672">
-          <caret line="72" column="55" selection-start-line="72" selection-start-column="55" selection-end-line="72" selection-end-column="55" />
-          <folding>
-            <element signature="e#2152#2168#0" expanded="false" />
-            <element signature="e#2257#2271#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1609,10 +1494,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.75" vertical-offset="440" max-vertical-offset="3938">
           <caret line="62" column="13" selection-start-line="62" selection-start-column="13" selection-end-line="62" selection-end-column="13" />
-          <folding>
-            <element signature="e#1393#1394#0" expanded="false" />
-            <element signature="e#1451#1452#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1620,7 +1501,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.35547575" vertical-offset="0" max-vertical-offset="1012">
           <caret line="18" column="0" selection-start-line="18" selection-start-column="0" selection-end-line="18" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1628,9 +1508,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.45421904" vertical-offset="2145" max-vertical-offset="3608">
           <caret line="125" column="29" selection-start-line="125" selection-start-column="29" selection-end-line="125" selection-end-column="29" />
-          <folding>
-            <element signature="e#3094#3110#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1638,7 +1515,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.513465" vertical-offset="0" max-vertical-offset="1276">
           <caret line="22" column="51" selection-start-line="22" selection-start-column="51" selection-end-line="22" selection-end-column="51" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1646,7 +1522,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.5924596" vertical-offset="0" max-vertical-offset="1254">
           <caret line="20" column="28" selection-start-line="20" selection-start-column="28" selection-end-line="20" selection-end-column="28" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1654,18 +1529,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-3.3052065" vertical-offset="4063" max-vertical-offset="4620">
           <caret line="115" column="15" selection-start-line="115" selection-start-column="15" selection-end-line="115" selection-end-column="15" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.20833333" vertical-offset="1892" max-vertical-offset="3850">
-          <caret line="152" column="24" selection-start-line="152" selection-start-column="24" selection-end-line="152" selection-end-column="24" />
-          <folding>
-            <element signature="method#addReservePlan#0;class#PgReservePlanRs#0" expanded="false" />
-            <element signature="e#3206#3222#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1673,7 +1536,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.06147541" vertical-offset="183" max-vertical-offset="506">
           <caret line="10" column="0" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1681,7 +1543,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="3388">
           <caret line="39" column="56" selection-start-line="39" selection-start-column="56" selection-end-line="39" selection-end-column="56" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1689,22 +1550,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.33213645" vertical-offset="959" max-vertical-offset="2508">
           <caret line="71" column="36" selection-start-line="71" selection-start-column="36" selection-end-line="71" selection-end-column="36" />
-          <folding>
-            <marker date="1536217243963" expanded="true" signature="-1:-1" placeholder="select count..PG_RESERVE_PLAN..." />
-          </folding>
-        </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 vertical-scroll-proportion="0.46401516" vertical-offset="1273" max-vertical-offset="1980">
-          <caret line="106" column="70" selection-start-line="106" selection-start-column="70" selection-end-line="106" selection-end-column="70" />
-          <folding>
-            <element signature="imports" expanded="false" />
-            <element signature="method#linkDevice#0;class#PgAlarmLinkRs#0" expanded="false" />
-            <element signature="e#1459#1475#0" expanded="false" />
-            <element signature="method#linkPartitionDevice#0;class#PgAlarmLinkRs#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1712,7 +1557,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.35906643" vertical-offset="1164" max-vertical-offset="3388">
           <caret line="80" column="23" selection-start-line="80" selection-start-column="23" selection-end-line="80" selection-end-column="23" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1720,7 +1564,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.625" vertical-offset="1364" max-vertical-offset="4158">
           <caret line="99" column="37" selection-start-line="99" selection-start-column="37" selection-end-line="99" selection-end-column="37" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1728,7 +1571,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="1553" max-vertical-offset="2134">
           <caret line="98" column="16" selection-start-line="98" selection-start-column="16" selection-end-line="98" selection-end-column="16" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1736,9 +1578,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="837" max-vertical-offset="1276">
           <caret line="59" column="0" selection-start-line="59" selection-start-column="0" selection-end-line="59" selection-end-column="0" />
-          <folding>
-            <element signature="e#1980#1990#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1746,10 +1585,259 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.24955116" vertical-offset="631" max-vertical-offset="1232">
           <caret line="58" column="34" selection-start-line="58" selection-start-column="34" selection-end-line="58" selection-end-column="34" />
+        </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 vertical-scroll-proportion="0.0" vertical-offset="6759" max-vertical-offset="8316">
+          <caret line="268" column="42" selection-start-line="268" selection-start-column="42" selection-end-line="268" selection-end-column="42" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.8779174" vertical-offset="347" max-vertical-offset="2662">
+          <caret line="54" column="9" selection-start-line="54" selection-start-column="9" selection-end-line="54" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="1.9353681" vertical-offset="0" max-vertical-offset="4906">
+          <caret line="70" column="71" selection-start-line="70" selection-start-column="66" selection-end-line="70" selection-end-column="75" />
+        </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 vertical-scroll-proportion="0.32854578" vertical-offset="1115" max-vertical-offset="1672">
+          <caret line="76" column="33" selection-start-line="76" selection-start-column="33" selection-end-line="76" selection-end-column="33" />
+        </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 vertical-scroll-proportion="3.1723518" vertical-offset="81" max-vertical-offset="2354">
+          <caret line="104" column="12" selection-start-line="104" selection-start-column="12" selection-end-line="104" selection-end-column="12" />
           <folding />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.5260323" vertical-offset="4239" max-vertical-offset="4796">
+          <caret line="224" column="0" selection-start-line="224" selection-start-column="0" selection-end-line="224" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.6445242" vertical-offset="1709" max-vertical-offset="2332">
+          <caret line="111" column="53" selection-start-line="111" selection-start-column="53" selection-end-line="111" selection-end-column="53" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-3.5421903" vertical-offset="5515" max-vertical-offset="6072">
+          <caret line="184" column="25" selection-start-line="184" selection-start-column="25" selection-end-line="184" selection-end-column="25" />
+        </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 vertical-scroll-proportion="-0.78994614" vertical-offset="924" max-vertical-offset="7128">
+          <caret line="41" column="5" selection-start-line="41" selection-start-column="5" selection-end-line="41" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.4344704" vertical-offset="748" max-vertical-offset="1474">
+          <caret line="72" column="0" selection-start-line="72" selection-start-column="0" selection-end-line="72" selection-end-column="0" />
+        </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 vertical-scroll-proportion="0.0" vertical-offset="264" max-vertical-offset="1782">
+          <caret line="37" column="57" selection-start-line="37" selection-start-column="57" selection-end-line="37" selection-end-column="57" />
+          <folding>
+            <marker date="1531722832731" expanded="true" signature="-1:-1" placeholder="select id,CH..PG_CH4..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2420">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://C:/Program Files/Java/jdk1.8.0_131/src.zip!/java/sql/Timestamp.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33027524" vertical-offset="4606" max-vertical-offset="12980">
+          <caret line="236" column="0" selection-start-line="236" selection-start-column="0" selection-end-line="236" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="2.2118492" vertical-offset="0" max-vertical-offset="1496">
+          <caret line="87" column="52" selection-start-line="87" selection-start-column="52" selection-end-line="87" selection-end-column="52" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.4901257" vertical-offset="79" max-vertical-offset="1298">
+          <caret line="25" column="25" selection-start-line="25" selection-start-column="25" selection-end-line="25" selection-end-column="25" />
+          <folding>
+            <marker date="1537412037475" expanded="true" signature="-1:-1" placeholder="select equip..PG_EQUIPMENT..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.8330341" vertical-offset="680" max-vertical-offset="4466">
+          <caret line="68" column="29" selection-start-line="68" selection-start-column="29" selection-end-line="68" selection-end-column="29" />
+          <folding>
+            <element signature="e#1490#1506#0" expanded="true" />
+            <element signature="e#6332#6348#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgEquipment.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.3680431" vertical-offset="191" max-vertical-offset="1540">
+          <caret line="20" column="17" selection-start-line="20" selection-start-column="17" selection-end-line="20" selection-end-column="17" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/4.3.6.Final/hibernate-core-4.3.6.Final-sources.jar!/org/hibernate/internal/AbstractQueryImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33333334" vertical-offset="18814" max-vertical-offset="20328">
+          <caret line="974" column="0" selection-start-line="974" selection-start-column="0" selection-end-line="974" selection-end-column="0" />
+          <folding />
+        </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 vertical-scroll-proportion="0.5924596" vertical-offset="0" max-vertical-offset="1980">
+          <caret line="18" column="32" selection-start-line="18" selection-start-column="32" selection-end-line="18" selection-end-column="32" />
+          <folding />
+        </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 vertical-scroll-proportion="0.7109515" vertical-offset="0" max-vertical-offset="704">
+          <caret line="18" column="31" selection-start-line="18" selection-start-column="31" selection-end-line="18" selection-end-column="31" />
+          <folding>
+            <element signature="e#213#214#0" expanded="true" />
+            <element signature="e#244#245#0" expanded="true" />
+            <element signature="e#292#293#0" expanded="true" />
+            <element signature="e#332#333#0" expanded="true" />
+            <element signature="e#394#395#0" expanded="true" />
+            <element signature="e#438#439#0" expanded="true" />
+            <element signature="e#474#475#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://C:/Program Files/Java/jdk1.8.0_131/src.zip!/java/lang/String.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.21139705" vertical-offset="1469" max-vertical-offset="67452">
+          <caret line="107" column="16" selection-start-line="107" selection-start-column="12" selection-end-line="107" selection-end-column="16" />
+          <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 vertical-scroll-proportion="0.0" vertical-offset="2301" max-vertical-offset="3388">
+          <caret line="277" column="9" selection-start-line="277" selection-start-column="9" selection-end-line="277" selection-end-column="9" />
+          <folding>
+            <element signature="method#addLog#0;class#PgPipeLineRs#0" expanded="false" />
+            <element signature="method#editPipeLine#0;class#PgPipeLineRs#0" expanded="false" />
+            <element signature="method#deletePipeLine#0;class#PgPipeLineRs#0" expanded="false" />
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" expanded="false" />
+            <element signature="e#9602#9626#0" expanded="true" />
+            <element signature="e#10329#10337#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.43727598" vertical-offset="120" max-vertical-offset="1122">
+          <caret line="13" column="34" selection-start-line="13" selection-start-column="34" selection-end-line="13" selection-end-column="34" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.8547855" vertical-offset="137" max-vertical-offset="704">
+          <caret line="18" column="31" selection-start-line="18" selection-start-column="31" selection-end-line="18" selection-end-column="31" />
+          <folding>
+            <element signature="e#204#205#0" expanded="true" />
+            <element signature="e#233#234#0" expanded="true" />
+            <element signature="e#277#278#0" expanded="true" />
+            <element signature="e#313#314#0" expanded="true" />
+            <element signature="e#375#376#0" expanded="true" />
+            <element signature="e#419#420#0" expanded="true" />
+            <element signature="e#455#456#0" expanded="true" />
+          </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 vertical-scroll-proportion="0.0" vertical-offset="330" max-vertical-offset="1342">
+          <caret line="55" column="42" selection-start-line="55" selection-start-column="42" selection-end-line="55" selection-end-column="42" />
+          <folding>
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" expanded="false" />
+            <element signature="e#1787#1811#0" expanded="true" />
+            <element signature="e#2482#2490#0" expanded="true" />
+            <marker date="1537414540748" expanded="true" signature="1552:1622" placeholder="select LINE_..PG_PIPELINE..." />
+            <marker date="1537414540748" expanded="true" signature="1552:1621" placeholder="select LINE_..PG_PIPELINE..." />
+            <marker date="1537414540748" expanded="true" signature="2310:2352" placeholder="select disti..PG_PIPELINE..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="849" max-vertical-offset="1650">
+          <caret line="61" column="56" selection-start-line="61" selection-start-column="56" selection-end-line="61" selection-end-column="56" />
+          <folding>
+            <element signature="e#2433#2452#0" expanded="true" />
+            <marker date="1537414756878" expanded="true" signature="2209:2277" placeholder="select PG_NA..PG_PIPE_GALLERY..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.7140151" vertical-offset="4067" max-vertical-offset="4752">
+          <caret line="221" column="27" selection-start-line="221" selection-start-column="27" selection-end-line="221" selection-end-column="27" />
+          <folding>
+            <element signature="e#6945#6964#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java
index 238bc39..6256b9d 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java
@@ -78,7 +78,7 @@
     public PgEquipmentDto(PgEquipment equipment) {
         if (equipment == null) return;
 
-        SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 
         this.setId(equipment.getId());
         this.setEqName(equipment.getEqName());
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineLengthStatic.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineLengthStatic.java
new file mode 100644
index 0000000..a25538f
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineLengthStatic.java
@@ -0,0 +1,26 @@
+package com.casic.PgInterface.devTable.dto;
+
+/**
+ * Created by yxw on 2018/9/20.
+ */
+public class PgPipeLineLengthStatic {
+
+    private String lineType;
+    private String length;
+
+    public String getLineType() {
+        return lineType;
+    }
+
+    public void setLineType(String lineType) {
+        this.lineType = lineType;
+    }
+
+    public String getLength() {
+        return length;
+    }
+
+    public void setLength(String length) {
+        this.length = length;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.java b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.java
new file mode 100644
index 0000000..bd65ff4
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.java
@@ -0,0 +1,26 @@
+package com.casic.PgInterface.devTable.dto;
+
+/**
+ * Created by yxw on 2018/9/20.
+ */
+public class PipeGalleryStatic {
+
+    private String pgName;
+    private String length;
+
+    public String getPgName() {
+        return pgName;
+    }
+
+    public void setPgName(String pgName) {
+        this.pgName = pgName;
+    }
+
+    public String getLength() {
+        return length;
+    }
+
+    public void setLength(String length) {
+        this.length = length;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
index e46742c..ab0908b 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
@@ -23,7 +23,7 @@
         criteria.add(Restrictions.eq("eqCode", eqCode));
         criteria.add(Restrictions.eq("active",1));
 
-        List<PgEquipment> pgEquipmentList = criteria.list();
+        List<PgEquipment> pgEquipmentList = (List<PgEquipment>)criteria.list();
 
         if(pgEquipmentList!=null&&pgEquipmentList.size()!=0)
             return pgEquipmentList.get(0);
@@ -49,10 +49,10 @@
 
     //统计工器具耗材数量
     public List<PgDeviceTypeStatisticDto> getDeviceStatisticByDevType(String eqType){
-        String eqType1=eqType.equals("0")?"工器具":"耗材";
+        //String eqType1=eqType.equals("0")?"工器具":"耗材";
 
         String hql="select equipment.EQ_NAME,count(*) from PG_EQUIPMENT equipment where equipment.EQ_TYPE = '"
-        +eqType1+"' group by equipment.EQ_NAME";
+        +eqType+"' group by equipment.EQ_NAME";
 
         List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list();
 
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 8d8db5d..4cfa880 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
@@ -3,6 +3,7 @@
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
 import com.casic.PgInterface.devTable.domain.PgPipeLine;
 import com.casic.PgInterface.devTable.dto.PgPipeLineDto;
+import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
@@ -39,13 +40,35 @@
         return pgPipeLineDtoList;
     }
 
-   public String getPipeLengthByName(String lineType) {
-       String sql = "select SUM(PIPE_LENGTH) from PG_PIPELINE where LINE_TYPE = '" + lineType + "'";
+    public List<PgPipeLineLengthStatic> getPipeLengthByName() {
+        String sql = "select LINE_TYPE,SUM(PIPE_LENGTH) from PG_PIPELINE group by LINE_TYPE ";
 
-       String sumLength = String.valueOf(this.getSession().createSQLQuery(sql).uniqueResult());
+        List<Object[]> objectList = this.getSession().createSQLQuery(sql).list();
+        List<PgPipeLineLengthStatic> pgPipeLineLengthStaticList = new ArrayList<PgPipeLineLengthStatic>();
 
-       return sumLength;
-   }
+        for(Object[] objectArray : objectList)
+        {
+            PgPipeLineLengthStatic pgPipeLineLengthStatic=new PgPipeLineLengthStatic();
+            pgPipeLineLengthStatic.setLineType(String.valueOf(objectArray[0]));
+            pgPipeLineLengthStatic.setLength(String.valueOf(objectArray[1]));
+            pgPipeLineLengthStaticList.add(pgPipeLineLengthStatic);
+        }
+        return pgPipeLineLengthStaticList;
+    }
+
+    public  List<String> getPipeType() {
+        String sql = "select distinct LINE_TYPE from PG_PIPELINE";
+
+        List<Object> objectList = this.getSession().createSQLQuery(sql).list();
+
+        List<String> stringList=new ArrayList<String>();
+
+        for(Object ob : objectList)
+        {
+            stringList.add(String.valueOf(ob));
+        }
+        return stringList;
+    }
 
 }
 
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java
index 41f0e64..375c078 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java
@@ -4,6 +4,7 @@
 import com.casic.PgInterface.devTable.domain.PgPartition;
 import com.casic.PgInterface.devTable.domain.PipeGallery;
 import com.casic.PgInterface.devTable.dto.PipeGalleryDto;
+import com.casic.PgInterface.devTable.dto.PipeGalleryStatic;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
@@ -58,13 +59,21 @@
         return pipeGalleryDtoList;
     }
 
-    public String getPgLengthByName(String pgName) {
+    public List<PipeGalleryStatic> getPgLengthByName() {
 
-        String sql = "select SUM(PAR_LENGTH) from PG_PIPE_GALLERY where PG_NAME = '" + pgName + "'";
+        String sql = "select PG_NAME,SUM(PAR_LENGTH) from PG_PIPE_GALLERY group by PG_NAME ";
 
-        String sumLength = String.valueOf(this.getSession().createSQLQuery(sql).uniqueResult());
+        List<Object[]> objectList = this.getSession().createSQLQuery(sql).list();
+        List<PipeGalleryStatic> pipeGalleryStaticList = new ArrayList<PipeGalleryStatic>();
 
-        return sumLength;
+        for(Object[] objectArray : objectList)
+        {
+            PipeGalleryStatic pipeGalleryStatic=new PipeGalleryStatic();
+            pipeGalleryStatic.setPgName(String.valueOf(objectArray[0]));
+            pipeGalleryStatic.setLength(String.valueOf(objectArray[1]));
+            pipeGalleryStaticList.add(pipeGalleryStatic);
+        }
+        return pipeGalleryStaticList;
     }
 
 

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 73b1050..7a80a23 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,34 +2,17 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="">
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\~$数据库设计说明新需求.docx" afterPath="" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/~$数据库设计说明新需求.docx" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineLengthStatic.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/接口说明新需求.docx" afterPath="$PROJECT_DIR$/接口说明新需求.docx" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainTypeManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainTypeManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources/application.properties" afterPath="$PROJECT_DIR$/src/main/resources/application.properties" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
     </list>
     <ignored path="PgInterface.iws" />
@@ -54,7 +37,67 @@
     <favorites_list name="PgInterface" />
   </component>
   <component name="FileEditorManager">
-    <leaf />
+    <leaf>
+      <file leaf-file-name="PgPipeLineRs.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.0" vertical-offset="2301" max-vertical-offset="3388">
+              <caret line="277" column="9" selection-start-line="277" selection-start-column="9" selection-end-line="277" selection-end-column="9" />
+              <folding>
+                <element signature="method#addLog#0;class#PgPipeLineRs#0" expanded="false" />
+                <element signature="method#editPipeLine#0;class#PgPipeLineRs#0" expanded="false" />
+                <element signature="method#deletePipeLine#0;class#PgPipeLineRs#0" expanded="false" />
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" expanded="false" />
+                <element signature="e#9602#9626#0" expanded="true" />
+                <element signature="e#10329#10337#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="PgPipeLineManager.java" pinned="false" current="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 vertical-scroll-proportion="0.0" vertical-offset="330" max-vertical-offset="1342">
+              <caret line="55" column="42" selection-start-line="55" selection-start-column="42" selection-end-line="55" selection-end-column="42" />
+              <folding>
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" expanded="false" />
+                <element signature="e#1787#1811#0" expanded="true" />
+                <element signature="e#2482#2490#0" expanded="true" />
+                <marker date="1537414540748" expanded="true" signature="1552:1622" placeholder="select LINE_..PG_PIPELINE..." />
+                <marker date="1537414540748" expanded="true" signature="1552:1621" placeholder="select LINE_..PG_PIPELINE..." />
+                <marker date="1537414540748" expanded="true" signature="2310:2352" placeholder="select disti..PG_PIPELINE..." />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="PipeGalleryRs.java" pinned="false" current="true" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.7140151" vertical-offset="4067" max-vertical-offset="4752">
+              <caret line="221" column="27" selection-start-line="221" selection-start-column="27" selection-end-line="221" selection-end-column="27" />
+              <folding>
+                <element signature="e#6945#6964#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="PipeGalleryManager.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.0" vertical-offset="849" max-vertical-offset="1650">
+              <caret line="61" column="56" selection-start-line="61" selection-start-column="56" selection-end-line="61" selection-end-column="56" />
+              <folding>
+                <element signature="e#2433#2452#0" expanded="true" />
+                <marker date="1537414756878" expanded="true" signature="2209:2277" placeholder="select PG_NA..PG_PIPE_GALLERY..." />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+    </leaf>
   </component>
   <component name="FindManager">
     <FindUsagesManager>
@@ -72,9 +115,6 @@
   <component name="IdeDocumentHistory">
     <option name="changedFiles">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
         <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/manager/PgInPgPersonManager.java" />
@@ -86,23 +126,16 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintainType.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/manager/PgPipeLineManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/EquipmentManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgEquipment.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.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/rs/PgPartitionRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.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/PgDeviceTypeRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
         <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.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/PgMaintainTypeRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainTypeManager.java" />
@@ -123,6 +156,16 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.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/dto/PgPipeLineLengthStatic.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/dto/PipeGalleryDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.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" />
       </list>
     </option>
   </component>
@@ -216,7 +259,20 @@
       <sortByType />
     </navigator>
     <panes>
-      <pane id="Scope" />
+      <pane id="PackagesPane">
+        <subPane>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
+            </PATH_ELEMENT>
+          </PATH>
+        </subPane>
+      </pane>
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -331,22 +387,73 @@
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
-        </subPane>
-      </pane>
-      <pane id="PackagesPane">
-        <subPane>
           <PATH>
             <PATH_ELEMENT>
               <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
               <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="devTable" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="devTable" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="dto" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
         </subPane>
       </pane>
+      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -916,7 +1023,12 @@
       <workItem from="1535958569443" duration="219000" />
       <workItem from="1536111554952" duration="23051000" />
       <workItem from="1536143316539" duration="3706000" />
-      <workItem from="1536195067076" duration="23441000" />
+      <workItem from="1536195067076" duration="23586000" />
+      <workItem from="1536802841385" duration="18000" />
+      <workItem from="1537167144071" duration="1232000" />
+      <workItem from="1537236948589" duration="156000" />
+      <workItem from="1537237991303" duration="1733000" />
+      <workItem from="1537407751831" duration="6397000" />
     </task>
     <task id="LOCAL-00001" summary="first commit">
       <created>1510219102698</created>
@@ -1126,11 +1238,15 @@
       <created>1535958368940</created>
       <updated>1535958368940</updated>
     </task>
-    <option name="localTasksCounter" value="53" />
+    <task id="LOCAL-00053" summary="根据华锐王工反馈测试，修改接口">
+      <created>1536224373164</created>
+      <updated>1536224373165</updated>
+    </task>
+    <option name="localTasksCounter" value="54" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="937579000" />
+    <option name="totallyTimeSpent" value="947260000" />
   </component>
   <component name="TodoView" selected-index="1">
     <todo-panel id="selected-file">
@@ -1165,7 +1281,7 @@
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.391453" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.66382253" sideWeight="0.81316185" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.7235495" sideWeight="0.81316185" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="true" content_ui="tabs" />
       <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.6757679" sideWeight="0.18683812" order="7" side_tool="true" content_ui="tabs" />
@@ -1177,8 +1293,8 @@
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24962178" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32980332" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32649574" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2526475" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32593855" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.28441754" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" />
@@ -1192,18 +1308,18 @@
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
     </layout>
     <layout-to-restore>
-      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.63418806" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
-      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
+      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.391453" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
       <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" />
-      <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.50341296" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
+      <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2962963" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
+      <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.52136755" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32649574" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.29425114" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
@@ -1223,8 +1339,8 @@
       <window_info id="Android" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="15" side_tool="false" content_ui="tabs" />
       <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="true" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32980332" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
     </layout-to-restore>
   </component>
@@ -1243,7 +1359,6 @@
     <option name="myTodoPanelSettings">
       <TodoPanelSettings />
     </option>
-    <MESSAGE value="修改人员入廊记录表和功能" />
     <MESSAGE value="Merge remote-tracking branch 'origin/develop' into develop&#10;&#10;Conflicts:&#10;&#9;.idea/workspace.xml&#10;&#9;~$数据库设计说明新需求.docx&#10;&#9;管廊数据库设计说明新需求.docx&#10;" />
     <MESSAGE value="增加统计功能" />
     <MESSAGE value="修改标注" />
@@ -1268,7 +1383,8 @@
     <MESSAGE value="新增维护类别" />
     <MESSAGE value="修改施工数据新增删除编辑" />
     <MESSAGE value="新增工器具耗材" />
-    <option name="LAST_COMMIT_MESSAGE" value="新增工器具耗材" />
+    <MESSAGE value="根据华锐王工反馈测试，修改接口" />
+    <option name="LAST_COMMIT_MESSAGE" value="根据华锐王工反馈测试，修改接口" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1291,14 +1407,8 @@
           <properties />
           <option name="timeStamp" value="359" />
         </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java</url>
-          <line>190</line>
-          <properties />
-          <option name="timeStamp" value="360" />
-        </line-breakpoint>
       </breakpoints>
-      <option name="time" value="390" />
+      <option name="time" value="399" />
     </breakpoint-manager>
   </component>
   <component name="antWorkspaceConfiguration">
@@ -1306,163 +1416,10 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="3119" max-vertical-offset="7128">
-          <caret line="30" column="52" selection-start-line="30" selection-start-column="52" selection-end-line="30" selection-end-column="52" />
-          <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 vertical-scroll-proportion="0.0" vertical-offset="5071" max-vertical-offset="5918">
-          <caret line="268" column="24" selection-start-line="268" selection-start-column="24" selection-end-line="268" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="13" max-vertical-offset="3058">
-          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.5529623" vertical-offset="528" max-vertical-offset="3014">
-          <caret line="26" column="0" selection-start-line="26" selection-start-column="0" selection-end-line="26" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainTypeDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.33213645" vertical-offset="101" max-vertical-offset="1012">
-          <caret line="15" column="11" selection-start-line="15" selection-start-column="11" selection-end-line="15" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="609" max-vertical-offset="1958">
-          <caret line="39" column="50" selection-start-line="39" selection-start-column="50" selection-end-line="39" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.7271095" vertical-offset="167" max-vertical-offset="1342">
-          <caret line="35" column="0" selection-start-line="35" selection-start-column="0" selection-end-line="35" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.63195693" vertical-offset="0" max-vertical-offset="1452">
-          <caret line="19" column="0" selection-start-line="19" selection-start-column="0" selection-end-line="19" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintainDoc.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.69669116" vertical-offset="61" max-vertical-offset="1320">
-          <caret line="24" column="0" selection-start-line="24" selection-start-column="0" selection-end-line="24" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDocDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.27648115" vertical-offset="0" max-vertical-offset="1342">
-          <caret line="9" column="13" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-7.551724" vertical-offset="3125" max-vertical-offset="4048">
-          <caret line="249" column="85" selection-start-line="249" selection-start-column="85" selection-end-line="249" selection-end-column="85" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-9.862069" vertical-offset="3674" max-vertical-offset="5610">
-          <caret line="203" column="58" selection-start-line="203" selection-start-column="58" selection-end-line="203" selection-end-column="58" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.31597847" vertical-offset="0" max-vertical-offset="557">
-          <caret line="8" column="35" selection-start-line="8" selection-start-column="35" selection-end-line="8" selection-end-column="35" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.66360295" vertical-offset="783" max-vertical-offset="3234">
-          <caret line="68" column="71" selection-start-line="68" selection-start-column="71" selection-end-line="68" selection-end-column="71" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="33" max-vertical-offset="968">
-          <caret line="33" column="62" selection-start-line="33" selection-start-column="62" selection-end-line="33" selection-end-column="62" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://C:/Program Files/Java/jdk1.8.0_131/src.zip!/java/lang/NumberFormatException.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.6285178" vertical-offset="479" max-vertical-offset="1012">
-          <caret line="64" column="0" selection-start-line="64" selection-start-column="0" selection-end-line="64" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-tx/4.0.6.RELEASE/spring-tx-4.0.6.RELEASE-sources.jar!/org/springframework/transaction/interceptor/TransactionAspectSupport.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.23639774" vertical-offset="4736" max-vertical-offset="13244">
-          <caret line="263" column="0" selection-start-line="263" selection-start-column="0" selection-end-line="263" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.2504817" vertical-offset="618" max-vertical-offset="1320">
-          <caret line="35" column="28" selection-start-line="35" selection-start-column="28" selection-end-line="35" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://C:/Program Files/Java/jdk1.8.0_131/src.zip!/java/util/ArrayList.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.73967683" vertical-offset="13360" max-vertical-offset="30690">
-          <caret line="663" column="7" selection-start-line="663" selection-start-column="7" selection-end-line="663" selection-end-column="7" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/StringUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.15798923" vertical-offset="330" max-vertical-offset="2178">
-          <caret line="31" column="29" selection-start-line="31" selection-start-column="29" selection-end-line="31" selection-end-column="29" />
-          <folding />
-        </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 vertical-scroll-proportion="0.11143695" vertical-offset="1854" max-vertical-offset="5170">
-          <caret line="103" column="65" selection-start-line="103" selection-start-column="65" selection-end-line="103" selection-end-column="65" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="jar://C:/Program Files/Java/jdk1.8.0_131/src.zip!/java/util/concurrent/ThreadPoolExecutor.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="1.659824" vertical-offset="23436" max-vertical-offset="44594">
           <caret line="1148" column="31" selection-start-line="1148" selection-start-column="31" selection-end-line="1148" selection-end-column="31" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1470,17 +1427,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.2404692" vertical-offset="9532" max-vertical-offset="12958">
           <caret line="497" column="0" selection-start-line="497" selection-start-column="0" selection-end-line="497" selection-end-column="0" />
-          <folding />
-        </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 vertical-scroll-proportion="0.0" vertical-offset="4977" max-vertical-offset="8316">
-          <caret line="263" column="24" selection-start-line="263" selection-start-column="24" selection-end-line="263" selection-end-column="24" />
-          <folding>
-            <element signature="e#10383#10401#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1488,7 +1434,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-2.1782365" vertical-offset="1359" max-vertical-offset="1892">
           <caret line="24" column="13" selection-start-line="24" selection-start-column="13" selection-end-line="24" selection-end-column="13" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1496,7 +1441,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-1.4093357" vertical-offset="1907" max-vertical-offset="2464">
           <caret line="65" column="60" selection-start-line="65" selection-start-column="11" selection-end-line="65" selection-end-column="60" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1504,10 +1448,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-0.011029412" vertical-offset="2228" max-vertical-offset="2838">
           <caret line="111" column="47" selection-start-line="111" selection-start-column="47" selection-end-line="111" selection-end-column="47" />
-          <folding>
-            <marker date="1535944027199" expanded="true" signature="-1:-1" placeholder="select devic..PG_DEVICE..." />
-            <marker date="1535944027199" expanded="true" signature="-1:-1" placeholder="select * fro..PG_DEVICE..." />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1515,7 +1455,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.76301616" vertical-offset="1687" max-vertical-offset="2376">
           <caret line="143" column="16" selection-start-line="143" selection-start-column="16" selection-end-line="143" selection-end-column="16" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1523,7 +1462,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.88509876" vertical-offset="519" max-vertical-offset="1342">
           <caret line="68" column="0" selection-start-line="68" selection-start-column="0" selection-end-line="68" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1531,7 +1469,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.43267503" vertical-offset="23" max-vertical-offset="1672">
           <caret line="15" column="33" selection-start-line="15" selection-start-column="33" selection-end-line="15" selection-end-column="33" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1540,42 +1477,8 @@
         <state vertical-scroll-proportion="0.5257353" vertical-offset="0" max-vertical-offset="4972">
           <caret line="30" column="0" selection-start-line="30" selection-start-column="0" selection-end-line="30" selection-end-column="0" />
           <folding>
-            <element signature="e#3701#3720#0" expanded="true" />
-            <element signature="e#4190#4208#0" expanded="true" />
-            <marker date="1536211271563" expanded="true" signature="-1:-1" placeholder="select count..PG_CONSTRUCTION..." />
-            <marker date="1536211271563" expanded="true" signature="-1:-1" placeholder="select count..Pg_Construction..." />
-            <marker date="1536211271563" expanded="true" signature="-1:-1" placeholder="SELECT t.ID,..PG_CONSTRUCTION..." />
-            <marker date="1536211271563" expanded="true" signature="-1:-1" placeholder="SELECT m.PAR..PG_PARTITION..." />
-            <marker date="1536211271563" expanded="true" signature="-1:-1" placeholder="SELECT n.TYP..PG_CONSTRUCTION_TYPE..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.40754038" vertical-offset="675" max-vertical-offset="1540">
-          <caret line="108" column="52" selection-start-line="108" selection-start-column="52" selection-end-line="108" selection-end-column="52" />
-          <folding>
-            <element signature="method#saveFiles#0;class#PgCsDocumentManager#0" expanded="false" />
-            <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" expanded="false" />
-            <element signature="e#3728#3745#0" expanded="true" />
-            <marker date="1536205913620" expanded="true" signature="-1:-1" placeholder="select * fro..PG_CSDOCUMENT..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.41666666" vertical-offset="2772" max-vertical-offset="3674">
-          <caret line="192" column="13" selection-start-line="192" selection-start-column="13" selection-end-line="192" selection-end-column="13" />
-          <folding>
-            <element signature="method#setPgCsDocumentManager#0;class#PgCsDocumentRs#0" expanded="false" />
-            <element signature="method#setPgConstructionManager#0;class#PgCsDocumentRs#0" expanded="false" />
-            <element signature="e#2023#2039#0" expanded="true" />
-            <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" expanded="false" />
-            <element signature="e#6060#6076#0" expanded="true" />
-            <element signature="e#6145#6162#0" expanded="true" />
-            <element signature="method#downloadFile#0;class#PgCsDocumentRs#0" expanded="false" />
+            <element signature="e#3701#3720#0" expanded="false" />
+            <element signature="e#4190#4208#0" expanded="false" />
           </folding>
         </state>
       </provider>
@@ -1584,24 +1487,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.9640933" vertical-offset="1091" max-vertical-offset="2112">
           <caret line="83" column="62" selection-start-line="83" selection-start-column="62" selection-end-line="83" selection-end-column="62" />
-          <folding>
-            <element signature="e#2170#2184#0" expanded="true" />
-            <marker date="1536213480710" expanded="true" signature="-1:-1" placeholder="select count..PG_ALARM..." />
-            <marker date="1536213480710" expanded="true" signature="-1:-1" placeholder="select count..PG_ALARM..." />
-            <marker date="1536213480710" expanded="true" signature="-1:-1" placeholder="select count..PG_ALARM..." />
-            <marker date="1536213480710" expanded="true" signature="-1:-1" placeholder="select count..PG_ALARM..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.41666666" vertical-offset="990" max-vertical-offset="1672">
-          <caret line="72" column="55" selection-start-line="72" selection-start-column="55" selection-end-line="72" selection-end-column="55" />
-          <folding>
-            <element signature="e#2152#2168#0" expanded="false" />
-            <element signature="e#2257#2271#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1609,10 +1494,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.75" vertical-offset="440" max-vertical-offset="3938">
           <caret line="62" column="13" selection-start-line="62" selection-start-column="13" selection-end-line="62" selection-end-column="13" />
-          <folding>
-            <element signature="e#1393#1394#0" expanded="false" />
-            <element signature="e#1451#1452#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1620,7 +1501,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.35547575" vertical-offset="0" max-vertical-offset="1012">
           <caret line="18" column="0" selection-start-line="18" selection-start-column="0" selection-end-line="18" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1628,9 +1508,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.45421904" vertical-offset="2145" max-vertical-offset="3608">
           <caret line="125" column="29" selection-start-line="125" selection-start-column="29" selection-end-line="125" selection-end-column="29" />
-          <folding>
-            <element signature="e#3094#3110#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1638,7 +1515,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.513465" vertical-offset="0" max-vertical-offset="1276">
           <caret line="22" column="51" selection-start-line="22" selection-start-column="51" selection-end-line="22" selection-end-column="51" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1646,7 +1522,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.5924596" vertical-offset="0" max-vertical-offset="1254">
           <caret line="20" column="28" selection-start-line="20" selection-start-column="28" selection-end-line="20" selection-end-column="28" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1654,18 +1529,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-3.3052065" vertical-offset="4063" max-vertical-offset="4620">
           <caret line="115" column="15" selection-start-line="115" selection-start-column="15" selection-end-line="115" selection-end-column="15" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.20833333" vertical-offset="1892" max-vertical-offset="3850">
-          <caret line="152" column="24" selection-start-line="152" selection-start-column="24" selection-end-line="152" selection-end-column="24" />
-          <folding>
-            <element signature="method#addReservePlan#0;class#PgReservePlanRs#0" expanded="false" />
-            <element signature="e#3206#3222#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1673,7 +1536,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.06147541" vertical-offset="183" max-vertical-offset="506">
           <caret line="10" column="0" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1681,7 +1543,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="3388">
           <caret line="39" column="56" selection-start-line="39" selection-start-column="56" selection-end-line="39" selection-end-column="56" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1689,22 +1550,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.33213645" vertical-offset="959" max-vertical-offset="2508">
           <caret line="71" column="36" selection-start-line="71" selection-start-column="36" selection-end-line="71" selection-end-column="36" />
-          <folding>
-            <marker date="1536217243963" expanded="true" signature="-1:-1" placeholder="select count..PG_RESERVE_PLAN..." />
-          </folding>
-        </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 vertical-scroll-proportion="0.46401516" vertical-offset="1273" max-vertical-offset="1980">
-          <caret line="106" column="70" selection-start-line="106" selection-start-column="70" selection-end-line="106" selection-end-column="70" />
-          <folding>
-            <element signature="imports" expanded="false" />
-            <element signature="method#linkDevice#0;class#PgAlarmLinkRs#0" expanded="false" />
-            <element signature="e#1459#1475#0" expanded="false" />
-            <element signature="method#linkPartitionDevice#0;class#PgAlarmLinkRs#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1712,7 +1557,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.35906643" vertical-offset="1164" max-vertical-offset="3388">
           <caret line="80" column="23" selection-start-line="80" selection-start-column="23" selection-end-line="80" selection-end-column="23" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1720,7 +1564,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.625" vertical-offset="1364" max-vertical-offset="4158">
           <caret line="99" column="37" selection-start-line="99" selection-start-column="37" selection-end-line="99" selection-end-column="37" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1728,7 +1571,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="1553" max-vertical-offset="2134">
           <caret line="98" column="16" selection-start-line="98" selection-start-column="16" selection-end-line="98" selection-end-column="16" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1736,9 +1578,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="837" max-vertical-offset="1276">
           <caret line="59" column="0" selection-start-line="59" selection-start-column="0" selection-end-line="59" selection-end-column="0" />
-          <folding>
-            <element signature="e#1980#1990#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1746,10 +1585,259 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.24955116" vertical-offset="631" max-vertical-offset="1232">
           <caret line="58" column="34" selection-start-line="58" selection-start-column="34" selection-end-line="58" selection-end-column="34" />
+        </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 vertical-scroll-proportion="0.0" vertical-offset="6759" max-vertical-offset="8316">
+          <caret line="268" column="42" selection-start-line="268" selection-start-column="42" selection-end-line="268" selection-end-column="42" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.8779174" vertical-offset="347" max-vertical-offset="2662">
+          <caret line="54" column="9" selection-start-line="54" selection-start-column="9" selection-end-line="54" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="1.9353681" vertical-offset="0" max-vertical-offset="4906">
+          <caret line="70" column="71" selection-start-line="70" selection-start-column="66" selection-end-line="70" selection-end-column="75" />
+        </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 vertical-scroll-proportion="0.32854578" vertical-offset="1115" max-vertical-offset="1672">
+          <caret line="76" column="33" selection-start-line="76" selection-start-column="33" selection-end-line="76" selection-end-column="33" />
+        </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 vertical-scroll-proportion="3.1723518" vertical-offset="81" max-vertical-offset="2354">
+          <caret line="104" column="12" selection-start-line="104" selection-start-column="12" selection-end-line="104" selection-end-column="12" />
           <folding />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.5260323" vertical-offset="4239" max-vertical-offset="4796">
+          <caret line="224" column="0" selection-start-line="224" selection-start-column="0" selection-end-line="224" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.6445242" vertical-offset="1709" max-vertical-offset="2332">
+          <caret line="111" column="53" selection-start-line="111" selection-start-column="53" selection-end-line="111" selection-end-column="53" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-3.5421903" vertical-offset="5515" max-vertical-offset="6072">
+          <caret line="184" column="25" selection-start-line="184" selection-start-column="25" selection-end-line="184" selection-end-column="25" />
+        </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 vertical-scroll-proportion="-0.78994614" vertical-offset="924" max-vertical-offset="7128">
+          <caret line="41" column="5" selection-start-line="41" selection-start-column="5" selection-end-line="41" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.4344704" vertical-offset="748" max-vertical-offset="1474">
+          <caret line="72" column="0" selection-start-line="72" selection-start-column="0" selection-end-line="72" selection-end-column="0" />
+        </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 vertical-scroll-proportion="0.0" vertical-offset="264" max-vertical-offset="1782">
+          <caret line="37" column="57" selection-start-line="37" selection-start-column="57" selection-end-line="37" selection-end-column="57" />
+          <folding>
+            <marker date="1531722832731" expanded="true" signature="-1:-1" placeholder="select id,CH..PG_CH4..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2420">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://C:/Program Files/Java/jdk1.8.0_131/src.zip!/java/sql/Timestamp.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33027524" vertical-offset="4606" max-vertical-offset="12980">
+          <caret line="236" column="0" selection-start-line="236" selection-start-column="0" selection-end-line="236" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="2.2118492" vertical-offset="0" max-vertical-offset="1496">
+          <caret line="87" column="52" selection-start-line="87" selection-start-column="52" selection-end-line="87" selection-end-column="52" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.4901257" vertical-offset="79" max-vertical-offset="1298">
+          <caret line="25" column="25" selection-start-line="25" selection-start-column="25" selection-end-line="25" selection-end-column="25" />
+          <folding>
+            <marker date="1537412037475" expanded="true" signature="-1:-1" placeholder="select equip..PG_EQUIPMENT..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.8330341" vertical-offset="680" max-vertical-offset="4466">
+          <caret line="68" column="29" selection-start-line="68" selection-start-column="29" selection-end-line="68" selection-end-column="29" />
+          <folding>
+            <element signature="e#1490#1506#0" expanded="true" />
+            <element signature="e#6332#6348#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgEquipment.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.3680431" vertical-offset="191" max-vertical-offset="1540">
+          <caret line="20" column="17" selection-start-line="20" selection-start-column="17" selection-end-line="20" selection-end-column="17" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/4.3.6.Final/hibernate-core-4.3.6.Final-sources.jar!/org/hibernate/internal/AbstractQueryImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33333334" vertical-offset="18814" max-vertical-offset="20328">
+          <caret line="974" column="0" selection-start-line="974" selection-start-column="0" selection-end-line="974" selection-end-column="0" />
+          <folding />
+        </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 vertical-scroll-proportion="0.5924596" vertical-offset="0" max-vertical-offset="1980">
+          <caret line="18" column="32" selection-start-line="18" selection-start-column="32" selection-end-line="18" selection-end-column="32" />
+          <folding />
+        </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 vertical-scroll-proportion="0.7109515" vertical-offset="0" max-vertical-offset="704">
+          <caret line="18" column="31" selection-start-line="18" selection-start-column="31" selection-end-line="18" selection-end-column="31" />
+          <folding>
+            <element signature="e#213#214#0" expanded="true" />
+            <element signature="e#244#245#0" expanded="true" />
+            <element signature="e#292#293#0" expanded="true" />
+            <element signature="e#332#333#0" expanded="true" />
+            <element signature="e#394#395#0" expanded="true" />
+            <element signature="e#438#439#0" expanded="true" />
+            <element signature="e#474#475#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://C:/Program Files/Java/jdk1.8.0_131/src.zip!/java/lang/String.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.21139705" vertical-offset="1469" max-vertical-offset="67452">
+          <caret line="107" column="16" selection-start-line="107" selection-start-column="12" selection-end-line="107" selection-end-column="16" />
+          <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 vertical-scroll-proportion="0.0" vertical-offset="2301" max-vertical-offset="3388">
+          <caret line="277" column="9" selection-start-line="277" selection-start-column="9" selection-end-line="277" selection-end-column="9" />
+          <folding>
+            <element signature="method#addLog#0;class#PgPipeLineRs#0" expanded="false" />
+            <element signature="method#editPipeLine#0;class#PgPipeLineRs#0" expanded="false" />
+            <element signature="method#deletePipeLine#0;class#PgPipeLineRs#0" expanded="false" />
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" expanded="false" />
+            <element signature="e#9602#9626#0" expanded="true" />
+            <element signature="e#10329#10337#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.43727598" vertical-offset="120" max-vertical-offset="1122">
+          <caret line="13" column="34" selection-start-line="13" selection-start-column="34" selection-end-line="13" selection-end-column="34" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.8547855" vertical-offset="137" max-vertical-offset="704">
+          <caret line="18" column="31" selection-start-line="18" selection-start-column="31" selection-end-line="18" selection-end-column="31" />
+          <folding>
+            <element signature="e#204#205#0" expanded="true" />
+            <element signature="e#233#234#0" expanded="true" />
+            <element signature="e#277#278#0" expanded="true" />
+            <element signature="e#313#314#0" expanded="true" />
+            <element signature="e#375#376#0" expanded="true" />
+            <element signature="e#419#420#0" expanded="true" />
+            <element signature="e#455#456#0" expanded="true" />
+          </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 vertical-scroll-proportion="0.0" vertical-offset="330" max-vertical-offset="1342">
+          <caret line="55" column="42" selection-start-line="55" selection-start-column="42" selection-end-line="55" selection-end-column="42" />
+          <folding>
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" expanded="false" />
+            <element signature="e#1787#1811#0" expanded="true" />
+            <element signature="e#2482#2490#0" expanded="true" />
+            <marker date="1537414540748" expanded="true" signature="1552:1622" placeholder="select LINE_..PG_PIPELINE..." />
+            <marker date="1537414540748" expanded="true" signature="1552:1621" placeholder="select LINE_..PG_PIPELINE..." />
+            <marker date="1537414540748" expanded="true" signature="2310:2352" placeholder="select disti..PG_PIPELINE..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="849" max-vertical-offset="1650">
+          <caret line="61" column="56" selection-start-line="61" selection-start-column="56" selection-end-line="61" selection-end-column="56" />
+          <folding>
+            <element signature="e#2433#2452#0" expanded="true" />
+            <marker date="1537414756878" expanded="true" signature="2209:2277" placeholder="select PG_NA..PG_PIPE_GALLERY..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.7140151" vertical-offset="4067" max-vertical-offset="4752">
+          <caret line="221" column="27" selection-start-line="221" selection-start-column="27" selection-end-line="221" selection-end-column="27" />
+          <folding>
+            <element signature="e#6945#6964#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java
index 238bc39..6256b9d 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java
@@ -78,7 +78,7 @@
     public PgEquipmentDto(PgEquipment equipment) {
         if (equipment == null) return;
 
-        SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 
         this.setId(equipment.getId());
         this.setEqName(equipment.getEqName());
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineLengthStatic.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineLengthStatic.java
new file mode 100644
index 0000000..a25538f
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineLengthStatic.java
@@ -0,0 +1,26 @@
+package com.casic.PgInterface.devTable.dto;
+
+/**
+ * Created by yxw on 2018/9/20.
+ */
+public class PgPipeLineLengthStatic {
+
+    private String lineType;
+    private String length;
+
+    public String getLineType() {
+        return lineType;
+    }
+
+    public void setLineType(String lineType) {
+        this.lineType = lineType;
+    }
+
+    public String getLength() {
+        return length;
+    }
+
+    public void setLength(String length) {
+        this.length = length;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.java b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.java
new file mode 100644
index 0000000..bd65ff4
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.java
@@ -0,0 +1,26 @@
+package com.casic.PgInterface.devTable.dto;
+
+/**
+ * Created by yxw on 2018/9/20.
+ */
+public class PipeGalleryStatic {
+
+    private String pgName;
+    private String length;
+
+    public String getPgName() {
+        return pgName;
+    }
+
+    public void setPgName(String pgName) {
+        this.pgName = pgName;
+    }
+
+    public String getLength() {
+        return length;
+    }
+
+    public void setLength(String length) {
+        this.length = length;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
index e46742c..ab0908b 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
@@ -23,7 +23,7 @@
         criteria.add(Restrictions.eq("eqCode", eqCode));
         criteria.add(Restrictions.eq("active",1));
 
-        List<PgEquipment> pgEquipmentList = criteria.list();
+        List<PgEquipment> pgEquipmentList = (List<PgEquipment>)criteria.list();
 
         if(pgEquipmentList!=null&&pgEquipmentList.size()!=0)
             return pgEquipmentList.get(0);
@@ -49,10 +49,10 @@
 
     //统计工器具耗材数量
     public List<PgDeviceTypeStatisticDto> getDeviceStatisticByDevType(String eqType){
-        String eqType1=eqType.equals("0")?"工器具":"耗材";
+        //String eqType1=eqType.equals("0")?"工器具":"耗材";
 
         String hql="select equipment.EQ_NAME,count(*) from PG_EQUIPMENT equipment where equipment.EQ_TYPE = '"
-        +eqType1+"' group by equipment.EQ_NAME";
+        +eqType+"' group by equipment.EQ_NAME";
 
         List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list();
 
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 8d8db5d..4cfa880 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
@@ -3,6 +3,7 @@
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
 import com.casic.PgInterface.devTable.domain.PgPipeLine;
 import com.casic.PgInterface.devTable.dto.PgPipeLineDto;
+import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
@@ -39,13 +40,35 @@
         return pgPipeLineDtoList;
     }
 
-   public String getPipeLengthByName(String lineType) {
-       String sql = "select SUM(PIPE_LENGTH) from PG_PIPELINE where LINE_TYPE = '" + lineType + "'";
+    public List<PgPipeLineLengthStatic> getPipeLengthByName() {
+        String sql = "select LINE_TYPE,SUM(PIPE_LENGTH) from PG_PIPELINE group by LINE_TYPE ";
 
-       String sumLength = String.valueOf(this.getSession().createSQLQuery(sql).uniqueResult());
+        List<Object[]> objectList = this.getSession().createSQLQuery(sql).list();
+        List<PgPipeLineLengthStatic> pgPipeLineLengthStaticList = new ArrayList<PgPipeLineLengthStatic>();
 
-       return sumLength;
-   }
+        for(Object[] objectArray : objectList)
+        {
+            PgPipeLineLengthStatic pgPipeLineLengthStatic=new PgPipeLineLengthStatic();
+            pgPipeLineLengthStatic.setLineType(String.valueOf(objectArray[0]));
+            pgPipeLineLengthStatic.setLength(String.valueOf(objectArray[1]));
+            pgPipeLineLengthStaticList.add(pgPipeLineLengthStatic);
+        }
+        return pgPipeLineLengthStaticList;
+    }
+
+    public  List<String> getPipeType() {
+        String sql = "select distinct LINE_TYPE from PG_PIPELINE";
+
+        List<Object> objectList = this.getSession().createSQLQuery(sql).list();
+
+        List<String> stringList=new ArrayList<String>();
+
+        for(Object ob : objectList)
+        {
+            stringList.add(String.valueOf(ob));
+        }
+        return stringList;
+    }
 
 }
 
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java
index 41f0e64..375c078 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java
@@ -4,6 +4,7 @@
 import com.casic.PgInterface.devTable.domain.PgPartition;
 import com.casic.PgInterface.devTable.domain.PipeGallery;
 import com.casic.PgInterface.devTable.dto.PipeGalleryDto;
+import com.casic.PgInterface.devTable.dto.PipeGalleryStatic;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
@@ -58,13 +59,21 @@
         return pipeGalleryDtoList;
     }
 
-    public String getPgLengthByName(String pgName) {
+    public List<PipeGalleryStatic> getPgLengthByName() {
 
-        String sql = "select SUM(PAR_LENGTH) from PG_PIPE_GALLERY where PG_NAME = '" + pgName + "'";
+        String sql = "select PG_NAME,SUM(PAR_LENGTH) from PG_PIPE_GALLERY group by PG_NAME ";
 
-        String sumLength = String.valueOf(this.getSession().createSQLQuery(sql).uniqueResult());
+        List<Object[]> objectList = this.getSession().createSQLQuery(sql).list();
+        List<PipeGalleryStatic> pipeGalleryStaticList = new ArrayList<PipeGalleryStatic>();
 
-        return sumLength;
+        for(Object[] objectArray : objectList)
+        {
+            PipeGalleryStatic pipeGalleryStatic=new PipeGalleryStatic();
+            pipeGalleryStatic.setPgName(String.valueOf(objectArray[0]));
+            pipeGalleryStatic.setLength(String.valueOf(objectArray[1]));
+            pipeGalleryStaticList.add(pipeGalleryStatic);
+        }
+        return pipeGalleryStaticList;
     }
 
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
index 251c9d2..fc1f05f 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
@@ -44,7 +44,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
-        SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 
         try {
             if (pgEquipmentManager.getEquipmentByCode(eqCode)!=null) {
@@ -92,7 +92,7 @@
         HashMap<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
         String result = "";
-        SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 
         try {
             PgEquipment pgEquipment=pgEquipmentManager.get(id);
@@ -211,4 +211,4 @@
         return resultMap;
     }
 
-}
+}
\ No newline at end of file

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 73b1050..7a80a23 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,34 +2,17 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="">
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\~$数据库设计说明新需求.docx" afterPath="" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/~$数据库设计说明新需求.docx" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineLengthStatic.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/接口说明新需求.docx" afterPath="$PROJECT_DIR$/接口说明新需求.docx" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainTypeManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainTypeManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources/application.properties" afterPath="$PROJECT_DIR$/src/main/resources/application.properties" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
     </list>
     <ignored path="PgInterface.iws" />
@@ -54,7 +37,67 @@
     <favorites_list name="PgInterface" />
   </component>
   <component name="FileEditorManager">
-    <leaf />
+    <leaf>
+      <file leaf-file-name="PgPipeLineRs.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.0" vertical-offset="2301" max-vertical-offset="3388">
+              <caret line="277" column="9" selection-start-line="277" selection-start-column="9" selection-end-line="277" selection-end-column="9" />
+              <folding>
+                <element signature="method#addLog#0;class#PgPipeLineRs#0" expanded="false" />
+                <element signature="method#editPipeLine#0;class#PgPipeLineRs#0" expanded="false" />
+                <element signature="method#deletePipeLine#0;class#PgPipeLineRs#0" expanded="false" />
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" expanded="false" />
+                <element signature="e#9602#9626#0" expanded="true" />
+                <element signature="e#10329#10337#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="PgPipeLineManager.java" pinned="false" current="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 vertical-scroll-proportion="0.0" vertical-offset="330" max-vertical-offset="1342">
+              <caret line="55" column="42" selection-start-line="55" selection-start-column="42" selection-end-line="55" selection-end-column="42" />
+              <folding>
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" expanded="false" />
+                <element signature="e#1787#1811#0" expanded="true" />
+                <element signature="e#2482#2490#0" expanded="true" />
+                <marker date="1537414540748" expanded="true" signature="1552:1622" placeholder="select LINE_..PG_PIPELINE..." />
+                <marker date="1537414540748" expanded="true" signature="1552:1621" placeholder="select LINE_..PG_PIPELINE..." />
+                <marker date="1537414540748" expanded="true" signature="2310:2352" placeholder="select disti..PG_PIPELINE..." />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="PipeGalleryRs.java" pinned="false" current="true" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.7140151" vertical-offset="4067" max-vertical-offset="4752">
+              <caret line="221" column="27" selection-start-line="221" selection-start-column="27" selection-end-line="221" selection-end-column="27" />
+              <folding>
+                <element signature="e#6945#6964#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="PipeGalleryManager.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.0" vertical-offset="849" max-vertical-offset="1650">
+              <caret line="61" column="56" selection-start-line="61" selection-start-column="56" selection-end-line="61" selection-end-column="56" />
+              <folding>
+                <element signature="e#2433#2452#0" expanded="true" />
+                <marker date="1537414756878" expanded="true" signature="2209:2277" placeholder="select PG_NA..PG_PIPE_GALLERY..." />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+    </leaf>
   </component>
   <component name="FindManager">
     <FindUsagesManager>
@@ -72,9 +115,6 @@
   <component name="IdeDocumentHistory">
     <option name="changedFiles">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
         <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/manager/PgInPgPersonManager.java" />
@@ -86,23 +126,16 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintainType.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/manager/PgPipeLineManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/EquipmentManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgEquipment.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.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/rs/PgPartitionRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.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/PgDeviceTypeRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
         <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.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/PgMaintainTypeRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainTypeManager.java" />
@@ -123,6 +156,16 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.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/dto/PgPipeLineLengthStatic.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/dto/PipeGalleryDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.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" />
       </list>
     </option>
   </component>
@@ -216,7 +259,20 @@
       <sortByType />
     </navigator>
     <panes>
-      <pane id="Scope" />
+      <pane id="PackagesPane">
+        <subPane>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
+            </PATH_ELEMENT>
+          </PATH>
+        </subPane>
+      </pane>
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -331,22 +387,73 @@
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
-        </subPane>
-      </pane>
-      <pane id="PackagesPane">
-        <subPane>
           <PATH>
             <PATH_ELEMENT>
               <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
               <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="devTable" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="devTable" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="dto" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
         </subPane>
       </pane>
+      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -916,7 +1023,12 @@
       <workItem from="1535958569443" duration="219000" />
       <workItem from="1536111554952" duration="23051000" />
       <workItem from="1536143316539" duration="3706000" />
-      <workItem from="1536195067076" duration="23441000" />
+      <workItem from="1536195067076" duration="23586000" />
+      <workItem from="1536802841385" duration="18000" />
+      <workItem from="1537167144071" duration="1232000" />
+      <workItem from="1537236948589" duration="156000" />
+      <workItem from="1537237991303" duration="1733000" />
+      <workItem from="1537407751831" duration="6397000" />
     </task>
     <task id="LOCAL-00001" summary="first commit">
       <created>1510219102698</created>
@@ -1126,11 +1238,15 @@
       <created>1535958368940</created>
       <updated>1535958368940</updated>
     </task>
-    <option name="localTasksCounter" value="53" />
+    <task id="LOCAL-00053" summary="根据华锐王工反馈测试，修改接口">
+      <created>1536224373164</created>
+      <updated>1536224373165</updated>
+    </task>
+    <option name="localTasksCounter" value="54" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="937579000" />
+    <option name="totallyTimeSpent" value="947260000" />
   </component>
   <component name="TodoView" selected-index="1">
     <todo-panel id="selected-file">
@@ -1165,7 +1281,7 @@
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.391453" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.66382253" sideWeight="0.81316185" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.7235495" sideWeight="0.81316185" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="true" content_ui="tabs" />
       <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.6757679" sideWeight="0.18683812" order="7" side_tool="true" content_ui="tabs" />
@@ -1177,8 +1293,8 @@
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24962178" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32980332" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32649574" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2526475" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32593855" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.28441754" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" />
@@ -1192,18 +1308,18 @@
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
     </layout>
     <layout-to-restore>
-      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.63418806" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
-      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
+      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.391453" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
       <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" />
-      <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.50341296" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
+      <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2962963" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
+      <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.52136755" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32649574" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.29425114" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
@@ -1223,8 +1339,8 @@
       <window_info id="Android" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="15" side_tool="false" content_ui="tabs" />
       <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="true" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32980332" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
     </layout-to-restore>
   </component>
@@ -1243,7 +1359,6 @@
     <option name="myTodoPanelSettings">
       <TodoPanelSettings />
     </option>
-    <MESSAGE value="修改人员入廊记录表和功能" />
     <MESSAGE value="Merge remote-tracking branch 'origin/develop' into develop&#10;&#10;Conflicts:&#10;&#9;.idea/workspace.xml&#10;&#9;~$数据库设计说明新需求.docx&#10;&#9;管廊数据库设计说明新需求.docx&#10;" />
     <MESSAGE value="增加统计功能" />
     <MESSAGE value="修改标注" />
@@ -1268,7 +1383,8 @@
     <MESSAGE value="新增维护类别" />
     <MESSAGE value="修改施工数据新增删除编辑" />
     <MESSAGE value="新增工器具耗材" />
-    <option name="LAST_COMMIT_MESSAGE" value="新增工器具耗材" />
+    <MESSAGE value="根据华锐王工反馈测试，修改接口" />
+    <option name="LAST_COMMIT_MESSAGE" value="根据华锐王工反馈测试，修改接口" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1291,14 +1407,8 @@
           <properties />
           <option name="timeStamp" value="359" />
         </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java</url>
-          <line>190</line>
-          <properties />
-          <option name="timeStamp" value="360" />
-        </line-breakpoint>
       </breakpoints>
-      <option name="time" value="390" />
+      <option name="time" value="399" />
     </breakpoint-manager>
   </component>
   <component name="antWorkspaceConfiguration">
@@ -1306,163 +1416,10 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="3119" max-vertical-offset="7128">
-          <caret line="30" column="52" selection-start-line="30" selection-start-column="52" selection-end-line="30" selection-end-column="52" />
-          <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 vertical-scroll-proportion="0.0" vertical-offset="5071" max-vertical-offset="5918">
-          <caret line="268" column="24" selection-start-line="268" selection-start-column="24" selection-end-line="268" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="13" max-vertical-offset="3058">
-          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.5529623" vertical-offset="528" max-vertical-offset="3014">
-          <caret line="26" column="0" selection-start-line="26" selection-start-column="0" selection-end-line="26" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainTypeDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.33213645" vertical-offset="101" max-vertical-offset="1012">
-          <caret line="15" column="11" selection-start-line="15" selection-start-column="11" selection-end-line="15" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="609" max-vertical-offset="1958">
-          <caret line="39" column="50" selection-start-line="39" selection-start-column="50" selection-end-line="39" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.7271095" vertical-offset="167" max-vertical-offset="1342">
-          <caret line="35" column="0" selection-start-line="35" selection-start-column="0" selection-end-line="35" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.63195693" vertical-offset="0" max-vertical-offset="1452">
-          <caret line="19" column="0" selection-start-line="19" selection-start-column="0" selection-end-line="19" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintainDoc.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.69669116" vertical-offset="61" max-vertical-offset="1320">
-          <caret line="24" column="0" selection-start-line="24" selection-start-column="0" selection-end-line="24" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDocDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.27648115" vertical-offset="0" max-vertical-offset="1342">
-          <caret line="9" column="13" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-7.551724" vertical-offset="3125" max-vertical-offset="4048">
-          <caret line="249" column="85" selection-start-line="249" selection-start-column="85" selection-end-line="249" selection-end-column="85" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-9.862069" vertical-offset="3674" max-vertical-offset="5610">
-          <caret line="203" column="58" selection-start-line="203" selection-start-column="58" selection-end-line="203" selection-end-column="58" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.31597847" vertical-offset="0" max-vertical-offset="557">
-          <caret line="8" column="35" selection-start-line="8" selection-start-column="35" selection-end-line="8" selection-end-column="35" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.66360295" vertical-offset="783" max-vertical-offset="3234">
-          <caret line="68" column="71" selection-start-line="68" selection-start-column="71" selection-end-line="68" selection-end-column="71" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="33" max-vertical-offset="968">
-          <caret line="33" column="62" selection-start-line="33" selection-start-column="62" selection-end-line="33" selection-end-column="62" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://C:/Program Files/Java/jdk1.8.0_131/src.zip!/java/lang/NumberFormatException.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.6285178" vertical-offset="479" max-vertical-offset="1012">
-          <caret line="64" column="0" selection-start-line="64" selection-start-column="0" selection-end-line="64" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-tx/4.0.6.RELEASE/spring-tx-4.0.6.RELEASE-sources.jar!/org/springframework/transaction/interceptor/TransactionAspectSupport.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.23639774" vertical-offset="4736" max-vertical-offset="13244">
-          <caret line="263" column="0" selection-start-line="263" selection-start-column="0" selection-end-line="263" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.2504817" vertical-offset="618" max-vertical-offset="1320">
-          <caret line="35" column="28" selection-start-line="35" selection-start-column="28" selection-end-line="35" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://C:/Program Files/Java/jdk1.8.0_131/src.zip!/java/util/ArrayList.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.73967683" vertical-offset="13360" max-vertical-offset="30690">
-          <caret line="663" column="7" selection-start-line="663" selection-start-column="7" selection-end-line="663" selection-end-column="7" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/StringUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.15798923" vertical-offset="330" max-vertical-offset="2178">
-          <caret line="31" column="29" selection-start-line="31" selection-start-column="29" selection-end-line="31" selection-end-column="29" />
-          <folding />
-        </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 vertical-scroll-proportion="0.11143695" vertical-offset="1854" max-vertical-offset="5170">
-          <caret line="103" column="65" selection-start-line="103" selection-start-column="65" selection-end-line="103" selection-end-column="65" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="jar://C:/Program Files/Java/jdk1.8.0_131/src.zip!/java/util/concurrent/ThreadPoolExecutor.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="1.659824" vertical-offset="23436" max-vertical-offset="44594">
           <caret line="1148" column="31" selection-start-line="1148" selection-start-column="31" selection-end-line="1148" selection-end-column="31" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1470,17 +1427,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.2404692" vertical-offset="9532" max-vertical-offset="12958">
           <caret line="497" column="0" selection-start-line="497" selection-start-column="0" selection-end-line="497" selection-end-column="0" />
-          <folding />
-        </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 vertical-scroll-proportion="0.0" vertical-offset="4977" max-vertical-offset="8316">
-          <caret line="263" column="24" selection-start-line="263" selection-start-column="24" selection-end-line="263" selection-end-column="24" />
-          <folding>
-            <element signature="e#10383#10401#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1488,7 +1434,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-2.1782365" vertical-offset="1359" max-vertical-offset="1892">
           <caret line="24" column="13" selection-start-line="24" selection-start-column="13" selection-end-line="24" selection-end-column="13" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1496,7 +1441,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-1.4093357" vertical-offset="1907" max-vertical-offset="2464">
           <caret line="65" column="60" selection-start-line="65" selection-start-column="11" selection-end-line="65" selection-end-column="60" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1504,10 +1448,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-0.011029412" vertical-offset="2228" max-vertical-offset="2838">
           <caret line="111" column="47" selection-start-line="111" selection-start-column="47" selection-end-line="111" selection-end-column="47" />
-          <folding>
-            <marker date="1535944027199" expanded="true" signature="-1:-1" placeholder="select devic..PG_DEVICE..." />
-            <marker date="1535944027199" expanded="true" signature="-1:-1" placeholder="select * fro..PG_DEVICE..." />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1515,7 +1455,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.76301616" vertical-offset="1687" max-vertical-offset="2376">
           <caret line="143" column="16" selection-start-line="143" selection-start-column="16" selection-end-line="143" selection-end-column="16" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1523,7 +1462,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.88509876" vertical-offset="519" max-vertical-offset="1342">
           <caret line="68" column="0" selection-start-line="68" selection-start-column="0" selection-end-line="68" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1531,7 +1469,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.43267503" vertical-offset="23" max-vertical-offset="1672">
           <caret line="15" column="33" selection-start-line="15" selection-start-column="33" selection-end-line="15" selection-end-column="33" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1540,42 +1477,8 @@
         <state vertical-scroll-proportion="0.5257353" vertical-offset="0" max-vertical-offset="4972">
           <caret line="30" column="0" selection-start-line="30" selection-start-column="0" selection-end-line="30" selection-end-column="0" />
           <folding>
-            <element signature="e#3701#3720#0" expanded="true" />
-            <element signature="e#4190#4208#0" expanded="true" />
-            <marker date="1536211271563" expanded="true" signature="-1:-1" placeholder="select count..PG_CONSTRUCTION..." />
-            <marker date="1536211271563" expanded="true" signature="-1:-1" placeholder="select count..Pg_Construction..." />
-            <marker date="1536211271563" expanded="true" signature="-1:-1" placeholder="SELECT t.ID,..PG_CONSTRUCTION..." />
-            <marker date="1536211271563" expanded="true" signature="-1:-1" placeholder="SELECT m.PAR..PG_PARTITION..." />
-            <marker date="1536211271563" expanded="true" signature="-1:-1" placeholder="SELECT n.TYP..PG_CONSTRUCTION_TYPE..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.40754038" vertical-offset="675" max-vertical-offset="1540">
-          <caret line="108" column="52" selection-start-line="108" selection-start-column="52" selection-end-line="108" selection-end-column="52" />
-          <folding>
-            <element signature="method#saveFiles#0;class#PgCsDocumentManager#0" expanded="false" />
-            <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" expanded="false" />
-            <element signature="e#3728#3745#0" expanded="true" />
-            <marker date="1536205913620" expanded="true" signature="-1:-1" placeholder="select * fro..PG_CSDOCUMENT..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.41666666" vertical-offset="2772" max-vertical-offset="3674">
-          <caret line="192" column="13" selection-start-line="192" selection-start-column="13" selection-end-line="192" selection-end-column="13" />
-          <folding>
-            <element signature="method#setPgCsDocumentManager#0;class#PgCsDocumentRs#0" expanded="false" />
-            <element signature="method#setPgConstructionManager#0;class#PgCsDocumentRs#0" expanded="false" />
-            <element signature="e#2023#2039#0" expanded="true" />
-            <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" expanded="false" />
-            <element signature="e#6060#6076#0" expanded="true" />
-            <element signature="e#6145#6162#0" expanded="true" />
-            <element signature="method#downloadFile#0;class#PgCsDocumentRs#0" expanded="false" />
+            <element signature="e#3701#3720#0" expanded="false" />
+            <element signature="e#4190#4208#0" expanded="false" />
           </folding>
         </state>
       </provider>
@@ -1584,24 +1487,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.9640933" vertical-offset="1091" max-vertical-offset="2112">
           <caret line="83" column="62" selection-start-line="83" selection-start-column="62" selection-end-line="83" selection-end-column="62" />
-          <folding>
-            <element signature="e#2170#2184#0" expanded="true" />
-            <marker date="1536213480710" expanded="true" signature="-1:-1" placeholder="select count..PG_ALARM..." />
-            <marker date="1536213480710" expanded="true" signature="-1:-1" placeholder="select count..PG_ALARM..." />
-            <marker date="1536213480710" expanded="true" signature="-1:-1" placeholder="select count..PG_ALARM..." />
-            <marker date="1536213480710" expanded="true" signature="-1:-1" placeholder="select count..PG_ALARM..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.41666666" vertical-offset="990" max-vertical-offset="1672">
-          <caret line="72" column="55" selection-start-line="72" selection-start-column="55" selection-end-line="72" selection-end-column="55" />
-          <folding>
-            <element signature="e#2152#2168#0" expanded="false" />
-            <element signature="e#2257#2271#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1609,10 +1494,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.75" vertical-offset="440" max-vertical-offset="3938">
           <caret line="62" column="13" selection-start-line="62" selection-start-column="13" selection-end-line="62" selection-end-column="13" />
-          <folding>
-            <element signature="e#1393#1394#0" expanded="false" />
-            <element signature="e#1451#1452#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1620,7 +1501,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.35547575" vertical-offset="0" max-vertical-offset="1012">
           <caret line="18" column="0" selection-start-line="18" selection-start-column="0" selection-end-line="18" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1628,9 +1508,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.45421904" vertical-offset="2145" max-vertical-offset="3608">
           <caret line="125" column="29" selection-start-line="125" selection-start-column="29" selection-end-line="125" selection-end-column="29" />
-          <folding>
-            <element signature="e#3094#3110#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1638,7 +1515,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.513465" vertical-offset="0" max-vertical-offset="1276">
           <caret line="22" column="51" selection-start-line="22" selection-start-column="51" selection-end-line="22" selection-end-column="51" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1646,7 +1522,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.5924596" vertical-offset="0" max-vertical-offset="1254">
           <caret line="20" column="28" selection-start-line="20" selection-start-column="28" selection-end-line="20" selection-end-column="28" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1654,18 +1529,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-3.3052065" vertical-offset="4063" max-vertical-offset="4620">
           <caret line="115" column="15" selection-start-line="115" selection-start-column="15" selection-end-line="115" selection-end-column="15" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.20833333" vertical-offset="1892" max-vertical-offset="3850">
-          <caret line="152" column="24" selection-start-line="152" selection-start-column="24" selection-end-line="152" selection-end-column="24" />
-          <folding>
-            <element signature="method#addReservePlan#0;class#PgReservePlanRs#0" expanded="false" />
-            <element signature="e#3206#3222#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1673,7 +1536,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.06147541" vertical-offset="183" max-vertical-offset="506">
           <caret line="10" column="0" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1681,7 +1543,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="3388">
           <caret line="39" column="56" selection-start-line="39" selection-start-column="56" selection-end-line="39" selection-end-column="56" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1689,22 +1550,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.33213645" vertical-offset="959" max-vertical-offset="2508">
           <caret line="71" column="36" selection-start-line="71" selection-start-column="36" selection-end-line="71" selection-end-column="36" />
-          <folding>
-            <marker date="1536217243963" expanded="true" signature="-1:-1" placeholder="select count..PG_RESERVE_PLAN..." />
-          </folding>
-        </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 vertical-scroll-proportion="0.46401516" vertical-offset="1273" max-vertical-offset="1980">
-          <caret line="106" column="70" selection-start-line="106" selection-start-column="70" selection-end-line="106" selection-end-column="70" />
-          <folding>
-            <element signature="imports" expanded="false" />
-            <element signature="method#linkDevice#0;class#PgAlarmLinkRs#0" expanded="false" />
-            <element signature="e#1459#1475#0" expanded="false" />
-            <element signature="method#linkPartitionDevice#0;class#PgAlarmLinkRs#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1712,7 +1557,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.35906643" vertical-offset="1164" max-vertical-offset="3388">
           <caret line="80" column="23" selection-start-line="80" selection-start-column="23" selection-end-line="80" selection-end-column="23" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1720,7 +1564,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.625" vertical-offset="1364" max-vertical-offset="4158">
           <caret line="99" column="37" selection-start-line="99" selection-start-column="37" selection-end-line="99" selection-end-column="37" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1728,7 +1571,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="1553" max-vertical-offset="2134">
           <caret line="98" column="16" selection-start-line="98" selection-start-column="16" selection-end-line="98" selection-end-column="16" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1736,9 +1578,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="837" max-vertical-offset="1276">
           <caret line="59" column="0" selection-start-line="59" selection-start-column="0" selection-end-line="59" selection-end-column="0" />
-          <folding>
-            <element signature="e#1980#1990#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1746,10 +1585,259 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.24955116" vertical-offset="631" max-vertical-offset="1232">
           <caret line="58" column="34" selection-start-line="58" selection-start-column="34" selection-end-line="58" selection-end-column="34" />
+        </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 vertical-scroll-proportion="0.0" vertical-offset="6759" max-vertical-offset="8316">
+          <caret line="268" column="42" selection-start-line="268" selection-start-column="42" selection-end-line="268" selection-end-column="42" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.8779174" vertical-offset="347" max-vertical-offset="2662">
+          <caret line="54" column="9" selection-start-line="54" selection-start-column="9" selection-end-line="54" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="1.9353681" vertical-offset="0" max-vertical-offset="4906">
+          <caret line="70" column="71" selection-start-line="70" selection-start-column="66" selection-end-line="70" selection-end-column="75" />
+        </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 vertical-scroll-proportion="0.32854578" vertical-offset="1115" max-vertical-offset="1672">
+          <caret line="76" column="33" selection-start-line="76" selection-start-column="33" selection-end-line="76" selection-end-column="33" />
+        </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 vertical-scroll-proportion="3.1723518" vertical-offset="81" max-vertical-offset="2354">
+          <caret line="104" column="12" selection-start-line="104" selection-start-column="12" selection-end-line="104" selection-end-column="12" />
           <folding />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.5260323" vertical-offset="4239" max-vertical-offset="4796">
+          <caret line="224" column="0" selection-start-line="224" selection-start-column="0" selection-end-line="224" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.6445242" vertical-offset="1709" max-vertical-offset="2332">
+          <caret line="111" column="53" selection-start-line="111" selection-start-column="53" selection-end-line="111" selection-end-column="53" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-3.5421903" vertical-offset="5515" max-vertical-offset="6072">
+          <caret line="184" column="25" selection-start-line="184" selection-start-column="25" selection-end-line="184" selection-end-column="25" />
+        </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 vertical-scroll-proportion="-0.78994614" vertical-offset="924" max-vertical-offset="7128">
+          <caret line="41" column="5" selection-start-line="41" selection-start-column="5" selection-end-line="41" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.4344704" vertical-offset="748" max-vertical-offset="1474">
+          <caret line="72" column="0" selection-start-line="72" selection-start-column="0" selection-end-line="72" selection-end-column="0" />
+        </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 vertical-scroll-proportion="0.0" vertical-offset="264" max-vertical-offset="1782">
+          <caret line="37" column="57" selection-start-line="37" selection-start-column="57" selection-end-line="37" selection-end-column="57" />
+          <folding>
+            <marker date="1531722832731" expanded="true" signature="-1:-1" placeholder="select id,CH..PG_CH4..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2420">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://C:/Program Files/Java/jdk1.8.0_131/src.zip!/java/sql/Timestamp.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33027524" vertical-offset="4606" max-vertical-offset="12980">
+          <caret line="236" column="0" selection-start-line="236" selection-start-column="0" selection-end-line="236" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="2.2118492" vertical-offset="0" max-vertical-offset="1496">
+          <caret line="87" column="52" selection-start-line="87" selection-start-column="52" selection-end-line="87" selection-end-column="52" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.4901257" vertical-offset="79" max-vertical-offset="1298">
+          <caret line="25" column="25" selection-start-line="25" selection-start-column="25" selection-end-line="25" selection-end-column="25" />
+          <folding>
+            <marker date="1537412037475" expanded="true" signature="-1:-1" placeholder="select equip..PG_EQUIPMENT..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.8330341" vertical-offset="680" max-vertical-offset="4466">
+          <caret line="68" column="29" selection-start-line="68" selection-start-column="29" selection-end-line="68" selection-end-column="29" />
+          <folding>
+            <element signature="e#1490#1506#0" expanded="true" />
+            <element signature="e#6332#6348#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgEquipment.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.3680431" vertical-offset="191" max-vertical-offset="1540">
+          <caret line="20" column="17" selection-start-line="20" selection-start-column="17" selection-end-line="20" selection-end-column="17" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/4.3.6.Final/hibernate-core-4.3.6.Final-sources.jar!/org/hibernate/internal/AbstractQueryImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33333334" vertical-offset="18814" max-vertical-offset="20328">
+          <caret line="974" column="0" selection-start-line="974" selection-start-column="0" selection-end-line="974" selection-end-column="0" />
+          <folding />
+        </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 vertical-scroll-proportion="0.5924596" vertical-offset="0" max-vertical-offset="1980">
+          <caret line="18" column="32" selection-start-line="18" selection-start-column="32" selection-end-line="18" selection-end-column="32" />
+          <folding />
+        </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 vertical-scroll-proportion="0.7109515" vertical-offset="0" max-vertical-offset="704">
+          <caret line="18" column="31" selection-start-line="18" selection-start-column="31" selection-end-line="18" selection-end-column="31" />
+          <folding>
+            <element signature="e#213#214#0" expanded="true" />
+            <element signature="e#244#245#0" expanded="true" />
+            <element signature="e#292#293#0" expanded="true" />
+            <element signature="e#332#333#0" expanded="true" />
+            <element signature="e#394#395#0" expanded="true" />
+            <element signature="e#438#439#0" expanded="true" />
+            <element signature="e#474#475#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://C:/Program Files/Java/jdk1.8.0_131/src.zip!/java/lang/String.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.21139705" vertical-offset="1469" max-vertical-offset="67452">
+          <caret line="107" column="16" selection-start-line="107" selection-start-column="12" selection-end-line="107" selection-end-column="16" />
+          <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 vertical-scroll-proportion="0.0" vertical-offset="2301" max-vertical-offset="3388">
+          <caret line="277" column="9" selection-start-line="277" selection-start-column="9" selection-end-line="277" selection-end-column="9" />
+          <folding>
+            <element signature="method#addLog#0;class#PgPipeLineRs#0" expanded="false" />
+            <element signature="method#editPipeLine#0;class#PgPipeLineRs#0" expanded="false" />
+            <element signature="method#deletePipeLine#0;class#PgPipeLineRs#0" expanded="false" />
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" expanded="false" />
+            <element signature="e#9602#9626#0" expanded="true" />
+            <element signature="e#10329#10337#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.43727598" vertical-offset="120" max-vertical-offset="1122">
+          <caret line="13" column="34" selection-start-line="13" selection-start-column="34" selection-end-line="13" selection-end-column="34" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.8547855" vertical-offset="137" max-vertical-offset="704">
+          <caret line="18" column="31" selection-start-line="18" selection-start-column="31" selection-end-line="18" selection-end-column="31" />
+          <folding>
+            <element signature="e#204#205#0" expanded="true" />
+            <element signature="e#233#234#0" expanded="true" />
+            <element signature="e#277#278#0" expanded="true" />
+            <element signature="e#313#314#0" expanded="true" />
+            <element signature="e#375#376#0" expanded="true" />
+            <element signature="e#419#420#0" expanded="true" />
+            <element signature="e#455#456#0" expanded="true" />
+          </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 vertical-scroll-proportion="0.0" vertical-offset="330" max-vertical-offset="1342">
+          <caret line="55" column="42" selection-start-line="55" selection-start-column="42" selection-end-line="55" selection-end-column="42" />
+          <folding>
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" expanded="false" />
+            <element signature="e#1787#1811#0" expanded="true" />
+            <element signature="e#2482#2490#0" expanded="true" />
+            <marker date="1537414540748" expanded="true" signature="1552:1622" placeholder="select LINE_..PG_PIPELINE..." />
+            <marker date="1537414540748" expanded="true" signature="1552:1621" placeholder="select LINE_..PG_PIPELINE..." />
+            <marker date="1537414540748" expanded="true" signature="2310:2352" placeholder="select disti..PG_PIPELINE..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="849" max-vertical-offset="1650">
+          <caret line="61" column="56" selection-start-line="61" selection-start-column="56" selection-end-line="61" selection-end-column="56" />
+          <folding>
+            <element signature="e#2433#2452#0" expanded="true" />
+            <marker date="1537414756878" expanded="true" signature="2209:2277" placeholder="select PG_NA..PG_PIPE_GALLERY..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.7140151" vertical-offset="4067" max-vertical-offset="4752">
+          <caret line="221" column="27" selection-start-line="221" selection-start-column="27" selection-end-line="221" selection-end-column="27" />
+          <folding>
+            <element signature="e#6945#6964#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java
index 238bc39..6256b9d 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java
@@ -78,7 +78,7 @@
     public PgEquipmentDto(PgEquipment equipment) {
         if (equipment == null) return;
 
-        SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 
         this.setId(equipment.getId());
         this.setEqName(equipment.getEqName());
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineLengthStatic.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineLengthStatic.java
new file mode 100644
index 0000000..a25538f
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineLengthStatic.java
@@ -0,0 +1,26 @@
+package com.casic.PgInterface.devTable.dto;
+
+/**
+ * Created by yxw on 2018/9/20.
+ */
+public class PgPipeLineLengthStatic {
+
+    private String lineType;
+    private String length;
+
+    public String getLineType() {
+        return lineType;
+    }
+
+    public void setLineType(String lineType) {
+        this.lineType = lineType;
+    }
+
+    public String getLength() {
+        return length;
+    }
+
+    public void setLength(String length) {
+        this.length = length;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.java b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.java
new file mode 100644
index 0000000..bd65ff4
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.java
@@ -0,0 +1,26 @@
+package com.casic.PgInterface.devTable.dto;
+
+/**
+ * Created by yxw on 2018/9/20.
+ */
+public class PipeGalleryStatic {
+
+    private String pgName;
+    private String length;
+
+    public String getPgName() {
+        return pgName;
+    }
+
+    public void setPgName(String pgName) {
+        this.pgName = pgName;
+    }
+
+    public String getLength() {
+        return length;
+    }
+
+    public void setLength(String length) {
+        this.length = length;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
index e46742c..ab0908b 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
@@ -23,7 +23,7 @@
         criteria.add(Restrictions.eq("eqCode", eqCode));
         criteria.add(Restrictions.eq("active",1));
 
-        List<PgEquipment> pgEquipmentList = criteria.list();
+        List<PgEquipment> pgEquipmentList = (List<PgEquipment>)criteria.list();
 
         if(pgEquipmentList!=null&&pgEquipmentList.size()!=0)
             return pgEquipmentList.get(0);
@@ -49,10 +49,10 @@
 
     //统计工器具耗材数量
     public List<PgDeviceTypeStatisticDto> getDeviceStatisticByDevType(String eqType){
-        String eqType1=eqType.equals("0")?"工器具":"耗材";
+        //String eqType1=eqType.equals("0")?"工器具":"耗材";
 
         String hql="select equipment.EQ_NAME,count(*) from PG_EQUIPMENT equipment where equipment.EQ_TYPE = '"
-        +eqType1+"' group by equipment.EQ_NAME";
+        +eqType+"' group by equipment.EQ_NAME";
 
         List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list();
 
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 8d8db5d..4cfa880 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
@@ -3,6 +3,7 @@
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
 import com.casic.PgInterface.devTable.domain.PgPipeLine;
 import com.casic.PgInterface.devTable.dto.PgPipeLineDto;
+import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
@@ -39,13 +40,35 @@
         return pgPipeLineDtoList;
     }
 
-   public String getPipeLengthByName(String lineType) {
-       String sql = "select SUM(PIPE_LENGTH) from PG_PIPELINE where LINE_TYPE = '" + lineType + "'";
+    public List<PgPipeLineLengthStatic> getPipeLengthByName() {
+        String sql = "select LINE_TYPE,SUM(PIPE_LENGTH) from PG_PIPELINE group by LINE_TYPE ";
 
-       String sumLength = String.valueOf(this.getSession().createSQLQuery(sql).uniqueResult());
+        List<Object[]> objectList = this.getSession().createSQLQuery(sql).list();
+        List<PgPipeLineLengthStatic> pgPipeLineLengthStaticList = new ArrayList<PgPipeLineLengthStatic>();
 
-       return sumLength;
-   }
+        for(Object[] objectArray : objectList)
+        {
+            PgPipeLineLengthStatic pgPipeLineLengthStatic=new PgPipeLineLengthStatic();
+            pgPipeLineLengthStatic.setLineType(String.valueOf(objectArray[0]));
+            pgPipeLineLengthStatic.setLength(String.valueOf(objectArray[1]));
+            pgPipeLineLengthStaticList.add(pgPipeLineLengthStatic);
+        }
+        return pgPipeLineLengthStaticList;
+    }
+
+    public  List<String> getPipeType() {
+        String sql = "select distinct LINE_TYPE from PG_PIPELINE";
+
+        List<Object> objectList = this.getSession().createSQLQuery(sql).list();
+
+        List<String> stringList=new ArrayList<String>();
+
+        for(Object ob : objectList)
+        {
+            stringList.add(String.valueOf(ob));
+        }
+        return stringList;
+    }
 
 }
 
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java
index 41f0e64..375c078 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java
@@ -4,6 +4,7 @@
 import com.casic.PgInterface.devTable.domain.PgPartition;
 import com.casic.PgInterface.devTable.domain.PipeGallery;
 import com.casic.PgInterface.devTable.dto.PipeGalleryDto;
+import com.casic.PgInterface.devTable.dto.PipeGalleryStatic;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
@@ -58,13 +59,21 @@
         return pipeGalleryDtoList;
     }
 
-    public String getPgLengthByName(String pgName) {
+    public List<PipeGalleryStatic> getPgLengthByName() {
 
-        String sql = "select SUM(PAR_LENGTH) from PG_PIPE_GALLERY where PG_NAME = '" + pgName + "'";
+        String sql = "select PG_NAME,SUM(PAR_LENGTH) from PG_PIPE_GALLERY group by PG_NAME ";
 
-        String sumLength = String.valueOf(this.getSession().createSQLQuery(sql).uniqueResult());
+        List<Object[]> objectList = this.getSession().createSQLQuery(sql).list();
+        List<PipeGalleryStatic> pipeGalleryStaticList = new ArrayList<PipeGalleryStatic>();
 
-        return sumLength;
+        for(Object[] objectArray : objectList)
+        {
+            PipeGalleryStatic pipeGalleryStatic=new PipeGalleryStatic();
+            pipeGalleryStatic.setPgName(String.valueOf(objectArray[0]));
+            pipeGalleryStatic.setLength(String.valueOf(objectArray[1]));
+            pipeGalleryStaticList.add(pipeGalleryStatic);
+        }
+        return pipeGalleryStaticList;
     }
 
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
index 251c9d2..fc1f05f 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
@@ -44,7 +44,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
-        SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 
         try {
             if (pgEquipmentManager.getEquipmentByCode(eqCode)!=null) {
@@ -92,7 +92,7 @@
         HashMap<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
         String result = "";
-        SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 
         try {
             PgEquipment pgEquipment=pgEquipmentManager.get(id);
@@ -211,4 +211,4 @@
         return resultMap;
     }
 
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
index 3da622c..41f7374 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
@@ -4,6 +4,7 @@
 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.manager.PgPartitionManager;
 import com.casic.PgInterface.devTable.manager.PgPipeLineManager;
 import com.casic.PgInterface.devTable.manager.PipeGalleryManager;
@@ -261,14 +262,14 @@
      * 根据管线类型获取管线长度
      */
     @POST
-    @Path("getPipeLengthByName")
+    @Path("getPipeLengthStatic")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String,Object> getPipeLengthByName(@FormParam("lineType") String lineType)throws Exception{
+    public Map<String,Object> getPipeLengthStatic()throws Exception{
         Map<String, Object> resultMap = new HashMap<String, Object>();
-        String result = "";
         String msg = "";
+        List<PgPipeLineLengthStatic> pgPipeLineLengthStaticList=new ArrayList<PgPipeLineLengthStatic>();
         try {
-            result = pgPipeLineManager.getPipeLengthByName(lineType);
+            pgPipeLineLengthStaticList = pgPipeLineManager.getPipeLengthByName();
             msg="管线长度获取成功";
         }catch(Exception e)
         {
@@ -276,9 +277,32 @@
             msg="管线长度统计失败";
         }
         resultMap.put("msg",msg);
-        resultMap.put("result",result);
+        resultMap.put("result",pgPipeLineLengthStaticList);
 
         return resultMap;
     }
 
-}
+    /**
+     * 根据管线名称获取管线信息
+     */
+    @POST
+    @Path("getPipeLineType")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String, Object> getPipeLineType()
+            throws Exception {
+        Map<String, Object> resultMap = new HashMap<String, Object>();
+        String msg = "";
+        List<String> stringList=new ArrayList<String>();
+        try {
+            stringList = pgPipeLineManager.getPipeType();
+            msg = "获取成功";
+        } catch (Exception e) {
+            msg = "获取失败";
+            e.printStackTrace();
+        }
+        resultMap.put("msg", msg);
+        resultMap.put("result", stringList);
+        return resultMap;
+    }
+
+}
\ No newline at end of file

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 73b1050..7a80a23 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,34 +2,17 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="">
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\~$数据库设计说明新需求.docx" afterPath="" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/~$数据库设计说明新需求.docx" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineLengthStatic.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/接口说明新需求.docx" afterPath="$PROJECT_DIR$/接口说明新需求.docx" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainTypeManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainTypeManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources/application.properties" afterPath="$PROJECT_DIR$/src/main/resources/application.properties" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
     </list>
     <ignored path="PgInterface.iws" />
@@ -54,7 +37,67 @@
     <favorites_list name="PgInterface" />
   </component>
   <component name="FileEditorManager">
-    <leaf />
+    <leaf>
+      <file leaf-file-name="PgPipeLineRs.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.0" vertical-offset="2301" max-vertical-offset="3388">
+              <caret line="277" column="9" selection-start-line="277" selection-start-column="9" selection-end-line="277" selection-end-column="9" />
+              <folding>
+                <element signature="method#addLog#0;class#PgPipeLineRs#0" expanded="false" />
+                <element signature="method#editPipeLine#0;class#PgPipeLineRs#0" expanded="false" />
+                <element signature="method#deletePipeLine#0;class#PgPipeLineRs#0" expanded="false" />
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" expanded="false" />
+                <element signature="e#9602#9626#0" expanded="true" />
+                <element signature="e#10329#10337#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="PgPipeLineManager.java" pinned="false" current="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 vertical-scroll-proportion="0.0" vertical-offset="330" max-vertical-offset="1342">
+              <caret line="55" column="42" selection-start-line="55" selection-start-column="42" selection-end-line="55" selection-end-column="42" />
+              <folding>
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" expanded="false" />
+                <element signature="e#1787#1811#0" expanded="true" />
+                <element signature="e#2482#2490#0" expanded="true" />
+                <marker date="1537414540748" expanded="true" signature="1552:1622" placeholder="select LINE_..PG_PIPELINE..." />
+                <marker date="1537414540748" expanded="true" signature="1552:1621" placeholder="select LINE_..PG_PIPELINE..." />
+                <marker date="1537414540748" expanded="true" signature="2310:2352" placeholder="select disti..PG_PIPELINE..." />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="PipeGalleryRs.java" pinned="false" current="true" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.7140151" vertical-offset="4067" max-vertical-offset="4752">
+              <caret line="221" column="27" selection-start-line="221" selection-start-column="27" selection-end-line="221" selection-end-column="27" />
+              <folding>
+                <element signature="e#6945#6964#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="PipeGalleryManager.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.0" vertical-offset="849" max-vertical-offset="1650">
+              <caret line="61" column="56" selection-start-line="61" selection-start-column="56" selection-end-line="61" selection-end-column="56" />
+              <folding>
+                <element signature="e#2433#2452#0" expanded="true" />
+                <marker date="1537414756878" expanded="true" signature="2209:2277" placeholder="select PG_NA..PG_PIPE_GALLERY..." />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+    </leaf>
   </component>
   <component name="FindManager">
     <FindUsagesManager>
@@ -72,9 +115,6 @@
   <component name="IdeDocumentHistory">
     <option name="changedFiles">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
         <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/manager/PgInPgPersonManager.java" />
@@ -86,23 +126,16 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintainType.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/manager/PgPipeLineManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/EquipmentManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgEquipment.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.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/rs/PgPartitionRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.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/PgDeviceTypeRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
         <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.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/PgMaintainTypeRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainTypeManager.java" />
@@ -123,6 +156,16 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.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/dto/PgPipeLineLengthStatic.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/dto/PipeGalleryDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.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" />
       </list>
     </option>
   </component>
@@ -216,7 +259,20 @@
       <sortByType />
     </navigator>
     <panes>
-      <pane id="Scope" />
+      <pane id="PackagesPane">
+        <subPane>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
+            </PATH_ELEMENT>
+          </PATH>
+        </subPane>
+      </pane>
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -331,22 +387,73 @@
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
-        </subPane>
-      </pane>
-      <pane id="PackagesPane">
-        <subPane>
           <PATH>
             <PATH_ELEMENT>
               <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
               <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="devTable" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="devTable" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="dto" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
         </subPane>
       </pane>
+      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -916,7 +1023,12 @@
       <workItem from="1535958569443" duration="219000" />
       <workItem from="1536111554952" duration="23051000" />
       <workItem from="1536143316539" duration="3706000" />
-      <workItem from="1536195067076" duration="23441000" />
+      <workItem from="1536195067076" duration="23586000" />
+      <workItem from="1536802841385" duration="18000" />
+      <workItem from="1537167144071" duration="1232000" />
+      <workItem from="1537236948589" duration="156000" />
+      <workItem from="1537237991303" duration="1733000" />
+      <workItem from="1537407751831" duration="6397000" />
     </task>
     <task id="LOCAL-00001" summary="first commit">
       <created>1510219102698</created>
@@ -1126,11 +1238,15 @@
       <created>1535958368940</created>
       <updated>1535958368940</updated>
     </task>
-    <option name="localTasksCounter" value="53" />
+    <task id="LOCAL-00053" summary="根据华锐王工反馈测试，修改接口">
+      <created>1536224373164</created>
+      <updated>1536224373165</updated>
+    </task>
+    <option name="localTasksCounter" value="54" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="937579000" />
+    <option name="totallyTimeSpent" value="947260000" />
   </component>
   <component name="TodoView" selected-index="1">
     <todo-panel id="selected-file">
@@ -1165,7 +1281,7 @@
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.391453" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.66382253" sideWeight="0.81316185" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.7235495" sideWeight="0.81316185" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="true" content_ui="tabs" />
       <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.6757679" sideWeight="0.18683812" order="7" side_tool="true" content_ui="tabs" />
@@ -1177,8 +1293,8 @@
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24962178" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32980332" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32649574" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2526475" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32593855" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.28441754" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" />
@@ -1192,18 +1308,18 @@
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
     </layout>
     <layout-to-restore>
-      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.63418806" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
-      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
+      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.391453" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
       <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" />
-      <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.50341296" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
+      <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2962963" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
+      <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.52136755" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32649574" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.29425114" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
@@ -1223,8 +1339,8 @@
       <window_info id="Android" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="15" side_tool="false" content_ui="tabs" />
       <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="true" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32980332" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
     </layout-to-restore>
   </component>
@@ -1243,7 +1359,6 @@
     <option name="myTodoPanelSettings">
       <TodoPanelSettings />
     </option>
-    <MESSAGE value="修改人员入廊记录表和功能" />
     <MESSAGE value="Merge remote-tracking branch 'origin/develop' into develop&#10;&#10;Conflicts:&#10;&#9;.idea/workspace.xml&#10;&#9;~$数据库设计说明新需求.docx&#10;&#9;管廊数据库设计说明新需求.docx&#10;" />
     <MESSAGE value="增加统计功能" />
     <MESSAGE value="修改标注" />
@@ -1268,7 +1383,8 @@
     <MESSAGE value="新增维护类别" />
     <MESSAGE value="修改施工数据新增删除编辑" />
     <MESSAGE value="新增工器具耗材" />
-    <option name="LAST_COMMIT_MESSAGE" value="新增工器具耗材" />
+    <MESSAGE value="根据华锐王工反馈测试，修改接口" />
+    <option name="LAST_COMMIT_MESSAGE" value="根据华锐王工反馈测试，修改接口" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1291,14 +1407,8 @@
           <properties />
           <option name="timeStamp" value="359" />
         </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java</url>
-          <line>190</line>
-          <properties />
-          <option name="timeStamp" value="360" />
-        </line-breakpoint>
       </breakpoints>
-      <option name="time" value="390" />
+      <option name="time" value="399" />
     </breakpoint-manager>
   </component>
   <component name="antWorkspaceConfiguration">
@@ -1306,163 +1416,10 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="3119" max-vertical-offset="7128">
-          <caret line="30" column="52" selection-start-line="30" selection-start-column="52" selection-end-line="30" selection-end-column="52" />
-          <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 vertical-scroll-proportion="0.0" vertical-offset="5071" max-vertical-offset="5918">
-          <caret line="268" column="24" selection-start-line="268" selection-start-column="24" selection-end-line="268" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="13" max-vertical-offset="3058">
-          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.5529623" vertical-offset="528" max-vertical-offset="3014">
-          <caret line="26" column="0" selection-start-line="26" selection-start-column="0" selection-end-line="26" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainTypeDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.33213645" vertical-offset="101" max-vertical-offset="1012">
-          <caret line="15" column="11" selection-start-line="15" selection-start-column="11" selection-end-line="15" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="609" max-vertical-offset="1958">
-          <caret line="39" column="50" selection-start-line="39" selection-start-column="50" selection-end-line="39" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.7271095" vertical-offset="167" max-vertical-offset="1342">
-          <caret line="35" column="0" selection-start-line="35" selection-start-column="0" selection-end-line="35" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.63195693" vertical-offset="0" max-vertical-offset="1452">
-          <caret line="19" column="0" selection-start-line="19" selection-start-column="0" selection-end-line="19" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintainDoc.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.69669116" vertical-offset="61" max-vertical-offset="1320">
-          <caret line="24" column="0" selection-start-line="24" selection-start-column="0" selection-end-line="24" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDocDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.27648115" vertical-offset="0" max-vertical-offset="1342">
-          <caret line="9" column="13" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-7.551724" vertical-offset="3125" max-vertical-offset="4048">
-          <caret line="249" column="85" selection-start-line="249" selection-start-column="85" selection-end-line="249" selection-end-column="85" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-9.862069" vertical-offset="3674" max-vertical-offset="5610">
-          <caret line="203" column="58" selection-start-line="203" selection-start-column="58" selection-end-line="203" selection-end-column="58" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.31597847" vertical-offset="0" max-vertical-offset="557">
-          <caret line="8" column="35" selection-start-line="8" selection-start-column="35" selection-end-line="8" selection-end-column="35" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.66360295" vertical-offset="783" max-vertical-offset="3234">
-          <caret line="68" column="71" selection-start-line="68" selection-start-column="71" selection-end-line="68" selection-end-column="71" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="33" max-vertical-offset="968">
-          <caret line="33" column="62" selection-start-line="33" selection-start-column="62" selection-end-line="33" selection-end-column="62" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://C:/Program Files/Java/jdk1.8.0_131/src.zip!/java/lang/NumberFormatException.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.6285178" vertical-offset="479" max-vertical-offset="1012">
-          <caret line="64" column="0" selection-start-line="64" selection-start-column="0" selection-end-line="64" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-tx/4.0.6.RELEASE/spring-tx-4.0.6.RELEASE-sources.jar!/org/springframework/transaction/interceptor/TransactionAspectSupport.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.23639774" vertical-offset="4736" max-vertical-offset="13244">
-          <caret line="263" column="0" selection-start-line="263" selection-start-column="0" selection-end-line="263" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.2504817" vertical-offset="618" max-vertical-offset="1320">
-          <caret line="35" column="28" selection-start-line="35" selection-start-column="28" selection-end-line="35" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://C:/Program Files/Java/jdk1.8.0_131/src.zip!/java/util/ArrayList.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.73967683" vertical-offset="13360" max-vertical-offset="30690">
-          <caret line="663" column="7" selection-start-line="663" selection-start-column="7" selection-end-line="663" selection-end-column="7" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/StringUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.15798923" vertical-offset="330" max-vertical-offset="2178">
-          <caret line="31" column="29" selection-start-line="31" selection-start-column="29" selection-end-line="31" selection-end-column="29" />
-          <folding />
-        </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 vertical-scroll-proportion="0.11143695" vertical-offset="1854" max-vertical-offset="5170">
-          <caret line="103" column="65" selection-start-line="103" selection-start-column="65" selection-end-line="103" selection-end-column="65" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="jar://C:/Program Files/Java/jdk1.8.0_131/src.zip!/java/util/concurrent/ThreadPoolExecutor.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="1.659824" vertical-offset="23436" max-vertical-offset="44594">
           <caret line="1148" column="31" selection-start-line="1148" selection-start-column="31" selection-end-line="1148" selection-end-column="31" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1470,17 +1427,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.2404692" vertical-offset="9532" max-vertical-offset="12958">
           <caret line="497" column="0" selection-start-line="497" selection-start-column="0" selection-end-line="497" selection-end-column="0" />
-          <folding />
-        </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 vertical-scroll-proportion="0.0" vertical-offset="4977" max-vertical-offset="8316">
-          <caret line="263" column="24" selection-start-line="263" selection-start-column="24" selection-end-line="263" selection-end-column="24" />
-          <folding>
-            <element signature="e#10383#10401#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1488,7 +1434,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-2.1782365" vertical-offset="1359" max-vertical-offset="1892">
           <caret line="24" column="13" selection-start-line="24" selection-start-column="13" selection-end-line="24" selection-end-column="13" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1496,7 +1441,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-1.4093357" vertical-offset="1907" max-vertical-offset="2464">
           <caret line="65" column="60" selection-start-line="65" selection-start-column="11" selection-end-line="65" selection-end-column="60" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1504,10 +1448,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-0.011029412" vertical-offset="2228" max-vertical-offset="2838">
           <caret line="111" column="47" selection-start-line="111" selection-start-column="47" selection-end-line="111" selection-end-column="47" />
-          <folding>
-            <marker date="1535944027199" expanded="true" signature="-1:-1" placeholder="select devic..PG_DEVICE..." />
-            <marker date="1535944027199" expanded="true" signature="-1:-1" placeholder="select * fro..PG_DEVICE..." />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1515,7 +1455,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.76301616" vertical-offset="1687" max-vertical-offset="2376">
           <caret line="143" column="16" selection-start-line="143" selection-start-column="16" selection-end-line="143" selection-end-column="16" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1523,7 +1462,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.88509876" vertical-offset="519" max-vertical-offset="1342">
           <caret line="68" column="0" selection-start-line="68" selection-start-column="0" selection-end-line="68" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1531,7 +1469,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.43267503" vertical-offset="23" max-vertical-offset="1672">
           <caret line="15" column="33" selection-start-line="15" selection-start-column="33" selection-end-line="15" selection-end-column="33" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1540,42 +1477,8 @@
         <state vertical-scroll-proportion="0.5257353" vertical-offset="0" max-vertical-offset="4972">
           <caret line="30" column="0" selection-start-line="30" selection-start-column="0" selection-end-line="30" selection-end-column="0" />
           <folding>
-            <element signature="e#3701#3720#0" expanded="true" />
-            <element signature="e#4190#4208#0" expanded="true" />
-            <marker date="1536211271563" expanded="true" signature="-1:-1" placeholder="select count..PG_CONSTRUCTION..." />
-            <marker date="1536211271563" expanded="true" signature="-1:-1" placeholder="select count..Pg_Construction..." />
-            <marker date="1536211271563" expanded="true" signature="-1:-1" placeholder="SELECT t.ID,..PG_CONSTRUCTION..." />
-            <marker date="1536211271563" expanded="true" signature="-1:-1" placeholder="SELECT m.PAR..PG_PARTITION..." />
-            <marker date="1536211271563" expanded="true" signature="-1:-1" placeholder="SELECT n.TYP..PG_CONSTRUCTION_TYPE..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.40754038" vertical-offset="675" max-vertical-offset="1540">
-          <caret line="108" column="52" selection-start-line="108" selection-start-column="52" selection-end-line="108" selection-end-column="52" />
-          <folding>
-            <element signature="method#saveFiles#0;class#PgCsDocumentManager#0" expanded="false" />
-            <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" expanded="false" />
-            <element signature="e#3728#3745#0" expanded="true" />
-            <marker date="1536205913620" expanded="true" signature="-1:-1" placeholder="select * fro..PG_CSDOCUMENT..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.41666666" vertical-offset="2772" max-vertical-offset="3674">
-          <caret line="192" column="13" selection-start-line="192" selection-start-column="13" selection-end-line="192" selection-end-column="13" />
-          <folding>
-            <element signature="method#setPgCsDocumentManager#0;class#PgCsDocumentRs#0" expanded="false" />
-            <element signature="method#setPgConstructionManager#0;class#PgCsDocumentRs#0" expanded="false" />
-            <element signature="e#2023#2039#0" expanded="true" />
-            <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" expanded="false" />
-            <element signature="e#6060#6076#0" expanded="true" />
-            <element signature="e#6145#6162#0" expanded="true" />
-            <element signature="method#downloadFile#0;class#PgCsDocumentRs#0" expanded="false" />
+            <element signature="e#3701#3720#0" expanded="false" />
+            <element signature="e#4190#4208#0" expanded="false" />
           </folding>
         </state>
       </provider>
@@ -1584,24 +1487,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.9640933" vertical-offset="1091" max-vertical-offset="2112">
           <caret line="83" column="62" selection-start-line="83" selection-start-column="62" selection-end-line="83" selection-end-column="62" />
-          <folding>
-            <element signature="e#2170#2184#0" expanded="true" />
-            <marker date="1536213480710" expanded="true" signature="-1:-1" placeholder="select count..PG_ALARM..." />
-            <marker date="1536213480710" expanded="true" signature="-1:-1" placeholder="select count..PG_ALARM..." />
-            <marker date="1536213480710" expanded="true" signature="-1:-1" placeholder="select count..PG_ALARM..." />
-            <marker date="1536213480710" expanded="true" signature="-1:-1" placeholder="select count..PG_ALARM..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.41666666" vertical-offset="990" max-vertical-offset="1672">
-          <caret line="72" column="55" selection-start-line="72" selection-start-column="55" selection-end-line="72" selection-end-column="55" />
-          <folding>
-            <element signature="e#2152#2168#0" expanded="false" />
-            <element signature="e#2257#2271#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1609,10 +1494,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.75" vertical-offset="440" max-vertical-offset="3938">
           <caret line="62" column="13" selection-start-line="62" selection-start-column="13" selection-end-line="62" selection-end-column="13" />
-          <folding>
-            <element signature="e#1393#1394#0" expanded="false" />
-            <element signature="e#1451#1452#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1620,7 +1501,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.35547575" vertical-offset="0" max-vertical-offset="1012">
           <caret line="18" column="0" selection-start-line="18" selection-start-column="0" selection-end-line="18" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1628,9 +1508,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.45421904" vertical-offset="2145" max-vertical-offset="3608">
           <caret line="125" column="29" selection-start-line="125" selection-start-column="29" selection-end-line="125" selection-end-column="29" />
-          <folding>
-            <element signature="e#3094#3110#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1638,7 +1515,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.513465" vertical-offset="0" max-vertical-offset="1276">
           <caret line="22" column="51" selection-start-line="22" selection-start-column="51" selection-end-line="22" selection-end-column="51" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1646,7 +1522,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.5924596" vertical-offset="0" max-vertical-offset="1254">
           <caret line="20" column="28" selection-start-line="20" selection-start-column="28" selection-end-line="20" selection-end-column="28" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1654,18 +1529,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-3.3052065" vertical-offset="4063" max-vertical-offset="4620">
           <caret line="115" column="15" selection-start-line="115" selection-start-column="15" selection-end-line="115" selection-end-column="15" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.20833333" vertical-offset="1892" max-vertical-offset="3850">
-          <caret line="152" column="24" selection-start-line="152" selection-start-column="24" selection-end-line="152" selection-end-column="24" />
-          <folding>
-            <element signature="method#addReservePlan#0;class#PgReservePlanRs#0" expanded="false" />
-            <element signature="e#3206#3222#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1673,7 +1536,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.06147541" vertical-offset="183" max-vertical-offset="506">
           <caret line="10" column="0" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1681,7 +1543,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="3388">
           <caret line="39" column="56" selection-start-line="39" selection-start-column="56" selection-end-line="39" selection-end-column="56" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1689,22 +1550,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.33213645" vertical-offset="959" max-vertical-offset="2508">
           <caret line="71" column="36" selection-start-line="71" selection-start-column="36" selection-end-line="71" selection-end-column="36" />
-          <folding>
-            <marker date="1536217243963" expanded="true" signature="-1:-1" placeholder="select count..PG_RESERVE_PLAN..." />
-          </folding>
-        </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 vertical-scroll-proportion="0.46401516" vertical-offset="1273" max-vertical-offset="1980">
-          <caret line="106" column="70" selection-start-line="106" selection-start-column="70" selection-end-line="106" selection-end-column="70" />
-          <folding>
-            <element signature="imports" expanded="false" />
-            <element signature="method#linkDevice#0;class#PgAlarmLinkRs#0" expanded="false" />
-            <element signature="e#1459#1475#0" expanded="false" />
-            <element signature="method#linkPartitionDevice#0;class#PgAlarmLinkRs#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1712,7 +1557,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.35906643" vertical-offset="1164" max-vertical-offset="3388">
           <caret line="80" column="23" selection-start-line="80" selection-start-column="23" selection-end-line="80" selection-end-column="23" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1720,7 +1564,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.625" vertical-offset="1364" max-vertical-offset="4158">
           <caret line="99" column="37" selection-start-line="99" selection-start-column="37" selection-end-line="99" selection-end-column="37" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1728,7 +1571,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="1553" max-vertical-offset="2134">
           <caret line="98" column="16" selection-start-line="98" selection-start-column="16" selection-end-line="98" selection-end-column="16" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1736,9 +1578,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="837" max-vertical-offset="1276">
           <caret line="59" column="0" selection-start-line="59" selection-start-column="0" selection-end-line="59" selection-end-column="0" />
-          <folding>
-            <element signature="e#1980#1990#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1746,10 +1585,259 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.24955116" vertical-offset="631" max-vertical-offset="1232">
           <caret line="58" column="34" selection-start-line="58" selection-start-column="34" selection-end-line="58" selection-end-column="34" />
+        </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 vertical-scroll-proportion="0.0" vertical-offset="6759" max-vertical-offset="8316">
+          <caret line="268" column="42" selection-start-line="268" selection-start-column="42" selection-end-line="268" selection-end-column="42" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.8779174" vertical-offset="347" max-vertical-offset="2662">
+          <caret line="54" column="9" selection-start-line="54" selection-start-column="9" selection-end-line="54" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="1.9353681" vertical-offset="0" max-vertical-offset="4906">
+          <caret line="70" column="71" selection-start-line="70" selection-start-column="66" selection-end-line="70" selection-end-column="75" />
+        </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 vertical-scroll-proportion="0.32854578" vertical-offset="1115" max-vertical-offset="1672">
+          <caret line="76" column="33" selection-start-line="76" selection-start-column="33" selection-end-line="76" selection-end-column="33" />
+        </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 vertical-scroll-proportion="3.1723518" vertical-offset="81" max-vertical-offset="2354">
+          <caret line="104" column="12" selection-start-line="104" selection-start-column="12" selection-end-line="104" selection-end-column="12" />
           <folding />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.5260323" vertical-offset="4239" max-vertical-offset="4796">
+          <caret line="224" column="0" selection-start-line="224" selection-start-column="0" selection-end-line="224" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.6445242" vertical-offset="1709" max-vertical-offset="2332">
+          <caret line="111" column="53" selection-start-line="111" selection-start-column="53" selection-end-line="111" selection-end-column="53" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-3.5421903" vertical-offset="5515" max-vertical-offset="6072">
+          <caret line="184" column="25" selection-start-line="184" selection-start-column="25" selection-end-line="184" selection-end-column="25" />
+        </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 vertical-scroll-proportion="-0.78994614" vertical-offset="924" max-vertical-offset="7128">
+          <caret line="41" column="5" selection-start-line="41" selection-start-column="5" selection-end-line="41" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.4344704" vertical-offset="748" max-vertical-offset="1474">
+          <caret line="72" column="0" selection-start-line="72" selection-start-column="0" selection-end-line="72" selection-end-column="0" />
+        </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 vertical-scroll-proportion="0.0" vertical-offset="264" max-vertical-offset="1782">
+          <caret line="37" column="57" selection-start-line="37" selection-start-column="57" selection-end-line="37" selection-end-column="57" />
+          <folding>
+            <marker date="1531722832731" expanded="true" signature="-1:-1" placeholder="select id,CH..PG_CH4..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2420">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://C:/Program Files/Java/jdk1.8.0_131/src.zip!/java/sql/Timestamp.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33027524" vertical-offset="4606" max-vertical-offset="12980">
+          <caret line="236" column="0" selection-start-line="236" selection-start-column="0" selection-end-line="236" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="2.2118492" vertical-offset="0" max-vertical-offset="1496">
+          <caret line="87" column="52" selection-start-line="87" selection-start-column="52" selection-end-line="87" selection-end-column="52" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.4901257" vertical-offset="79" max-vertical-offset="1298">
+          <caret line="25" column="25" selection-start-line="25" selection-start-column="25" selection-end-line="25" selection-end-column="25" />
+          <folding>
+            <marker date="1537412037475" expanded="true" signature="-1:-1" placeholder="select equip..PG_EQUIPMENT..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.8330341" vertical-offset="680" max-vertical-offset="4466">
+          <caret line="68" column="29" selection-start-line="68" selection-start-column="29" selection-end-line="68" selection-end-column="29" />
+          <folding>
+            <element signature="e#1490#1506#0" expanded="true" />
+            <element signature="e#6332#6348#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgEquipment.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.3680431" vertical-offset="191" max-vertical-offset="1540">
+          <caret line="20" column="17" selection-start-line="20" selection-start-column="17" selection-end-line="20" selection-end-column="17" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/4.3.6.Final/hibernate-core-4.3.6.Final-sources.jar!/org/hibernate/internal/AbstractQueryImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33333334" vertical-offset="18814" max-vertical-offset="20328">
+          <caret line="974" column="0" selection-start-line="974" selection-start-column="0" selection-end-line="974" selection-end-column="0" />
+          <folding />
+        </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 vertical-scroll-proportion="0.5924596" vertical-offset="0" max-vertical-offset="1980">
+          <caret line="18" column="32" selection-start-line="18" selection-start-column="32" selection-end-line="18" selection-end-column="32" />
+          <folding />
+        </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 vertical-scroll-proportion="0.7109515" vertical-offset="0" max-vertical-offset="704">
+          <caret line="18" column="31" selection-start-line="18" selection-start-column="31" selection-end-line="18" selection-end-column="31" />
+          <folding>
+            <element signature="e#213#214#0" expanded="true" />
+            <element signature="e#244#245#0" expanded="true" />
+            <element signature="e#292#293#0" expanded="true" />
+            <element signature="e#332#333#0" expanded="true" />
+            <element signature="e#394#395#0" expanded="true" />
+            <element signature="e#438#439#0" expanded="true" />
+            <element signature="e#474#475#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://C:/Program Files/Java/jdk1.8.0_131/src.zip!/java/lang/String.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.21139705" vertical-offset="1469" max-vertical-offset="67452">
+          <caret line="107" column="16" selection-start-line="107" selection-start-column="12" selection-end-line="107" selection-end-column="16" />
+          <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 vertical-scroll-proportion="0.0" vertical-offset="2301" max-vertical-offset="3388">
+          <caret line="277" column="9" selection-start-line="277" selection-start-column="9" selection-end-line="277" selection-end-column="9" />
+          <folding>
+            <element signature="method#addLog#0;class#PgPipeLineRs#0" expanded="false" />
+            <element signature="method#editPipeLine#0;class#PgPipeLineRs#0" expanded="false" />
+            <element signature="method#deletePipeLine#0;class#PgPipeLineRs#0" expanded="false" />
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" expanded="false" />
+            <element signature="e#9602#9626#0" expanded="true" />
+            <element signature="e#10329#10337#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.43727598" vertical-offset="120" max-vertical-offset="1122">
+          <caret line="13" column="34" selection-start-line="13" selection-start-column="34" selection-end-line="13" selection-end-column="34" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.8547855" vertical-offset="137" max-vertical-offset="704">
+          <caret line="18" column="31" selection-start-line="18" selection-start-column="31" selection-end-line="18" selection-end-column="31" />
+          <folding>
+            <element signature="e#204#205#0" expanded="true" />
+            <element signature="e#233#234#0" expanded="true" />
+            <element signature="e#277#278#0" expanded="true" />
+            <element signature="e#313#314#0" expanded="true" />
+            <element signature="e#375#376#0" expanded="true" />
+            <element signature="e#419#420#0" expanded="true" />
+            <element signature="e#455#456#0" expanded="true" />
+          </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 vertical-scroll-proportion="0.0" vertical-offset="330" max-vertical-offset="1342">
+          <caret line="55" column="42" selection-start-line="55" selection-start-column="42" selection-end-line="55" selection-end-column="42" />
+          <folding>
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" expanded="false" />
+            <element signature="e#1787#1811#0" expanded="true" />
+            <element signature="e#2482#2490#0" expanded="true" />
+            <marker date="1537414540748" expanded="true" signature="1552:1622" placeholder="select LINE_..PG_PIPELINE..." />
+            <marker date="1537414540748" expanded="true" signature="1552:1621" placeholder="select LINE_..PG_PIPELINE..." />
+            <marker date="1537414540748" expanded="true" signature="2310:2352" placeholder="select disti..PG_PIPELINE..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="849" max-vertical-offset="1650">
+          <caret line="61" column="56" selection-start-line="61" selection-start-column="56" selection-end-line="61" selection-end-column="56" />
+          <folding>
+            <element signature="e#2433#2452#0" expanded="true" />
+            <marker date="1537414756878" expanded="true" signature="2209:2277" placeholder="select PG_NA..PG_PIPE_GALLERY..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.7140151" vertical-offset="4067" max-vertical-offset="4752">
+          <caret line="221" column="27" selection-start-line="221" selection-start-column="27" selection-end-line="221" selection-end-column="27" />
+          <folding>
+            <element signature="e#6945#6964#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java
index 238bc39..6256b9d 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java
@@ -78,7 +78,7 @@
     public PgEquipmentDto(PgEquipment equipment) {
         if (equipment == null) return;
 
-        SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 
         this.setId(equipment.getId());
         this.setEqName(equipment.getEqName());
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineLengthStatic.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineLengthStatic.java
new file mode 100644
index 0000000..a25538f
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineLengthStatic.java
@@ -0,0 +1,26 @@
+package com.casic.PgInterface.devTable.dto;
+
+/**
+ * Created by yxw on 2018/9/20.
+ */
+public class PgPipeLineLengthStatic {
+
+    private String lineType;
+    private String length;
+
+    public String getLineType() {
+        return lineType;
+    }
+
+    public void setLineType(String lineType) {
+        this.lineType = lineType;
+    }
+
+    public String getLength() {
+        return length;
+    }
+
+    public void setLength(String length) {
+        this.length = length;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.java b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.java
new file mode 100644
index 0000000..bd65ff4
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.java
@@ -0,0 +1,26 @@
+package com.casic.PgInterface.devTable.dto;
+
+/**
+ * Created by yxw on 2018/9/20.
+ */
+public class PipeGalleryStatic {
+
+    private String pgName;
+    private String length;
+
+    public String getPgName() {
+        return pgName;
+    }
+
+    public void setPgName(String pgName) {
+        this.pgName = pgName;
+    }
+
+    public String getLength() {
+        return length;
+    }
+
+    public void setLength(String length) {
+        this.length = length;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
index e46742c..ab0908b 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
@@ -23,7 +23,7 @@
         criteria.add(Restrictions.eq("eqCode", eqCode));
         criteria.add(Restrictions.eq("active",1));
 
-        List<PgEquipment> pgEquipmentList = criteria.list();
+        List<PgEquipment> pgEquipmentList = (List<PgEquipment>)criteria.list();
 
         if(pgEquipmentList!=null&&pgEquipmentList.size()!=0)
             return pgEquipmentList.get(0);
@@ -49,10 +49,10 @@
 
     //统计工器具耗材数量
     public List<PgDeviceTypeStatisticDto> getDeviceStatisticByDevType(String eqType){
-        String eqType1=eqType.equals("0")?"工器具":"耗材";
+        //String eqType1=eqType.equals("0")?"工器具":"耗材";
 
         String hql="select equipment.EQ_NAME,count(*) from PG_EQUIPMENT equipment where equipment.EQ_TYPE = '"
-        +eqType1+"' group by equipment.EQ_NAME";
+        +eqType+"' group by equipment.EQ_NAME";
 
         List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list();
 
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 8d8db5d..4cfa880 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
@@ -3,6 +3,7 @@
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
 import com.casic.PgInterface.devTable.domain.PgPipeLine;
 import com.casic.PgInterface.devTable.dto.PgPipeLineDto;
+import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
@@ -39,13 +40,35 @@
         return pgPipeLineDtoList;
     }
 
-   public String getPipeLengthByName(String lineType) {
-       String sql = "select SUM(PIPE_LENGTH) from PG_PIPELINE where LINE_TYPE = '" + lineType + "'";
+    public List<PgPipeLineLengthStatic> getPipeLengthByName() {
+        String sql = "select LINE_TYPE,SUM(PIPE_LENGTH) from PG_PIPELINE group by LINE_TYPE ";
 
-       String sumLength = String.valueOf(this.getSession().createSQLQuery(sql).uniqueResult());
+        List<Object[]> objectList = this.getSession().createSQLQuery(sql).list();
+        List<PgPipeLineLengthStatic> pgPipeLineLengthStaticList = new ArrayList<PgPipeLineLengthStatic>();
 
-       return sumLength;
-   }
+        for(Object[] objectArray : objectList)
+        {
+            PgPipeLineLengthStatic pgPipeLineLengthStatic=new PgPipeLineLengthStatic();
+            pgPipeLineLengthStatic.setLineType(String.valueOf(objectArray[0]));
+            pgPipeLineLengthStatic.setLength(String.valueOf(objectArray[1]));
+            pgPipeLineLengthStaticList.add(pgPipeLineLengthStatic);
+        }
+        return pgPipeLineLengthStaticList;
+    }
+
+    public  List<String> getPipeType() {
+        String sql = "select distinct LINE_TYPE from PG_PIPELINE";
+
+        List<Object> objectList = this.getSession().createSQLQuery(sql).list();
+
+        List<String> stringList=new ArrayList<String>();
+
+        for(Object ob : objectList)
+        {
+            stringList.add(String.valueOf(ob));
+        }
+        return stringList;
+    }
 
 }
 
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java
index 41f0e64..375c078 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java
@@ -4,6 +4,7 @@
 import com.casic.PgInterface.devTable.domain.PgPartition;
 import com.casic.PgInterface.devTable.domain.PipeGallery;
 import com.casic.PgInterface.devTable.dto.PipeGalleryDto;
+import com.casic.PgInterface.devTable.dto.PipeGalleryStatic;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
@@ -58,13 +59,21 @@
         return pipeGalleryDtoList;
     }
 
-    public String getPgLengthByName(String pgName) {
+    public List<PipeGalleryStatic> getPgLengthByName() {
 
-        String sql = "select SUM(PAR_LENGTH) from PG_PIPE_GALLERY where PG_NAME = '" + pgName + "'";
+        String sql = "select PG_NAME,SUM(PAR_LENGTH) from PG_PIPE_GALLERY group by PG_NAME ";
 
-        String sumLength = String.valueOf(this.getSession().createSQLQuery(sql).uniqueResult());
+        List<Object[]> objectList = this.getSession().createSQLQuery(sql).list();
+        List<PipeGalleryStatic> pipeGalleryStaticList = new ArrayList<PipeGalleryStatic>();
 
-        return sumLength;
+        for(Object[] objectArray : objectList)
+        {
+            PipeGalleryStatic pipeGalleryStatic=new PipeGalleryStatic();
+            pipeGalleryStatic.setPgName(String.valueOf(objectArray[0]));
+            pipeGalleryStatic.setLength(String.valueOf(objectArray[1]));
+            pipeGalleryStaticList.add(pipeGalleryStatic);
+        }
+        return pipeGalleryStaticList;
     }
 
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
index 251c9d2..fc1f05f 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
@@ -44,7 +44,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
-        SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 
         try {
             if (pgEquipmentManager.getEquipmentByCode(eqCode)!=null) {
@@ -92,7 +92,7 @@
         HashMap<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
         String result = "";
-        SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 
         try {
             PgEquipment pgEquipment=pgEquipmentManager.get(id);
@@ -211,4 +211,4 @@
         return resultMap;
     }
 
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
index 3da622c..41f7374 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
@@ -4,6 +4,7 @@
 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.manager.PgPartitionManager;
 import com.casic.PgInterface.devTable.manager.PgPipeLineManager;
 import com.casic.PgInterface.devTable.manager.PipeGalleryManager;
@@ -261,14 +262,14 @@
      * 根据管线类型获取管线长度
      */
     @POST
-    @Path("getPipeLengthByName")
+    @Path("getPipeLengthStatic")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String,Object> getPipeLengthByName(@FormParam("lineType") String lineType)throws Exception{
+    public Map<String,Object> getPipeLengthStatic()throws Exception{
         Map<String, Object> resultMap = new HashMap<String, Object>();
-        String result = "";
         String msg = "";
+        List<PgPipeLineLengthStatic> pgPipeLineLengthStaticList=new ArrayList<PgPipeLineLengthStatic>();
         try {
-            result = pgPipeLineManager.getPipeLengthByName(lineType);
+            pgPipeLineLengthStaticList = pgPipeLineManager.getPipeLengthByName();
             msg="管线长度获取成功";
         }catch(Exception e)
         {
@@ -276,9 +277,32 @@
             msg="管线长度统计失败";
         }
         resultMap.put("msg",msg);
-        resultMap.put("result",result);
+        resultMap.put("result",pgPipeLineLengthStaticList);
 
         return resultMap;
     }
 
-}
+    /**
+     * 根据管线名称获取管线信息
+     */
+    @POST
+    @Path("getPipeLineType")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String, Object> getPipeLineType()
+            throws Exception {
+        Map<String, Object> resultMap = new HashMap<String, Object>();
+        String msg = "";
+        List<String> stringList=new ArrayList<String>();
+        try {
+            stringList = pgPipeLineManager.getPipeType();
+            msg = "获取成功";
+        } catch (Exception e) {
+            msg = "获取失败";
+            e.printStackTrace();
+        }
+        resultMap.put("msg", msg);
+        resultMap.put("result", stringList);
+        return resultMap;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java b/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java
index 1d21e60..3c301bc 100644
--- a/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java
@@ -3,6 +3,7 @@
 import com.casic.PgInterface.devTable.domain.PgPartition;
 import com.casic.PgInterface.devTable.domain.PipeGallery;
 import com.casic.PgInterface.devTable.dto.PipeGalleryDto;
+import com.casic.PgInterface.devTable.dto.PipeGalleryStatic;
 import com.casic.PgInterface.devTable.manager.PgPartitionManager;
 import com.casic.PgInterface.devTable.manager.PipeGalleryManager;
 import org.slf4j.Logger;
@@ -202,19 +203,17 @@
      * 获取管廊仓体的长度
      */
     @POST
-    @Path("getPgLengthByName")
+    @Path("getPgLengthStatic")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String,Object> getPgLengthByName(@FormParam("pgName") String pgName)
+    public Map<String,Object> getPgLengthStatic()
     {
         Map<String,Object> resultMap=new HashMap<String, Object>();
-        String result="";
+        List<PipeGalleryStatic> pipeGalleryStaticList=new ArrayList<PipeGalleryStatic>();
         String msg="";
 
         try{
-            result=pipeGalleryManager.getPgLengthByName(pgName);
-            if(result=="null")
-                msg="不存在管廊仓："+pgName;
-            else
+            pipeGalleryStaticList=pipeGalleryManager.getPgLengthByName();
+
             msg="仓体长度获取成功";
         }
         catch(Exception e)
@@ -224,7 +223,7 @@
         }
 
         resultMap.put("msg",msg);
-        resultMap.put("result",result);
+        resultMap.put("result",pipeGalleryStaticList);
 
         return resultMap;
     }

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 73b1050..7a80a23 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,34 +2,17 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="">
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\~$数据库设计说明新需求.docx" afterPath="" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/~$数据库设计说明新需求.docx" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineLengthStatic.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/接口说明新需求.docx" afterPath="$PROJECT_DIR$/接口说明新需求.docx" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainTypeManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainTypeManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources/application.properties" afterPath="$PROJECT_DIR$/src/main/resources/application.properties" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
     </list>
     <ignored path="PgInterface.iws" />
@@ -54,7 +37,67 @@
     <favorites_list name="PgInterface" />
   </component>
   <component name="FileEditorManager">
-    <leaf />
+    <leaf>
+      <file leaf-file-name="PgPipeLineRs.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.0" vertical-offset="2301" max-vertical-offset="3388">
+              <caret line="277" column="9" selection-start-line="277" selection-start-column="9" selection-end-line="277" selection-end-column="9" />
+              <folding>
+                <element signature="method#addLog#0;class#PgPipeLineRs#0" expanded="false" />
+                <element signature="method#editPipeLine#0;class#PgPipeLineRs#0" expanded="false" />
+                <element signature="method#deletePipeLine#0;class#PgPipeLineRs#0" expanded="false" />
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" expanded="false" />
+                <element signature="e#9602#9626#0" expanded="true" />
+                <element signature="e#10329#10337#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="PgPipeLineManager.java" pinned="false" current="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 vertical-scroll-proportion="0.0" vertical-offset="330" max-vertical-offset="1342">
+              <caret line="55" column="42" selection-start-line="55" selection-start-column="42" selection-end-line="55" selection-end-column="42" />
+              <folding>
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" expanded="false" />
+                <element signature="e#1787#1811#0" expanded="true" />
+                <element signature="e#2482#2490#0" expanded="true" />
+                <marker date="1537414540748" expanded="true" signature="1552:1622" placeholder="select LINE_..PG_PIPELINE..." />
+                <marker date="1537414540748" expanded="true" signature="1552:1621" placeholder="select LINE_..PG_PIPELINE..." />
+                <marker date="1537414540748" expanded="true" signature="2310:2352" placeholder="select disti..PG_PIPELINE..." />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="PipeGalleryRs.java" pinned="false" current="true" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.7140151" vertical-offset="4067" max-vertical-offset="4752">
+              <caret line="221" column="27" selection-start-line="221" selection-start-column="27" selection-end-line="221" selection-end-column="27" />
+              <folding>
+                <element signature="e#6945#6964#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="PipeGalleryManager.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.0" vertical-offset="849" max-vertical-offset="1650">
+              <caret line="61" column="56" selection-start-line="61" selection-start-column="56" selection-end-line="61" selection-end-column="56" />
+              <folding>
+                <element signature="e#2433#2452#0" expanded="true" />
+                <marker date="1537414756878" expanded="true" signature="2209:2277" placeholder="select PG_NA..PG_PIPE_GALLERY..." />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+    </leaf>
   </component>
   <component name="FindManager">
     <FindUsagesManager>
@@ -72,9 +115,6 @@
   <component name="IdeDocumentHistory">
     <option name="changedFiles">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
         <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/manager/PgInPgPersonManager.java" />
@@ -86,23 +126,16 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintainType.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/manager/PgPipeLineManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/EquipmentManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgEquipment.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.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/rs/PgPartitionRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.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/PgDeviceTypeRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
         <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.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/PgMaintainTypeRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainTypeManager.java" />
@@ -123,6 +156,16 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.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/dto/PgPipeLineLengthStatic.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/dto/PipeGalleryDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.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" />
       </list>
     </option>
   </component>
@@ -216,7 +259,20 @@
       <sortByType />
     </navigator>
     <panes>
-      <pane id="Scope" />
+      <pane id="PackagesPane">
+        <subPane>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
+            </PATH_ELEMENT>
+          </PATH>
+        </subPane>
+      </pane>
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -331,22 +387,73 @@
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
-        </subPane>
-      </pane>
-      <pane id="PackagesPane">
-        <subPane>
           <PATH>
             <PATH_ELEMENT>
               <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
               <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="devTable" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="devTable" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="dto" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
         </subPane>
       </pane>
+      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -916,7 +1023,12 @@
       <workItem from="1535958569443" duration="219000" />
       <workItem from="1536111554952" duration="23051000" />
       <workItem from="1536143316539" duration="3706000" />
-      <workItem from="1536195067076" duration="23441000" />
+      <workItem from="1536195067076" duration="23586000" />
+      <workItem from="1536802841385" duration="18000" />
+      <workItem from="1537167144071" duration="1232000" />
+      <workItem from="1537236948589" duration="156000" />
+      <workItem from="1537237991303" duration="1733000" />
+      <workItem from="1537407751831" duration="6397000" />
     </task>
     <task id="LOCAL-00001" summary="first commit">
       <created>1510219102698</created>
@@ -1126,11 +1238,15 @@
       <created>1535958368940</created>
       <updated>1535958368940</updated>
     </task>
-    <option name="localTasksCounter" value="53" />
+    <task id="LOCAL-00053" summary="根据华锐王工反馈测试，修改接口">
+      <created>1536224373164</created>
+      <updated>1536224373165</updated>
+    </task>
+    <option name="localTasksCounter" value="54" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="937579000" />
+    <option name="totallyTimeSpent" value="947260000" />
   </component>
   <component name="TodoView" selected-index="1">
     <todo-panel id="selected-file">
@@ -1165,7 +1281,7 @@
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.391453" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.66382253" sideWeight="0.81316185" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.7235495" sideWeight="0.81316185" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="true" content_ui="tabs" />
       <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.6757679" sideWeight="0.18683812" order="7" side_tool="true" content_ui="tabs" />
@@ -1177,8 +1293,8 @@
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24962178" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32980332" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32649574" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2526475" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32593855" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.28441754" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" />
@@ -1192,18 +1308,18 @@
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
     </layout>
     <layout-to-restore>
-      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.63418806" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
-      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
+      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.391453" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
       <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" />
-      <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.50341296" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
+      <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2962963" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
+      <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.52136755" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32649574" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.29425114" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
@@ -1223,8 +1339,8 @@
       <window_info id="Android" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="15" side_tool="false" content_ui="tabs" />
       <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="true" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32980332" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
     </layout-to-restore>
   </component>
@@ -1243,7 +1359,6 @@
     <option name="myTodoPanelSettings">
       <TodoPanelSettings />
     </option>
-    <MESSAGE value="修改人员入廊记录表和功能" />
     <MESSAGE value="Merge remote-tracking branch 'origin/develop' into develop&#10;&#10;Conflicts:&#10;&#9;.idea/workspace.xml&#10;&#9;~$数据库设计说明新需求.docx&#10;&#9;管廊数据库设计说明新需求.docx&#10;" />
     <MESSAGE value="增加统计功能" />
     <MESSAGE value="修改标注" />
@@ -1268,7 +1383,8 @@
     <MESSAGE value="新增维护类别" />
     <MESSAGE value="修改施工数据新增删除编辑" />
     <MESSAGE value="新增工器具耗材" />
-    <option name="LAST_COMMIT_MESSAGE" value="新增工器具耗材" />
+    <MESSAGE value="根据华锐王工反馈测试，修改接口" />
+    <option name="LAST_COMMIT_MESSAGE" value="根据华锐王工反馈测试，修改接口" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1291,14 +1407,8 @@
           <properties />
           <option name="timeStamp" value="359" />
         </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java</url>
-          <line>190</line>
-          <properties />
-          <option name="timeStamp" value="360" />
-        </line-breakpoint>
       </breakpoints>
-      <option name="time" value="390" />
+      <option name="time" value="399" />
     </breakpoint-manager>
   </component>
   <component name="antWorkspaceConfiguration">
@@ -1306,163 +1416,10 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="3119" max-vertical-offset="7128">
-          <caret line="30" column="52" selection-start-line="30" selection-start-column="52" selection-end-line="30" selection-end-column="52" />
-          <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 vertical-scroll-proportion="0.0" vertical-offset="5071" max-vertical-offset="5918">
-          <caret line="268" column="24" selection-start-line="268" selection-start-column="24" selection-end-line="268" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="13" max-vertical-offset="3058">
-          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.5529623" vertical-offset="528" max-vertical-offset="3014">
-          <caret line="26" column="0" selection-start-line="26" selection-start-column="0" selection-end-line="26" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainTypeDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.33213645" vertical-offset="101" max-vertical-offset="1012">
-          <caret line="15" column="11" selection-start-line="15" selection-start-column="11" selection-end-line="15" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="609" max-vertical-offset="1958">
-          <caret line="39" column="50" selection-start-line="39" selection-start-column="50" selection-end-line="39" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.7271095" vertical-offset="167" max-vertical-offset="1342">
-          <caret line="35" column="0" selection-start-line="35" selection-start-column="0" selection-end-line="35" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.63195693" vertical-offset="0" max-vertical-offset="1452">
-          <caret line="19" column="0" selection-start-line="19" selection-start-column="0" selection-end-line="19" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintainDoc.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.69669116" vertical-offset="61" max-vertical-offset="1320">
-          <caret line="24" column="0" selection-start-line="24" selection-start-column="0" selection-end-line="24" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDocDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.27648115" vertical-offset="0" max-vertical-offset="1342">
-          <caret line="9" column="13" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-7.551724" vertical-offset="3125" max-vertical-offset="4048">
-          <caret line="249" column="85" selection-start-line="249" selection-start-column="85" selection-end-line="249" selection-end-column="85" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-9.862069" vertical-offset="3674" max-vertical-offset="5610">
-          <caret line="203" column="58" selection-start-line="203" selection-start-column="58" selection-end-line="203" selection-end-column="58" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.31597847" vertical-offset="0" max-vertical-offset="557">
-          <caret line="8" column="35" selection-start-line="8" selection-start-column="35" selection-end-line="8" selection-end-column="35" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.66360295" vertical-offset="783" max-vertical-offset="3234">
-          <caret line="68" column="71" selection-start-line="68" selection-start-column="71" selection-end-line="68" selection-end-column="71" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="33" max-vertical-offset="968">
-          <caret line="33" column="62" selection-start-line="33" selection-start-column="62" selection-end-line="33" selection-end-column="62" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://C:/Program Files/Java/jdk1.8.0_131/src.zip!/java/lang/NumberFormatException.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.6285178" vertical-offset="479" max-vertical-offset="1012">
-          <caret line="64" column="0" selection-start-line="64" selection-start-column="0" selection-end-line="64" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-tx/4.0.6.RELEASE/spring-tx-4.0.6.RELEASE-sources.jar!/org/springframework/transaction/interceptor/TransactionAspectSupport.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.23639774" vertical-offset="4736" max-vertical-offset="13244">
-          <caret line="263" column="0" selection-start-line="263" selection-start-column="0" selection-end-line="263" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.2504817" vertical-offset="618" max-vertical-offset="1320">
-          <caret line="35" column="28" selection-start-line="35" selection-start-column="28" selection-end-line="35" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://C:/Program Files/Java/jdk1.8.0_131/src.zip!/java/util/ArrayList.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.73967683" vertical-offset="13360" max-vertical-offset="30690">
-          <caret line="663" column="7" selection-start-line="663" selection-start-column="7" selection-end-line="663" selection-end-column="7" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/StringUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.15798923" vertical-offset="330" max-vertical-offset="2178">
-          <caret line="31" column="29" selection-start-line="31" selection-start-column="29" selection-end-line="31" selection-end-column="29" />
-          <folding />
-        </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 vertical-scroll-proportion="0.11143695" vertical-offset="1854" max-vertical-offset="5170">
-          <caret line="103" column="65" selection-start-line="103" selection-start-column="65" selection-end-line="103" selection-end-column="65" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="jar://C:/Program Files/Java/jdk1.8.0_131/src.zip!/java/util/concurrent/ThreadPoolExecutor.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="1.659824" vertical-offset="23436" max-vertical-offset="44594">
           <caret line="1148" column="31" selection-start-line="1148" selection-start-column="31" selection-end-line="1148" selection-end-column="31" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1470,17 +1427,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.2404692" vertical-offset="9532" max-vertical-offset="12958">
           <caret line="497" column="0" selection-start-line="497" selection-start-column="0" selection-end-line="497" selection-end-column="0" />
-          <folding />
-        </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 vertical-scroll-proportion="0.0" vertical-offset="4977" max-vertical-offset="8316">
-          <caret line="263" column="24" selection-start-line="263" selection-start-column="24" selection-end-line="263" selection-end-column="24" />
-          <folding>
-            <element signature="e#10383#10401#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1488,7 +1434,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-2.1782365" vertical-offset="1359" max-vertical-offset="1892">
           <caret line="24" column="13" selection-start-line="24" selection-start-column="13" selection-end-line="24" selection-end-column="13" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1496,7 +1441,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-1.4093357" vertical-offset="1907" max-vertical-offset="2464">
           <caret line="65" column="60" selection-start-line="65" selection-start-column="11" selection-end-line="65" selection-end-column="60" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1504,10 +1448,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-0.011029412" vertical-offset="2228" max-vertical-offset="2838">
           <caret line="111" column="47" selection-start-line="111" selection-start-column="47" selection-end-line="111" selection-end-column="47" />
-          <folding>
-            <marker date="1535944027199" expanded="true" signature="-1:-1" placeholder="select devic..PG_DEVICE..." />
-            <marker date="1535944027199" expanded="true" signature="-1:-1" placeholder="select * fro..PG_DEVICE..." />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1515,7 +1455,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.76301616" vertical-offset="1687" max-vertical-offset="2376">
           <caret line="143" column="16" selection-start-line="143" selection-start-column="16" selection-end-line="143" selection-end-column="16" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1523,7 +1462,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.88509876" vertical-offset="519" max-vertical-offset="1342">
           <caret line="68" column="0" selection-start-line="68" selection-start-column="0" selection-end-line="68" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1531,7 +1469,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.43267503" vertical-offset="23" max-vertical-offset="1672">
           <caret line="15" column="33" selection-start-line="15" selection-start-column="33" selection-end-line="15" selection-end-column="33" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1540,42 +1477,8 @@
         <state vertical-scroll-proportion="0.5257353" vertical-offset="0" max-vertical-offset="4972">
           <caret line="30" column="0" selection-start-line="30" selection-start-column="0" selection-end-line="30" selection-end-column="0" />
           <folding>
-            <element signature="e#3701#3720#0" expanded="true" />
-            <element signature="e#4190#4208#0" expanded="true" />
-            <marker date="1536211271563" expanded="true" signature="-1:-1" placeholder="select count..PG_CONSTRUCTION..." />
-            <marker date="1536211271563" expanded="true" signature="-1:-1" placeholder="select count..Pg_Construction..." />
-            <marker date="1536211271563" expanded="true" signature="-1:-1" placeholder="SELECT t.ID,..PG_CONSTRUCTION..." />
-            <marker date="1536211271563" expanded="true" signature="-1:-1" placeholder="SELECT m.PAR..PG_PARTITION..." />
-            <marker date="1536211271563" expanded="true" signature="-1:-1" placeholder="SELECT n.TYP..PG_CONSTRUCTION_TYPE..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.40754038" vertical-offset="675" max-vertical-offset="1540">
-          <caret line="108" column="52" selection-start-line="108" selection-start-column="52" selection-end-line="108" selection-end-column="52" />
-          <folding>
-            <element signature="method#saveFiles#0;class#PgCsDocumentManager#0" expanded="false" />
-            <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" expanded="false" />
-            <element signature="e#3728#3745#0" expanded="true" />
-            <marker date="1536205913620" expanded="true" signature="-1:-1" placeholder="select * fro..PG_CSDOCUMENT..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.41666666" vertical-offset="2772" max-vertical-offset="3674">
-          <caret line="192" column="13" selection-start-line="192" selection-start-column="13" selection-end-line="192" selection-end-column="13" />
-          <folding>
-            <element signature="method#setPgCsDocumentManager#0;class#PgCsDocumentRs#0" expanded="false" />
-            <element signature="method#setPgConstructionManager#0;class#PgCsDocumentRs#0" expanded="false" />
-            <element signature="e#2023#2039#0" expanded="true" />
-            <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" expanded="false" />
-            <element signature="e#6060#6076#0" expanded="true" />
-            <element signature="e#6145#6162#0" expanded="true" />
-            <element signature="method#downloadFile#0;class#PgCsDocumentRs#0" expanded="false" />
+            <element signature="e#3701#3720#0" expanded="false" />
+            <element signature="e#4190#4208#0" expanded="false" />
           </folding>
         </state>
       </provider>
@@ -1584,24 +1487,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.9640933" vertical-offset="1091" max-vertical-offset="2112">
           <caret line="83" column="62" selection-start-line="83" selection-start-column="62" selection-end-line="83" selection-end-column="62" />
-          <folding>
-            <element signature="e#2170#2184#0" expanded="true" />
-            <marker date="1536213480710" expanded="true" signature="-1:-1" placeholder="select count..PG_ALARM..." />
-            <marker date="1536213480710" expanded="true" signature="-1:-1" placeholder="select count..PG_ALARM..." />
-            <marker date="1536213480710" expanded="true" signature="-1:-1" placeholder="select count..PG_ALARM..." />
-            <marker date="1536213480710" expanded="true" signature="-1:-1" placeholder="select count..PG_ALARM..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.41666666" vertical-offset="990" max-vertical-offset="1672">
-          <caret line="72" column="55" selection-start-line="72" selection-start-column="55" selection-end-line="72" selection-end-column="55" />
-          <folding>
-            <element signature="e#2152#2168#0" expanded="false" />
-            <element signature="e#2257#2271#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1609,10 +1494,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.75" vertical-offset="440" max-vertical-offset="3938">
           <caret line="62" column="13" selection-start-line="62" selection-start-column="13" selection-end-line="62" selection-end-column="13" />
-          <folding>
-            <element signature="e#1393#1394#0" expanded="false" />
-            <element signature="e#1451#1452#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1620,7 +1501,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.35547575" vertical-offset="0" max-vertical-offset="1012">
           <caret line="18" column="0" selection-start-line="18" selection-start-column="0" selection-end-line="18" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1628,9 +1508,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.45421904" vertical-offset="2145" max-vertical-offset="3608">
           <caret line="125" column="29" selection-start-line="125" selection-start-column="29" selection-end-line="125" selection-end-column="29" />
-          <folding>
-            <element signature="e#3094#3110#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1638,7 +1515,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.513465" vertical-offset="0" max-vertical-offset="1276">
           <caret line="22" column="51" selection-start-line="22" selection-start-column="51" selection-end-line="22" selection-end-column="51" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1646,7 +1522,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.5924596" vertical-offset="0" max-vertical-offset="1254">
           <caret line="20" column="28" selection-start-line="20" selection-start-column="28" selection-end-line="20" selection-end-column="28" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1654,18 +1529,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-3.3052065" vertical-offset="4063" max-vertical-offset="4620">
           <caret line="115" column="15" selection-start-line="115" selection-start-column="15" selection-end-line="115" selection-end-column="15" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.20833333" vertical-offset="1892" max-vertical-offset="3850">
-          <caret line="152" column="24" selection-start-line="152" selection-start-column="24" selection-end-line="152" selection-end-column="24" />
-          <folding>
-            <element signature="method#addReservePlan#0;class#PgReservePlanRs#0" expanded="false" />
-            <element signature="e#3206#3222#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1673,7 +1536,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.06147541" vertical-offset="183" max-vertical-offset="506">
           <caret line="10" column="0" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1681,7 +1543,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="3388">
           <caret line="39" column="56" selection-start-line="39" selection-start-column="56" selection-end-line="39" selection-end-column="56" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1689,22 +1550,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.33213645" vertical-offset="959" max-vertical-offset="2508">
           <caret line="71" column="36" selection-start-line="71" selection-start-column="36" selection-end-line="71" selection-end-column="36" />
-          <folding>
-            <marker date="1536217243963" expanded="true" signature="-1:-1" placeholder="select count..PG_RESERVE_PLAN..." />
-          </folding>
-        </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 vertical-scroll-proportion="0.46401516" vertical-offset="1273" max-vertical-offset="1980">
-          <caret line="106" column="70" selection-start-line="106" selection-start-column="70" selection-end-line="106" selection-end-column="70" />
-          <folding>
-            <element signature="imports" expanded="false" />
-            <element signature="method#linkDevice#0;class#PgAlarmLinkRs#0" expanded="false" />
-            <element signature="e#1459#1475#0" expanded="false" />
-            <element signature="method#linkPartitionDevice#0;class#PgAlarmLinkRs#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1712,7 +1557,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.35906643" vertical-offset="1164" max-vertical-offset="3388">
           <caret line="80" column="23" selection-start-line="80" selection-start-column="23" selection-end-line="80" selection-end-column="23" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1720,7 +1564,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.625" vertical-offset="1364" max-vertical-offset="4158">
           <caret line="99" column="37" selection-start-line="99" selection-start-column="37" selection-end-line="99" selection-end-column="37" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1728,7 +1571,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="1553" max-vertical-offset="2134">
           <caret line="98" column="16" selection-start-line="98" selection-start-column="16" selection-end-line="98" selection-end-column="16" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1736,9 +1578,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="837" max-vertical-offset="1276">
           <caret line="59" column="0" selection-start-line="59" selection-start-column="0" selection-end-line="59" selection-end-column="0" />
-          <folding>
-            <element signature="e#1980#1990#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1746,10 +1585,259 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.24955116" vertical-offset="631" max-vertical-offset="1232">
           <caret line="58" column="34" selection-start-line="58" selection-start-column="34" selection-end-line="58" selection-end-column="34" />
+        </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 vertical-scroll-proportion="0.0" vertical-offset="6759" max-vertical-offset="8316">
+          <caret line="268" column="42" selection-start-line="268" selection-start-column="42" selection-end-line="268" selection-end-column="42" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.8779174" vertical-offset="347" max-vertical-offset="2662">
+          <caret line="54" column="9" selection-start-line="54" selection-start-column="9" selection-end-line="54" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="1.9353681" vertical-offset="0" max-vertical-offset="4906">
+          <caret line="70" column="71" selection-start-line="70" selection-start-column="66" selection-end-line="70" selection-end-column="75" />
+        </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 vertical-scroll-proportion="0.32854578" vertical-offset="1115" max-vertical-offset="1672">
+          <caret line="76" column="33" selection-start-line="76" selection-start-column="33" selection-end-line="76" selection-end-column="33" />
+        </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 vertical-scroll-proportion="3.1723518" vertical-offset="81" max-vertical-offset="2354">
+          <caret line="104" column="12" selection-start-line="104" selection-start-column="12" selection-end-line="104" selection-end-column="12" />
           <folding />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.5260323" vertical-offset="4239" max-vertical-offset="4796">
+          <caret line="224" column="0" selection-start-line="224" selection-start-column="0" selection-end-line="224" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.6445242" vertical-offset="1709" max-vertical-offset="2332">
+          <caret line="111" column="53" selection-start-line="111" selection-start-column="53" selection-end-line="111" selection-end-column="53" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-3.5421903" vertical-offset="5515" max-vertical-offset="6072">
+          <caret line="184" column="25" selection-start-line="184" selection-start-column="25" selection-end-line="184" selection-end-column="25" />
+        </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 vertical-scroll-proportion="-0.78994614" vertical-offset="924" max-vertical-offset="7128">
+          <caret line="41" column="5" selection-start-line="41" selection-start-column="5" selection-end-line="41" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.4344704" vertical-offset="748" max-vertical-offset="1474">
+          <caret line="72" column="0" selection-start-line="72" selection-start-column="0" selection-end-line="72" selection-end-column="0" />
+        </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 vertical-scroll-proportion="0.0" vertical-offset="264" max-vertical-offset="1782">
+          <caret line="37" column="57" selection-start-line="37" selection-start-column="57" selection-end-line="37" selection-end-column="57" />
+          <folding>
+            <marker date="1531722832731" expanded="true" signature="-1:-1" placeholder="select id,CH..PG_CH4..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2420">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://C:/Program Files/Java/jdk1.8.0_131/src.zip!/java/sql/Timestamp.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33027524" vertical-offset="4606" max-vertical-offset="12980">
+          <caret line="236" column="0" selection-start-line="236" selection-start-column="0" selection-end-line="236" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="2.2118492" vertical-offset="0" max-vertical-offset="1496">
+          <caret line="87" column="52" selection-start-line="87" selection-start-column="52" selection-end-line="87" selection-end-column="52" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.4901257" vertical-offset="79" max-vertical-offset="1298">
+          <caret line="25" column="25" selection-start-line="25" selection-start-column="25" selection-end-line="25" selection-end-column="25" />
+          <folding>
+            <marker date="1537412037475" expanded="true" signature="-1:-1" placeholder="select equip..PG_EQUIPMENT..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.8330341" vertical-offset="680" max-vertical-offset="4466">
+          <caret line="68" column="29" selection-start-line="68" selection-start-column="29" selection-end-line="68" selection-end-column="29" />
+          <folding>
+            <element signature="e#1490#1506#0" expanded="true" />
+            <element signature="e#6332#6348#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgEquipment.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.3680431" vertical-offset="191" max-vertical-offset="1540">
+          <caret line="20" column="17" selection-start-line="20" selection-start-column="17" selection-end-line="20" selection-end-column="17" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/4.3.6.Final/hibernate-core-4.3.6.Final-sources.jar!/org/hibernate/internal/AbstractQueryImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33333334" vertical-offset="18814" max-vertical-offset="20328">
+          <caret line="974" column="0" selection-start-line="974" selection-start-column="0" selection-end-line="974" selection-end-column="0" />
+          <folding />
+        </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 vertical-scroll-proportion="0.5924596" vertical-offset="0" max-vertical-offset="1980">
+          <caret line="18" column="32" selection-start-line="18" selection-start-column="32" selection-end-line="18" selection-end-column="32" />
+          <folding />
+        </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 vertical-scroll-proportion="0.7109515" vertical-offset="0" max-vertical-offset="704">
+          <caret line="18" column="31" selection-start-line="18" selection-start-column="31" selection-end-line="18" selection-end-column="31" />
+          <folding>
+            <element signature="e#213#214#0" expanded="true" />
+            <element signature="e#244#245#0" expanded="true" />
+            <element signature="e#292#293#0" expanded="true" />
+            <element signature="e#332#333#0" expanded="true" />
+            <element signature="e#394#395#0" expanded="true" />
+            <element signature="e#438#439#0" expanded="true" />
+            <element signature="e#474#475#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://C:/Program Files/Java/jdk1.8.0_131/src.zip!/java/lang/String.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.21139705" vertical-offset="1469" max-vertical-offset="67452">
+          <caret line="107" column="16" selection-start-line="107" selection-start-column="12" selection-end-line="107" selection-end-column="16" />
+          <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 vertical-scroll-proportion="0.0" vertical-offset="2301" max-vertical-offset="3388">
+          <caret line="277" column="9" selection-start-line="277" selection-start-column="9" selection-end-line="277" selection-end-column="9" />
+          <folding>
+            <element signature="method#addLog#0;class#PgPipeLineRs#0" expanded="false" />
+            <element signature="method#editPipeLine#0;class#PgPipeLineRs#0" expanded="false" />
+            <element signature="method#deletePipeLine#0;class#PgPipeLineRs#0" expanded="false" />
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" expanded="false" />
+            <element signature="e#9602#9626#0" expanded="true" />
+            <element signature="e#10329#10337#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.43727598" vertical-offset="120" max-vertical-offset="1122">
+          <caret line="13" column="34" selection-start-line="13" selection-start-column="34" selection-end-line="13" selection-end-column="34" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.8547855" vertical-offset="137" max-vertical-offset="704">
+          <caret line="18" column="31" selection-start-line="18" selection-start-column="31" selection-end-line="18" selection-end-column="31" />
+          <folding>
+            <element signature="e#204#205#0" expanded="true" />
+            <element signature="e#233#234#0" expanded="true" />
+            <element signature="e#277#278#0" expanded="true" />
+            <element signature="e#313#314#0" expanded="true" />
+            <element signature="e#375#376#0" expanded="true" />
+            <element signature="e#419#420#0" expanded="true" />
+            <element signature="e#455#456#0" expanded="true" />
+          </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 vertical-scroll-proportion="0.0" vertical-offset="330" max-vertical-offset="1342">
+          <caret line="55" column="42" selection-start-line="55" selection-start-column="42" selection-end-line="55" selection-end-column="42" />
+          <folding>
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" expanded="false" />
+            <element signature="e#1787#1811#0" expanded="true" />
+            <element signature="e#2482#2490#0" expanded="true" />
+            <marker date="1537414540748" expanded="true" signature="1552:1622" placeholder="select LINE_..PG_PIPELINE..." />
+            <marker date="1537414540748" expanded="true" signature="1552:1621" placeholder="select LINE_..PG_PIPELINE..." />
+            <marker date="1537414540748" expanded="true" signature="2310:2352" placeholder="select disti..PG_PIPELINE..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="849" max-vertical-offset="1650">
+          <caret line="61" column="56" selection-start-line="61" selection-start-column="56" selection-end-line="61" selection-end-column="56" />
+          <folding>
+            <element signature="e#2433#2452#0" expanded="true" />
+            <marker date="1537414756878" expanded="true" signature="2209:2277" placeholder="select PG_NA..PG_PIPE_GALLERY..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.7140151" vertical-offset="4067" max-vertical-offset="4752">
+          <caret line="221" column="27" selection-start-line="221" selection-start-column="27" selection-end-line="221" selection-end-column="27" />
+          <folding>
+            <element signature="e#6945#6964#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java
index 238bc39..6256b9d 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java
@@ -78,7 +78,7 @@
     public PgEquipmentDto(PgEquipment equipment) {
         if (equipment == null) return;
 
-        SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 
         this.setId(equipment.getId());
         this.setEqName(equipment.getEqName());
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineLengthStatic.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineLengthStatic.java
new file mode 100644
index 0000000..a25538f
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineLengthStatic.java
@@ -0,0 +1,26 @@
+package com.casic.PgInterface.devTable.dto;
+
+/**
+ * Created by yxw on 2018/9/20.
+ */
+public class PgPipeLineLengthStatic {
+
+    private String lineType;
+    private String length;
+
+    public String getLineType() {
+        return lineType;
+    }
+
+    public void setLineType(String lineType) {
+        this.lineType = lineType;
+    }
+
+    public String getLength() {
+        return length;
+    }
+
+    public void setLength(String length) {
+        this.length = length;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.java b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.java
new file mode 100644
index 0000000..bd65ff4
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.java
@@ -0,0 +1,26 @@
+package com.casic.PgInterface.devTable.dto;
+
+/**
+ * Created by yxw on 2018/9/20.
+ */
+public class PipeGalleryStatic {
+
+    private String pgName;
+    private String length;
+
+    public String getPgName() {
+        return pgName;
+    }
+
+    public void setPgName(String pgName) {
+        this.pgName = pgName;
+    }
+
+    public String getLength() {
+        return length;
+    }
+
+    public void setLength(String length) {
+        this.length = length;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
index e46742c..ab0908b 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
@@ -23,7 +23,7 @@
         criteria.add(Restrictions.eq("eqCode", eqCode));
         criteria.add(Restrictions.eq("active",1));
 
-        List<PgEquipment> pgEquipmentList = criteria.list();
+        List<PgEquipment> pgEquipmentList = (List<PgEquipment>)criteria.list();
 
         if(pgEquipmentList!=null&&pgEquipmentList.size()!=0)
             return pgEquipmentList.get(0);
@@ -49,10 +49,10 @@
 
     //统计工器具耗材数量
     public List<PgDeviceTypeStatisticDto> getDeviceStatisticByDevType(String eqType){
-        String eqType1=eqType.equals("0")?"工器具":"耗材";
+        //String eqType1=eqType.equals("0")?"工器具":"耗材";
 
         String hql="select equipment.EQ_NAME,count(*) from PG_EQUIPMENT equipment where equipment.EQ_TYPE = '"
-        +eqType1+"' group by equipment.EQ_NAME";
+        +eqType+"' group by equipment.EQ_NAME";
 
         List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list();
 
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 8d8db5d..4cfa880 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
@@ -3,6 +3,7 @@
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
 import com.casic.PgInterface.devTable.domain.PgPipeLine;
 import com.casic.PgInterface.devTable.dto.PgPipeLineDto;
+import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
@@ -39,13 +40,35 @@
         return pgPipeLineDtoList;
     }
 
-   public String getPipeLengthByName(String lineType) {
-       String sql = "select SUM(PIPE_LENGTH) from PG_PIPELINE where LINE_TYPE = '" + lineType + "'";
+    public List<PgPipeLineLengthStatic> getPipeLengthByName() {
+        String sql = "select LINE_TYPE,SUM(PIPE_LENGTH) from PG_PIPELINE group by LINE_TYPE ";
 
-       String sumLength = String.valueOf(this.getSession().createSQLQuery(sql).uniqueResult());
+        List<Object[]> objectList = this.getSession().createSQLQuery(sql).list();
+        List<PgPipeLineLengthStatic> pgPipeLineLengthStaticList = new ArrayList<PgPipeLineLengthStatic>();
 
-       return sumLength;
-   }
+        for(Object[] objectArray : objectList)
+        {
+            PgPipeLineLengthStatic pgPipeLineLengthStatic=new PgPipeLineLengthStatic();
+            pgPipeLineLengthStatic.setLineType(String.valueOf(objectArray[0]));
+            pgPipeLineLengthStatic.setLength(String.valueOf(objectArray[1]));
+            pgPipeLineLengthStaticList.add(pgPipeLineLengthStatic);
+        }
+        return pgPipeLineLengthStaticList;
+    }
+
+    public  List<String> getPipeType() {
+        String sql = "select distinct LINE_TYPE from PG_PIPELINE";
+
+        List<Object> objectList = this.getSession().createSQLQuery(sql).list();
+
+        List<String> stringList=new ArrayList<String>();
+
+        for(Object ob : objectList)
+        {
+            stringList.add(String.valueOf(ob));
+        }
+        return stringList;
+    }
 
 }
 
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java
index 41f0e64..375c078 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java
@@ -4,6 +4,7 @@
 import com.casic.PgInterface.devTable.domain.PgPartition;
 import com.casic.PgInterface.devTable.domain.PipeGallery;
 import com.casic.PgInterface.devTable.dto.PipeGalleryDto;
+import com.casic.PgInterface.devTable.dto.PipeGalleryStatic;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
@@ -58,13 +59,21 @@
         return pipeGalleryDtoList;
     }
 
-    public String getPgLengthByName(String pgName) {
+    public List<PipeGalleryStatic> getPgLengthByName() {
 
-        String sql = "select SUM(PAR_LENGTH) from PG_PIPE_GALLERY where PG_NAME = '" + pgName + "'";
+        String sql = "select PG_NAME,SUM(PAR_LENGTH) from PG_PIPE_GALLERY group by PG_NAME ";
 
-        String sumLength = String.valueOf(this.getSession().createSQLQuery(sql).uniqueResult());
+        List<Object[]> objectList = this.getSession().createSQLQuery(sql).list();
+        List<PipeGalleryStatic> pipeGalleryStaticList = new ArrayList<PipeGalleryStatic>();
 
-        return sumLength;
+        for(Object[] objectArray : objectList)
+        {
+            PipeGalleryStatic pipeGalleryStatic=new PipeGalleryStatic();
+            pipeGalleryStatic.setPgName(String.valueOf(objectArray[0]));
+            pipeGalleryStatic.setLength(String.valueOf(objectArray[1]));
+            pipeGalleryStaticList.add(pipeGalleryStatic);
+        }
+        return pipeGalleryStaticList;
     }
 
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
index 251c9d2..fc1f05f 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
@@ -44,7 +44,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
-        SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 
         try {
             if (pgEquipmentManager.getEquipmentByCode(eqCode)!=null) {
@@ -92,7 +92,7 @@
         HashMap<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
         String result = "";
-        SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 
         try {
             PgEquipment pgEquipment=pgEquipmentManager.get(id);
@@ -211,4 +211,4 @@
         return resultMap;
     }
 
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
index 3da622c..41f7374 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
@@ -4,6 +4,7 @@
 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.manager.PgPartitionManager;
 import com.casic.PgInterface.devTable.manager.PgPipeLineManager;
 import com.casic.PgInterface.devTable.manager.PipeGalleryManager;
@@ -261,14 +262,14 @@
      * 根据管线类型获取管线长度
      */
     @POST
-    @Path("getPipeLengthByName")
+    @Path("getPipeLengthStatic")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String,Object> getPipeLengthByName(@FormParam("lineType") String lineType)throws Exception{
+    public Map<String,Object> getPipeLengthStatic()throws Exception{
         Map<String, Object> resultMap = new HashMap<String, Object>();
-        String result = "";
         String msg = "";
+        List<PgPipeLineLengthStatic> pgPipeLineLengthStaticList=new ArrayList<PgPipeLineLengthStatic>();
         try {
-            result = pgPipeLineManager.getPipeLengthByName(lineType);
+            pgPipeLineLengthStaticList = pgPipeLineManager.getPipeLengthByName();
             msg="管线长度获取成功";
         }catch(Exception e)
         {
@@ -276,9 +277,32 @@
             msg="管线长度统计失败";
         }
         resultMap.put("msg",msg);
-        resultMap.put("result",result);
+        resultMap.put("result",pgPipeLineLengthStaticList);
 
         return resultMap;
     }
 
-}
+    /**
+     * 根据管线名称获取管线信息
+     */
+    @POST
+    @Path("getPipeLineType")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String, Object> getPipeLineType()
+            throws Exception {
+        Map<String, Object> resultMap = new HashMap<String, Object>();
+        String msg = "";
+        List<String> stringList=new ArrayList<String>();
+        try {
+            stringList = pgPipeLineManager.getPipeType();
+            msg = "获取成功";
+        } catch (Exception e) {
+            msg = "获取失败";
+            e.printStackTrace();
+        }
+        resultMap.put("msg", msg);
+        resultMap.put("result", stringList);
+        return resultMap;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java b/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java
index 1d21e60..3c301bc 100644
--- a/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java
@@ -3,6 +3,7 @@
 import com.casic.PgInterface.devTable.domain.PgPartition;
 import com.casic.PgInterface.devTable.domain.PipeGallery;
 import com.casic.PgInterface.devTable.dto.PipeGalleryDto;
+import com.casic.PgInterface.devTable.dto.PipeGalleryStatic;
 import com.casic.PgInterface.devTable.manager.PgPartitionManager;
 import com.casic.PgInterface.devTable.manager.PipeGalleryManager;
 import org.slf4j.Logger;
@@ -202,19 +203,17 @@
      * 获取管廊仓体的长度
      */
     @POST
-    @Path("getPgLengthByName")
+    @Path("getPgLengthStatic")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String,Object> getPgLengthByName(@FormParam("pgName") String pgName)
+    public Map<String,Object> getPgLengthStatic()
     {
         Map<String,Object> resultMap=new HashMap<String, Object>();
-        String result="";
+        List<PipeGalleryStatic> pipeGalleryStaticList=new ArrayList<PipeGalleryStatic>();
         String msg="";
 
         try{
-            result=pipeGalleryManager.getPgLengthByName(pgName);
-            if(result=="null")
-                msg="不存在管廊仓："+pgName;
-            else
+            pipeGalleryStaticList=pipeGalleryManager.getPgLengthByName();
+
             msg="仓体长度获取成功";
         }
         catch(Exception e)
@@ -224,7 +223,7 @@
         }
 
         resultMap.put("msg",msg);
-        resultMap.put("result",result);
+        resultMap.put("result",pipeGalleryStaticList);
 
         return resultMap;
     }
diff --git "a/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx" "b/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx"
new file mode 100644
index 0000000..eb93499
--- /dev/null
+++ "b/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx"
Binary files differ

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 73b1050..7a80a23 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,34 +2,17 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="">
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\~$数据库设计说明新需求.docx" afterPath="" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/~$数据库设计说明新需求.docx" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineLengthStatic.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/接口说明新需求.docx" afterPath="$PROJECT_DIR$/接口说明新需求.docx" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainTypeManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainTypeManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources/application.properties" afterPath="$PROJECT_DIR$/src/main/resources/application.properties" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
     </list>
     <ignored path="PgInterface.iws" />
@@ -54,7 +37,67 @@
     <favorites_list name="PgInterface" />
   </component>
   <component name="FileEditorManager">
-    <leaf />
+    <leaf>
+      <file leaf-file-name="PgPipeLineRs.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.0" vertical-offset="2301" max-vertical-offset="3388">
+              <caret line="277" column="9" selection-start-line="277" selection-start-column="9" selection-end-line="277" selection-end-column="9" />
+              <folding>
+                <element signature="method#addLog#0;class#PgPipeLineRs#0" expanded="false" />
+                <element signature="method#editPipeLine#0;class#PgPipeLineRs#0" expanded="false" />
+                <element signature="method#deletePipeLine#0;class#PgPipeLineRs#0" expanded="false" />
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" expanded="false" />
+                <element signature="e#9602#9626#0" expanded="true" />
+                <element signature="e#10329#10337#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="PgPipeLineManager.java" pinned="false" current="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 vertical-scroll-proportion="0.0" vertical-offset="330" max-vertical-offset="1342">
+              <caret line="55" column="42" selection-start-line="55" selection-start-column="42" selection-end-line="55" selection-end-column="42" />
+              <folding>
+                <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" expanded="false" />
+                <element signature="e#1787#1811#0" expanded="true" />
+                <element signature="e#2482#2490#0" expanded="true" />
+                <marker date="1537414540748" expanded="true" signature="1552:1622" placeholder="select LINE_..PG_PIPELINE..." />
+                <marker date="1537414540748" expanded="true" signature="1552:1621" placeholder="select LINE_..PG_PIPELINE..." />
+                <marker date="1537414540748" expanded="true" signature="2310:2352" placeholder="select disti..PG_PIPELINE..." />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="PipeGalleryRs.java" pinned="false" current="true" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.7140151" vertical-offset="4067" max-vertical-offset="4752">
+              <caret line="221" column="27" selection-start-line="221" selection-start-column="27" selection-end-line="221" selection-end-column="27" />
+              <folding>
+                <element signature="e#6945#6964#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="PipeGalleryManager.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.0" vertical-offset="849" max-vertical-offset="1650">
+              <caret line="61" column="56" selection-start-line="61" selection-start-column="56" selection-end-line="61" selection-end-column="56" />
+              <folding>
+                <element signature="e#2433#2452#0" expanded="true" />
+                <marker date="1537414756878" expanded="true" signature="2209:2277" placeholder="select PG_NA..PG_PIPE_GALLERY..." />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+    </leaf>
   </component>
   <component name="FindManager">
     <FindUsagesManager>
@@ -72,9 +115,6 @@
   <component name="IdeDocumentHistory">
     <option name="changedFiles">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
         <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/manager/PgInPgPersonManager.java" />
@@ -86,23 +126,16 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintainType.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/manager/PgPipeLineManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/EquipmentManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgEquipment.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.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/rs/PgPartitionRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.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/PgDeviceTypeRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
         <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.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/PgMaintainTypeRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainTypeManager.java" />
@@ -123,6 +156,16 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.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/dto/PgPipeLineLengthStatic.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/dto/PipeGalleryDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.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" />
       </list>
     </option>
   </component>
@@ -216,7 +259,20 @@
       <sortByType />
     </navigator>
     <panes>
-      <pane id="Scope" />
+      <pane id="PackagesPane">
+        <subPane>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
+            </PATH_ELEMENT>
+          </PATH>
+        </subPane>
+      </pane>
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -331,22 +387,73 @@
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
-        </subPane>
-      </pane>
-      <pane id="PackagesPane">
-        <subPane>
           <PATH>
             <PATH_ELEMENT>
               <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
               <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="devTable" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="devTable" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="dto" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
         </subPane>
       </pane>
+      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -916,7 +1023,12 @@
       <workItem from="1535958569443" duration="219000" />
       <workItem from="1536111554952" duration="23051000" />
       <workItem from="1536143316539" duration="3706000" />
-      <workItem from="1536195067076" duration="23441000" />
+      <workItem from="1536195067076" duration="23586000" />
+      <workItem from="1536802841385" duration="18000" />
+      <workItem from="1537167144071" duration="1232000" />
+      <workItem from="1537236948589" duration="156000" />
+      <workItem from="1537237991303" duration="1733000" />
+      <workItem from="1537407751831" duration="6397000" />
     </task>
     <task id="LOCAL-00001" summary="first commit">
       <created>1510219102698</created>
@@ -1126,11 +1238,15 @@
       <created>1535958368940</created>
       <updated>1535958368940</updated>
     </task>
-    <option name="localTasksCounter" value="53" />
+    <task id="LOCAL-00053" summary="根据华锐王工反馈测试，修改接口">
+      <created>1536224373164</created>
+      <updated>1536224373165</updated>
+    </task>
+    <option name="localTasksCounter" value="54" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="937579000" />
+    <option name="totallyTimeSpent" value="947260000" />
   </component>
   <component name="TodoView" selected-index="1">
     <todo-panel id="selected-file">
@@ -1165,7 +1281,7 @@
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.391453" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.66382253" sideWeight="0.81316185" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.7235495" sideWeight="0.81316185" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="true" content_ui="tabs" />
       <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.6757679" sideWeight="0.18683812" order="7" side_tool="true" content_ui="tabs" />
@@ -1177,8 +1293,8 @@
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24962178" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32980332" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32649574" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2526475" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32593855" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.28441754" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" />
@@ -1192,18 +1308,18 @@
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
     </layout>
     <layout-to-restore>
-      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.63418806" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
-      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
+      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.391453" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
       <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" />
-      <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.50341296" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
+      <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2962963" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
+      <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.52136755" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32649574" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.29425114" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
@@ -1223,8 +1339,8 @@
       <window_info id="Android" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="15" side_tool="false" content_ui="tabs" />
       <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="true" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32980332" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
     </layout-to-restore>
   </component>
@@ -1243,7 +1359,6 @@
     <option name="myTodoPanelSettings">
       <TodoPanelSettings />
     </option>
-    <MESSAGE value="修改人员入廊记录表和功能" />
     <MESSAGE value="Merge remote-tracking branch 'origin/develop' into develop&#10;&#10;Conflicts:&#10;&#9;.idea/workspace.xml&#10;&#9;~$数据库设计说明新需求.docx&#10;&#9;管廊数据库设计说明新需求.docx&#10;" />
     <MESSAGE value="增加统计功能" />
     <MESSAGE value="修改标注" />
@@ -1268,7 +1383,8 @@
     <MESSAGE value="新增维护类别" />
     <MESSAGE value="修改施工数据新增删除编辑" />
     <MESSAGE value="新增工器具耗材" />
-    <option name="LAST_COMMIT_MESSAGE" value="新增工器具耗材" />
+    <MESSAGE value="根据华锐王工反馈测试，修改接口" />
+    <option name="LAST_COMMIT_MESSAGE" value="根据华锐王工反馈测试，修改接口" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1291,14 +1407,8 @@
           <properties />
           <option name="timeStamp" value="359" />
         </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java</url>
-          <line>190</line>
-          <properties />
-          <option name="timeStamp" value="360" />
-        </line-breakpoint>
       </breakpoints>
-      <option name="time" value="390" />
+      <option name="time" value="399" />
     </breakpoint-manager>
   </component>
   <component name="antWorkspaceConfiguration">
@@ -1306,163 +1416,10 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="3119" max-vertical-offset="7128">
-          <caret line="30" column="52" selection-start-line="30" selection-start-column="52" selection-end-line="30" selection-end-column="52" />
-          <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 vertical-scroll-proportion="0.0" vertical-offset="5071" max-vertical-offset="5918">
-          <caret line="268" column="24" selection-start-line="268" selection-start-column="24" selection-end-line="268" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="13" max-vertical-offset="3058">
-          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.5529623" vertical-offset="528" max-vertical-offset="3014">
-          <caret line="26" column="0" selection-start-line="26" selection-start-column="0" selection-end-line="26" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainTypeDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.33213645" vertical-offset="101" max-vertical-offset="1012">
-          <caret line="15" column="11" selection-start-line="15" selection-start-column="11" selection-end-line="15" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="609" max-vertical-offset="1958">
-          <caret line="39" column="50" selection-start-line="39" selection-start-column="50" selection-end-line="39" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.7271095" vertical-offset="167" max-vertical-offset="1342">
-          <caret line="35" column="0" selection-start-line="35" selection-start-column="0" selection-end-line="35" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.63195693" vertical-offset="0" max-vertical-offset="1452">
-          <caret line="19" column="0" selection-start-line="19" selection-start-column="0" selection-end-line="19" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintainDoc.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.69669116" vertical-offset="61" max-vertical-offset="1320">
-          <caret line="24" column="0" selection-start-line="24" selection-start-column="0" selection-end-line="24" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDocDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.27648115" vertical-offset="0" max-vertical-offset="1342">
-          <caret line="9" column="13" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-7.551724" vertical-offset="3125" max-vertical-offset="4048">
-          <caret line="249" column="85" selection-start-line="249" selection-start-column="85" selection-end-line="249" selection-end-column="85" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-9.862069" vertical-offset="3674" max-vertical-offset="5610">
-          <caret line="203" column="58" selection-start-line="203" selection-start-column="58" selection-end-line="203" selection-end-column="58" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.31597847" vertical-offset="0" max-vertical-offset="557">
-          <caret line="8" column="35" selection-start-line="8" selection-start-column="35" selection-end-line="8" selection-end-column="35" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.66360295" vertical-offset="783" max-vertical-offset="3234">
-          <caret line="68" column="71" selection-start-line="68" selection-start-column="71" selection-end-line="68" selection-end-column="71" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="33" max-vertical-offset="968">
-          <caret line="33" column="62" selection-start-line="33" selection-start-column="62" selection-end-line="33" selection-end-column="62" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://C:/Program Files/Java/jdk1.8.0_131/src.zip!/java/lang/NumberFormatException.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.6285178" vertical-offset="479" max-vertical-offset="1012">
-          <caret line="64" column="0" selection-start-line="64" selection-start-column="0" selection-end-line="64" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-tx/4.0.6.RELEASE/spring-tx-4.0.6.RELEASE-sources.jar!/org/springframework/transaction/interceptor/TransactionAspectSupport.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.23639774" vertical-offset="4736" max-vertical-offset="13244">
-          <caret line="263" column="0" selection-start-line="263" selection-start-column="0" selection-end-line="263" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.2504817" vertical-offset="618" max-vertical-offset="1320">
-          <caret line="35" column="28" selection-start-line="35" selection-start-column="28" selection-end-line="35" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://C:/Program Files/Java/jdk1.8.0_131/src.zip!/java/util/ArrayList.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.73967683" vertical-offset="13360" max-vertical-offset="30690">
-          <caret line="663" column="7" selection-start-line="663" selection-start-column="7" selection-end-line="663" selection-end-column="7" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/StringUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.15798923" vertical-offset="330" max-vertical-offset="2178">
-          <caret line="31" column="29" selection-start-line="31" selection-start-column="29" selection-end-line="31" selection-end-column="29" />
-          <folding />
-        </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 vertical-scroll-proportion="0.11143695" vertical-offset="1854" max-vertical-offset="5170">
-          <caret line="103" column="65" selection-start-line="103" selection-start-column="65" selection-end-line="103" selection-end-column="65" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="jar://C:/Program Files/Java/jdk1.8.0_131/src.zip!/java/util/concurrent/ThreadPoolExecutor.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="1.659824" vertical-offset="23436" max-vertical-offset="44594">
           <caret line="1148" column="31" selection-start-line="1148" selection-start-column="31" selection-end-line="1148" selection-end-column="31" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1470,17 +1427,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.2404692" vertical-offset="9532" max-vertical-offset="12958">
           <caret line="497" column="0" selection-start-line="497" selection-start-column="0" selection-end-line="497" selection-end-column="0" />
-          <folding />
-        </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 vertical-scroll-proportion="0.0" vertical-offset="4977" max-vertical-offset="8316">
-          <caret line="263" column="24" selection-start-line="263" selection-start-column="24" selection-end-line="263" selection-end-column="24" />
-          <folding>
-            <element signature="e#10383#10401#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1488,7 +1434,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-2.1782365" vertical-offset="1359" max-vertical-offset="1892">
           <caret line="24" column="13" selection-start-line="24" selection-start-column="13" selection-end-line="24" selection-end-column="13" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1496,7 +1441,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-1.4093357" vertical-offset="1907" max-vertical-offset="2464">
           <caret line="65" column="60" selection-start-line="65" selection-start-column="11" selection-end-line="65" selection-end-column="60" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1504,10 +1448,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-0.011029412" vertical-offset="2228" max-vertical-offset="2838">
           <caret line="111" column="47" selection-start-line="111" selection-start-column="47" selection-end-line="111" selection-end-column="47" />
-          <folding>
-            <marker date="1535944027199" expanded="true" signature="-1:-1" placeholder="select devic..PG_DEVICE..." />
-            <marker date="1535944027199" expanded="true" signature="-1:-1" placeholder="select * fro..PG_DEVICE..." />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1515,7 +1455,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.76301616" vertical-offset="1687" max-vertical-offset="2376">
           <caret line="143" column="16" selection-start-line="143" selection-start-column="16" selection-end-line="143" selection-end-column="16" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1523,7 +1462,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.88509876" vertical-offset="519" max-vertical-offset="1342">
           <caret line="68" column="0" selection-start-line="68" selection-start-column="0" selection-end-line="68" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1531,7 +1469,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.43267503" vertical-offset="23" max-vertical-offset="1672">
           <caret line="15" column="33" selection-start-line="15" selection-start-column="33" selection-end-line="15" selection-end-column="33" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1540,42 +1477,8 @@
         <state vertical-scroll-proportion="0.5257353" vertical-offset="0" max-vertical-offset="4972">
           <caret line="30" column="0" selection-start-line="30" selection-start-column="0" selection-end-line="30" selection-end-column="0" />
           <folding>
-            <element signature="e#3701#3720#0" expanded="true" />
-            <element signature="e#4190#4208#0" expanded="true" />
-            <marker date="1536211271563" expanded="true" signature="-1:-1" placeholder="select count..PG_CONSTRUCTION..." />
-            <marker date="1536211271563" expanded="true" signature="-1:-1" placeholder="select count..Pg_Construction..." />
-            <marker date="1536211271563" expanded="true" signature="-1:-1" placeholder="SELECT t.ID,..PG_CONSTRUCTION..." />
-            <marker date="1536211271563" expanded="true" signature="-1:-1" placeholder="SELECT m.PAR..PG_PARTITION..." />
-            <marker date="1536211271563" expanded="true" signature="-1:-1" placeholder="SELECT n.TYP..PG_CONSTRUCTION_TYPE..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.40754038" vertical-offset="675" max-vertical-offset="1540">
-          <caret line="108" column="52" selection-start-line="108" selection-start-column="52" selection-end-line="108" selection-end-column="52" />
-          <folding>
-            <element signature="method#saveFiles#0;class#PgCsDocumentManager#0" expanded="false" />
-            <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" expanded="false" />
-            <element signature="e#3728#3745#0" expanded="true" />
-            <marker date="1536205913620" expanded="true" signature="-1:-1" placeholder="select * fro..PG_CSDOCUMENT..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.41666666" vertical-offset="2772" max-vertical-offset="3674">
-          <caret line="192" column="13" selection-start-line="192" selection-start-column="13" selection-end-line="192" selection-end-column="13" />
-          <folding>
-            <element signature="method#setPgCsDocumentManager#0;class#PgCsDocumentRs#0" expanded="false" />
-            <element signature="method#setPgConstructionManager#0;class#PgCsDocumentRs#0" expanded="false" />
-            <element signature="e#2023#2039#0" expanded="true" />
-            <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" expanded="false" />
-            <element signature="e#6060#6076#0" expanded="true" />
-            <element signature="e#6145#6162#0" expanded="true" />
-            <element signature="method#downloadFile#0;class#PgCsDocumentRs#0" expanded="false" />
+            <element signature="e#3701#3720#0" expanded="false" />
+            <element signature="e#4190#4208#0" expanded="false" />
           </folding>
         </state>
       </provider>
@@ -1584,24 +1487,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.9640933" vertical-offset="1091" max-vertical-offset="2112">
           <caret line="83" column="62" selection-start-line="83" selection-start-column="62" selection-end-line="83" selection-end-column="62" />
-          <folding>
-            <element signature="e#2170#2184#0" expanded="true" />
-            <marker date="1536213480710" expanded="true" signature="-1:-1" placeholder="select count..PG_ALARM..." />
-            <marker date="1536213480710" expanded="true" signature="-1:-1" placeholder="select count..PG_ALARM..." />
-            <marker date="1536213480710" expanded="true" signature="-1:-1" placeholder="select count..PG_ALARM..." />
-            <marker date="1536213480710" expanded="true" signature="-1:-1" placeholder="select count..PG_ALARM..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.41666666" vertical-offset="990" max-vertical-offset="1672">
-          <caret line="72" column="55" selection-start-line="72" selection-start-column="55" selection-end-line="72" selection-end-column="55" />
-          <folding>
-            <element signature="e#2152#2168#0" expanded="false" />
-            <element signature="e#2257#2271#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1609,10 +1494,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.75" vertical-offset="440" max-vertical-offset="3938">
           <caret line="62" column="13" selection-start-line="62" selection-start-column="13" selection-end-line="62" selection-end-column="13" />
-          <folding>
-            <element signature="e#1393#1394#0" expanded="false" />
-            <element signature="e#1451#1452#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1620,7 +1501,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.35547575" vertical-offset="0" max-vertical-offset="1012">
           <caret line="18" column="0" selection-start-line="18" selection-start-column="0" selection-end-line="18" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1628,9 +1508,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.45421904" vertical-offset="2145" max-vertical-offset="3608">
           <caret line="125" column="29" selection-start-line="125" selection-start-column="29" selection-end-line="125" selection-end-column="29" />
-          <folding>
-            <element signature="e#3094#3110#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1638,7 +1515,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.513465" vertical-offset="0" max-vertical-offset="1276">
           <caret line="22" column="51" selection-start-line="22" selection-start-column="51" selection-end-line="22" selection-end-column="51" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1646,7 +1522,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.5924596" vertical-offset="0" max-vertical-offset="1254">
           <caret line="20" column="28" selection-start-line="20" selection-start-column="28" selection-end-line="20" selection-end-column="28" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1654,18 +1529,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-3.3052065" vertical-offset="4063" max-vertical-offset="4620">
           <caret line="115" column="15" selection-start-line="115" selection-start-column="15" selection-end-line="115" selection-end-column="15" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.20833333" vertical-offset="1892" max-vertical-offset="3850">
-          <caret line="152" column="24" selection-start-line="152" selection-start-column="24" selection-end-line="152" selection-end-column="24" />
-          <folding>
-            <element signature="method#addReservePlan#0;class#PgReservePlanRs#0" expanded="false" />
-            <element signature="e#3206#3222#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1673,7 +1536,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.06147541" vertical-offset="183" max-vertical-offset="506">
           <caret line="10" column="0" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1681,7 +1543,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="3388">
           <caret line="39" column="56" selection-start-line="39" selection-start-column="56" selection-end-line="39" selection-end-column="56" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1689,22 +1550,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.33213645" vertical-offset="959" max-vertical-offset="2508">
           <caret line="71" column="36" selection-start-line="71" selection-start-column="36" selection-end-line="71" selection-end-column="36" />
-          <folding>
-            <marker date="1536217243963" expanded="true" signature="-1:-1" placeholder="select count..PG_RESERVE_PLAN..." />
-          </folding>
-        </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 vertical-scroll-proportion="0.46401516" vertical-offset="1273" max-vertical-offset="1980">
-          <caret line="106" column="70" selection-start-line="106" selection-start-column="70" selection-end-line="106" selection-end-column="70" />
-          <folding>
-            <element signature="imports" expanded="false" />
-            <element signature="method#linkDevice#0;class#PgAlarmLinkRs#0" expanded="false" />
-            <element signature="e#1459#1475#0" expanded="false" />
-            <element signature="method#linkPartitionDevice#0;class#PgAlarmLinkRs#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1712,7 +1557,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.35906643" vertical-offset="1164" max-vertical-offset="3388">
           <caret line="80" column="23" selection-start-line="80" selection-start-column="23" selection-end-line="80" selection-end-column="23" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1720,7 +1564,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.625" vertical-offset="1364" max-vertical-offset="4158">
           <caret line="99" column="37" selection-start-line="99" selection-start-column="37" selection-end-line="99" selection-end-column="37" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1728,7 +1571,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="1553" max-vertical-offset="2134">
           <caret line="98" column="16" selection-start-line="98" selection-start-column="16" selection-end-line="98" selection-end-column="16" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1736,9 +1578,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="837" max-vertical-offset="1276">
           <caret line="59" column="0" selection-start-line="59" selection-start-column="0" selection-end-line="59" selection-end-column="0" />
-          <folding>
-            <element signature="e#1980#1990#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1746,10 +1585,259 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.24955116" vertical-offset="631" max-vertical-offset="1232">
           <caret line="58" column="34" selection-start-line="58" selection-start-column="34" selection-end-line="58" selection-end-column="34" />
+        </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 vertical-scroll-proportion="0.0" vertical-offset="6759" max-vertical-offset="8316">
+          <caret line="268" column="42" selection-start-line="268" selection-start-column="42" selection-end-line="268" selection-end-column="42" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.8779174" vertical-offset="347" max-vertical-offset="2662">
+          <caret line="54" column="9" selection-start-line="54" selection-start-column="9" selection-end-line="54" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="1.9353681" vertical-offset="0" max-vertical-offset="4906">
+          <caret line="70" column="71" selection-start-line="70" selection-start-column="66" selection-end-line="70" selection-end-column="75" />
+        </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 vertical-scroll-proportion="0.32854578" vertical-offset="1115" max-vertical-offset="1672">
+          <caret line="76" column="33" selection-start-line="76" selection-start-column="33" selection-end-line="76" selection-end-column="33" />
+        </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 vertical-scroll-proportion="3.1723518" vertical-offset="81" max-vertical-offset="2354">
+          <caret line="104" column="12" selection-start-line="104" selection-start-column="12" selection-end-line="104" selection-end-column="12" />
           <folding />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.5260323" vertical-offset="4239" max-vertical-offset="4796">
+          <caret line="224" column="0" selection-start-line="224" selection-start-column="0" selection-end-line="224" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.6445242" vertical-offset="1709" max-vertical-offset="2332">
+          <caret line="111" column="53" selection-start-line="111" selection-start-column="53" selection-end-line="111" selection-end-column="53" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-3.5421903" vertical-offset="5515" max-vertical-offset="6072">
+          <caret line="184" column="25" selection-start-line="184" selection-start-column="25" selection-end-line="184" selection-end-column="25" />
+        </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 vertical-scroll-proportion="-0.78994614" vertical-offset="924" max-vertical-offset="7128">
+          <caret line="41" column="5" selection-start-line="41" selection-start-column="5" selection-end-line="41" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.4344704" vertical-offset="748" max-vertical-offset="1474">
+          <caret line="72" column="0" selection-start-line="72" selection-start-column="0" selection-end-line="72" selection-end-column="0" />
+        </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 vertical-scroll-proportion="0.0" vertical-offset="264" max-vertical-offset="1782">
+          <caret line="37" column="57" selection-start-line="37" selection-start-column="57" selection-end-line="37" selection-end-column="57" />
+          <folding>
+            <marker date="1531722832731" expanded="true" signature="-1:-1" placeholder="select id,CH..PG_CH4..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2420">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://C:/Program Files/Java/jdk1.8.0_131/src.zip!/java/sql/Timestamp.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33027524" vertical-offset="4606" max-vertical-offset="12980">
+          <caret line="236" column="0" selection-start-line="236" selection-start-column="0" selection-end-line="236" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="2.2118492" vertical-offset="0" max-vertical-offset="1496">
+          <caret line="87" column="52" selection-start-line="87" selection-start-column="52" selection-end-line="87" selection-end-column="52" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.4901257" vertical-offset="79" max-vertical-offset="1298">
+          <caret line="25" column="25" selection-start-line="25" selection-start-column="25" selection-end-line="25" selection-end-column="25" />
+          <folding>
+            <marker date="1537412037475" expanded="true" signature="-1:-1" placeholder="select equip..PG_EQUIPMENT..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.8330341" vertical-offset="680" max-vertical-offset="4466">
+          <caret line="68" column="29" selection-start-line="68" selection-start-column="29" selection-end-line="68" selection-end-column="29" />
+          <folding>
+            <element signature="e#1490#1506#0" expanded="true" />
+            <element signature="e#6332#6348#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgEquipment.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.3680431" vertical-offset="191" max-vertical-offset="1540">
+          <caret line="20" column="17" selection-start-line="20" selection-start-column="17" selection-end-line="20" selection-end-column="17" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/4.3.6.Final/hibernate-core-4.3.6.Final-sources.jar!/org/hibernate/internal/AbstractQueryImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33333334" vertical-offset="18814" max-vertical-offset="20328">
+          <caret line="974" column="0" selection-start-line="974" selection-start-column="0" selection-end-line="974" selection-end-column="0" />
+          <folding />
+        </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 vertical-scroll-proportion="0.5924596" vertical-offset="0" max-vertical-offset="1980">
+          <caret line="18" column="32" selection-start-line="18" selection-start-column="32" selection-end-line="18" selection-end-column="32" />
+          <folding />
+        </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 vertical-scroll-proportion="0.7109515" vertical-offset="0" max-vertical-offset="704">
+          <caret line="18" column="31" selection-start-line="18" selection-start-column="31" selection-end-line="18" selection-end-column="31" />
+          <folding>
+            <element signature="e#213#214#0" expanded="true" />
+            <element signature="e#244#245#0" expanded="true" />
+            <element signature="e#292#293#0" expanded="true" />
+            <element signature="e#332#333#0" expanded="true" />
+            <element signature="e#394#395#0" expanded="true" />
+            <element signature="e#438#439#0" expanded="true" />
+            <element signature="e#474#475#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://C:/Program Files/Java/jdk1.8.0_131/src.zip!/java/lang/String.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.21139705" vertical-offset="1469" max-vertical-offset="67452">
+          <caret line="107" column="16" selection-start-line="107" selection-start-column="12" selection-end-line="107" selection-end-column="16" />
+          <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 vertical-scroll-proportion="0.0" vertical-offset="2301" max-vertical-offset="3388">
+          <caret line="277" column="9" selection-start-line="277" selection-start-column="9" selection-end-line="277" selection-end-column="9" />
+          <folding>
+            <element signature="method#addLog#0;class#PgPipeLineRs#0" expanded="false" />
+            <element signature="method#editPipeLine#0;class#PgPipeLineRs#0" expanded="false" />
+            <element signature="method#deletePipeLine#0;class#PgPipeLineRs#0" expanded="false" />
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" expanded="false" />
+            <element signature="e#9602#9626#0" expanded="true" />
+            <element signature="e#10329#10337#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.43727598" vertical-offset="120" max-vertical-offset="1122">
+          <caret line="13" column="34" selection-start-line="13" selection-start-column="34" selection-end-line="13" selection-end-column="34" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.8547855" vertical-offset="137" max-vertical-offset="704">
+          <caret line="18" column="31" selection-start-line="18" selection-start-column="31" selection-end-line="18" selection-end-column="31" />
+          <folding>
+            <element signature="e#204#205#0" expanded="true" />
+            <element signature="e#233#234#0" expanded="true" />
+            <element signature="e#277#278#0" expanded="true" />
+            <element signature="e#313#314#0" expanded="true" />
+            <element signature="e#375#376#0" expanded="true" />
+            <element signature="e#419#420#0" expanded="true" />
+            <element signature="e#455#456#0" expanded="true" />
+          </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 vertical-scroll-proportion="0.0" vertical-offset="330" max-vertical-offset="1342">
+          <caret line="55" column="42" selection-start-line="55" selection-start-column="42" selection-end-line="55" selection-end-column="42" />
+          <folding>
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" expanded="false" />
+            <element signature="e#1787#1811#0" expanded="true" />
+            <element signature="e#2482#2490#0" expanded="true" />
+            <marker date="1537414540748" expanded="true" signature="1552:1622" placeholder="select LINE_..PG_PIPELINE..." />
+            <marker date="1537414540748" expanded="true" signature="1552:1621" placeholder="select LINE_..PG_PIPELINE..." />
+            <marker date="1537414540748" expanded="true" signature="2310:2352" placeholder="select disti..PG_PIPELINE..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="849" max-vertical-offset="1650">
+          <caret line="61" column="56" selection-start-line="61" selection-start-column="56" selection-end-line="61" selection-end-column="56" />
+          <folding>
+            <element signature="e#2433#2452#0" expanded="true" />
+            <marker date="1537414756878" expanded="true" signature="2209:2277" placeholder="select PG_NA..PG_PIPE_GALLERY..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.7140151" vertical-offset="4067" max-vertical-offset="4752">
+          <caret line="221" column="27" selection-start-line="221" selection-start-column="27" selection-end-line="221" selection-end-column="27" />
+          <folding>
+            <element signature="e#6945#6964#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java
index 238bc39..6256b9d 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java
@@ -78,7 +78,7 @@
     public PgEquipmentDto(PgEquipment equipment) {
         if (equipment == null) return;
 
-        SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 
         this.setId(equipment.getId());
         this.setEqName(equipment.getEqName());
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineLengthStatic.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineLengthStatic.java
new file mode 100644
index 0000000..a25538f
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineLengthStatic.java
@@ -0,0 +1,26 @@
+package com.casic.PgInterface.devTable.dto;
+
+/**
+ * Created by yxw on 2018/9/20.
+ */
+public class PgPipeLineLengthStatic {
+
+    private String lineType;
+    private String length;
+
+    public String getLineType() {
+        return lineType;
+    }
+
+    public void setLineType(String lineType) {
+        this.lineType = lineType;
+    }
+
+    public String getLength() {
+        return length;
+    }
+
+    public void setLength(String length) {
+        this.length = length;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.java b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.java
new file mode 100644
index 0000000..bd65ff4
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.java
@@ -0,0 +1,26 @@
+package com.casic.PgInterface.devTable.dto;
+
+/**
+ * Created by yxw on 2018/9/20.
+ */
+public class PipeGalleryStatic {
+
+    private String pgName;
+    private String length;
+
+    public String getPgName() {
+        return pgName;
+    }
+
+    public void setPgName(String pgName) {
+        this.pgName = pgName;
+    }
+
+    public String getLength() {
+        return length;
+    }
+
+    public void setLength(String length) {
+        this.length = length;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
index e46742c..ab0908b 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
@@ -23,7 +23,7 @@
         criteria.add(Restrictions.eq("eqCode", eqCode));
         criteria.add(Restrictions.eq("active",1));
 
-        List<PgEquipment> pgEquipmentList = criteria.list();
+        List<PgEquipment> pgEquipmentList = (List<PgEquipment>)criteria.list();
 
         if(pgEquipmentList!=null&&pgEquipmentList.size()!=0)
             return pgEquipmentList.get(0);
@@ -49,10 +49,10 @@
 
     //统计工器具耗材数量
     public List<PgDeviceTypeStatisticDto> getDeviceStatisticByDevType(String eqType){
-        String eqType1=eqType.equals("0")?"工器具":"耗材";
+        //String eqType1=eqType.equals("0")?"工器具":"耗材";
 
         String hql="select equipment.EQ_NAME,count(*) from PG_EQUIPMENT equipment where equipment.EQ_TYPE = '"
-        +eqType1+"' group by equipment.EQ_NAME";
+        +eqType+"' group by equipment.EQ_NAME";
 
         List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list();
 
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 8d8db5d..4cfa880 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
@@ -3,6 +3,7 @@
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
 import com.casic.PgInterface.devTable.domain.PgPipeLine;
 import com.casic.PgInterface.devTable.dto.PgPipeLineDto;
+import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
@@ -39,13 +40,35 @@
         return pgPipeLineDtoList;
     }
 
-   public String getPipeLengthByName(String lineType) {
-       String sql = "select SUM(PIPE_LENGTH) from PG_PIPELINE where LINE_TYPE = '" + lineType + "'";
+    public List<PgPipeLineLengthStatic> getPipeLengthByName() {
+        String sql = "select LINE_TYPE,SUM(PIPE_LENGTH) from PG_PIPELINE group by LINE_TYPE ";
 
-       String sumLength = String.valueOf(this.getSession().createSQLQuery(sql).uniqueResult());
+        List<Object[]> objectList = this.getSession().createSQLQuery(sql).list();
+        List<PgPipeLineLengthStatic> pgPipeLineLengthStaticList = new ArrayList<PgPipeLineLengthStatic>();
 
-       return sumLength;
-   }
+        for(Object[] objectArray : objectList)
+        {
+            PgPipeLineLengthStatic pgPipeLineLengthStatic=new PgPipeLineLengthStatic();
+            pgPipeLineLengthStatic.setLineType(String.valueOf(objectArray[0]));
+            pgPipeLineLengthStatic.setLength(String.valueOf(objectArray[1]));
+            pgPipeLineLengthStaticList.add(pgPipeLineLengthStatic);
+        }
+        return pgPipeLineLengthStaticList;
+    }
+
+    public  List<String> getPipeType() {
+        String sql = "select distinct LINE_TYPE from PG_PIPELINE";
+
+        List<Object> objectList = this.getSession().createSQLQuery(sql).list();
+
+        List<String> stringList=new ArrayList<String>();
+
+        for(Object ob : objectList)
+        {
+            stringList.add(String.valueOf(ob));
+        }
+        return stringList;
+    }
 
 }
 
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java
index 41f0e64..375c078 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java
@@ -4,6 +4,7 @@
 import com.casic.PgInterface.devTable.domain.PgPartition;
 import com.casic.PgInterface.devTable.domain.PipeGallery;
 import com.casic.PgInterface.devTable.dto.PipeGalleryDto;
+import com.casic.PgInterface.devTable.dto.PipeGalleryStatic;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
@@ -58,13 +59,21 @@
         return pipeGalleryDtoList;
     }
 
-    public String getPgLengthByName(String pgName) {
+    public List<PipeGalleryStatic> getPgLengthByName() {
 
-        String sql = "select SUM(PAR_LENGTH) from PG_PIPE_GALLERY where PG_NAME = '" + pgName + "'";
+        String sql = "select PG_NAME,SUM(PAR_LENGTH) from PG_PIPE_GALLERY group by PG_NAME ";
 
-        String sumLength = String.valueOf(this.getSession().createSQLQuery(sql).uniqueResult());
+        List<Object[]> objectList = this.getSession().createSQLQuery(sql).list();
+        List<PipeGalleryStatic> pipeGalleryStaticList = new ArrayList<PipeGalleryStatic>();
 
-        return sumLength;
+        for(Object[] objectArray : objectList)
+        {
+            PipeGalleryStatic pipeGalleryStatic=new PipeGalleryStatic();
+            pipeGalleryStatic.setPgName(String.valueOf(objectArray[0]));
+            pipeGalleryStatic.setLength(String.valueOf(objectArray[1]));
+            pipeGalleryStaticList.add(pipeGalleryStatic);
+        }
+        return pipeGalleryStaticList;
     }
 
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
index 251c9d2..fc1f05f 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
@@ -44,7 +44,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
-        SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 
         try {
             if (pgEquipmentManager.getEquipmentByCode(eqCode)!=null) {
@@ -92,7 +92,7 @@
         HashMap<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
         String result = "";
-        SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 
         try {
             PgEquipment pgEquipment=pgEquipmentManager.get(id);
@@ -211,4 +211,4 @@
         return resultMap;
     }
 
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
index 3da622c..41f7374 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
@@ -4,6 +4,7 @@
 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.manager.PgPartitionManager;
 import com.casic.PgInterface.devTable.manager.PgPipeLineManager;
 import com.casic.PgInterface.devTable.manager.PipeGalleryManager;
@@ -261,14 +262,14 @@
      * 根据管线类型获取管线长度
      */
     @POST
-    @Path("getPipeLengthByName")
+    @Path("getPipeLengthStatic")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String,Object> getPipeLengthByName(@FormParam("lineType") String lineType)throws Exception{
+    public Map<String,Object> getPipeLengthStatic()throws Exception{
         Map<String, Object> resultMap = new HashMap<String, Object>();
-        String result = "";
         String msg = "";
+        List<PgPipeLineLengthStatic> pgPipeLineLengthStaticList=new ArrayList<PgPipeLineLengthStatic>();
         try {
-            result = pgPipeLineManager.getPipeLengthByName(lineType);
+            pgPipeLineLengthStaticList = pgPipeLineManager.getPipeLengthByName();
             msg="管线长度获取成功";
         }catch(Exception e)
         {
@@ -276,9 +277,32 @@
             msg="管线长度统计失败";
         }
         resultMap.put("msg",msg);
-        resultMap.put("result",result);
+        resultMap.put("result",pgPipeLineLengthStaticList);
 
         return resultMap;
     }
 
-}
+    /**
+     * 根据管线名称获取管线信息
+     */
+    @POST
+    @Path("getPipeLineType")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String, Object> getPipeLineType()
+            throws Exception {
+        Map<String, Object> resultMap = new HashMap<String, Object>();
+        String msg = "";
+        List<String> stringList=new ArrayList<String>();
+        try {
+            stringList = pgPipeLineManager.getPipeType();
+            msg = "获取成功";
+        } catch (Exception e) {
+            msg = "获取失败";
+            e.printStackTrace();
+        }
+        resultMap.put("msg", msg);
+        resultMap.put("result", stringList);
+        return resultMap;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java b/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java
index 1d21e60..3c301bc 100644
--- a/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java
@@ -3,6 +3,7 @@
 import com.casic.PgInterface.devTable.domain.PgPartition;
 import com.casic.PgInterface.devTable.domain.PipeGallery;
 import com.casic.PgInterface.devTable.dto.PipeGalleryDto;
+import com.casic.PgInterface.devTable.dto.PipeGalleryStatic;
 import com.casic.PgInterface.devTable.manager.PgPartitionManager;
 import com.casic.PgInterface.devTable.manager.PipeGalleryManager;
 import org.slf4j.Logger;
@@ -202,19 +203,17 @@
      * 获取管廊仓体的长度
      */
     @POST
-    @Path("getPgLengthByName")
+    @Path("getPgLengthStatic")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String,Object> getPgLengthByName(@FormParam("pgName") String pgName)
+    public Map<String,Object> getPgLengthStatic()
     {
         Map<String,Object> resultMap=new HashMap<String, Object>();
-        String result="";
+        List<PipeGalleryStatic> pipeGalleryStaticList=new ArrayList<PipeGalleryStatic>();
         String msg="";
 
         try{
-            result=pipeGalleryManager.getPgLengthByName(pgName);
-            if(result=="null")
-                msg="不存在管廊仓："+pgName;
-            else
+            pipeGalleryStaticList=pipeGalleryManager.getPgLengthByName();
+
             msg="仓体长度获取成功";
         }
         catch(Exception e)
@@ -224,7 +223,7 @@
         }
 
         resultMap.put("msg",msg);
-        resultMap.put("result",result);
+        resultMap.put("result",pipeGalleryStaticList);
 
         return resultMap;
     }
diff --git "a/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx" "b/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx"
new file mode 100644
index 0000000..eb93499
--- /dev/null
+++ "b/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx"
Binary files differ
diff --git "a/\346\216\245\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx" "b/\346\216\245\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx"
index d855b44..d527ea2 100644
--- "a/\346\216\245\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx"
+++ "b/\346\216\245\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx"
Binary files differ