diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 99c29b1..73e784d 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,36 +8,8 @@
   <component name="ChangeListManager">
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="修改施工统计问题">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDocDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDocDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainTypeDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainTypeDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDocDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDocDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/httpInterfaceTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/httpInterfaceTest.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明新需求.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明新需求.docx" afterDir="false" />
     </list>
     <ignored path="PgInterface.iws" />
     <ignored path=".idea/workspace.xml" />
@@ -62,7 +34,7 @@
           <entry key="project.open.time.126" value="1" />
           <entry key="project.open.time.140" value="1" />
           <entry key="project.open.time.19" value="2" />
-          <entry key="project.open.time.2" value="2" />
+          <entry key="project.open.time.2" value="3" />
           <entry key="project.open.time.235" value="1" />
           <entry key="project.open.time.246" value="1" />
           <entry key="project.open.time.3" value="1" />
@@ -70,19 +42,22 @@
           <entry key="project.open.time.72" value="1" />
           <entry key="project.open.time.76" value="1" />
           <entry key="project.open.time.9" value="1" />
-          <entry key="project.opened" value="14" />
+          <entry key="project.opened" value="15" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.open">
         <counts>
           <entry key="class" value="1" />
-          <entry key="java" value="228" />
+          <entry key="java" value="230" />
+          <entry key="jsp" value="1" />
+          <entry key="properties" value="1" />
+          <entry key="xml" value="1" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.vcs.git.usages" />
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="9381" />
+          <entry key="JAVA" value="9431" />
           <entry key="PLAIN_TEXT" value="66" />
         </counts>
       </usages-collector>
@@ -91,14 +66,17 @@
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
           <entry key="dummy" value="28" />
-          <entry key="java" value="9381" />
+          <entry key="java" value="9431" />
           <entry key="txt" value="38" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="1" />
-          <entry key="JAVA" value="228" />
+          <entry key="JAVA" value="230" />
+          <entry key="JSP" value="1" />
+          <entry key="Properties" value="1" />
+          <entry key="XML" value="1" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.spring.boot.mvc.usages" />
@@ -110,10 +88,13 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/httpInterfaceTest.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="182">
-              <caret line="9" column="11" selection-start-line="9" selection-start-column="11" selection-end-line="9" selection-end-column="11" />
+              <caret line="117" column="32" lean-forward="true" selection-start-line="117" selection-start-column="32" selection-end-line="117" selection-end-column="32" />
+              <folding>
+                <element signature="method#addEquipment#0;class#PgEquipmentRs#0" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -161,7 +142,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" />
@@ -212,6 +192,7 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/httpInterfaceTest.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
       </list>
     </option>
   </component>
@@ -275,10 +256,9 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="-8" />
-    <option name="y" value="-8" />
-    <option name="width" value="941" />
-    <option name="height" value="668" />
+    <option name="x" value="-6" />
+    <option name="width" value="1378" />
+    <option name="height" value="744" />
   </component>
   <component name="ProjectReloadState">
     <option name="STATE" value="0" />
@@ -288,6 +268,8 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="Scope" />
+      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -328,14 +310,19 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="test" type="462c0819:PsiDirectoryNode" />
+              <item name="rs" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
+              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="webapp" type="462c0819:PsiDirectoryNode" />
             </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="Scope" />
-      <pane id="PackagesPane" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -365,8 +352,8 @@
     <property name="MemberChooser.sorted" value="false" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1541489466148" />
-    <property name="last_opened_file_path" value="D:/DZ/bs/PHM_DZ/.idea" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1541994868995" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/webapp" />
     <property name="options.lastSelected" value="xpath.settings" />
     <property name="options.searchVisible" value="true" />
     <property name="options.splitter.details.proportions" value="0.2" />
@@ -553,9 +540,7 @@
       </ConfigurationWrapper>
       <method v="2">
         <option name="Make" enabled="true" />
-        <option name="BuildArtifacts" enabled="true">
-          <artifact name="PgInterface" />
-        </option>
+        <option name="BuildArtifacts" enabled="true" />
       </method>
     </configuration>
     <configuration default="true" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" ALTERNATIVE_JRE_ENABLED="false" ALTERNATIVE_JRE_PATH="">
@@ -805,6 +790,7 @@
       <workItem from="1541303711282" duration="5696000" />
       <workItem from="1541379811355" duration="26465000" />
       <workItem from="1541465806633" duration="12993000" />
+      <workItem from="1541993902728" duration="773000" />
     </task>
     <task id="LOCAL-00011" summary="新需求输入前上传">
       <created>1521168093758</created>
@@ -1153,7 +1139,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="1070566000" />
+    <option name="totallyTimeSpent" value="1071339000" />
   </component>
   <component name="TodoView" selected-index="1">
     <todo-panel id="selected-file">
@@ -1166,8 +1152,9 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
+    <editor active="true" />
     <layout>
-      <window_info active="true" id="Project" order="0" sideWeight="0.91929823" visible="true" weight="0.2965204" />
+      <window_info active="true" id="Project" order="0" sideWeight="0.91929823" visible="true" weight="0.2322239" />
       <window_info id="Structure" order="1" weight="0.25" />
       <window_info id="Palette&#9;" order="2" />
       <window_info id="Build Variants" order="3" side_tool="true" />
@@ -1190,7 +1177,7 @@
       <window_info anchor="bottom" id="Version Control" order="11" />
       <window_info anchor="bottom" id="Application Servers" order="12" weight="0.32764506" />
       <window_info anchor="bottom" id="Terminal" order="13" weight="0.32935154" />
-      <window_info anchor="bottom" id="Messages" order="14" visible="true" weight="0.31740615" />
+      <window_info anchor="bottom" id="Messages" order="14" weight="0.31740615" />
       <window_info anchor="bottom" id="Android" order="15" />
       <window_info anchor="bottom" id="Spring" order="16" weight="0.32935154" />
       <window_info anchor="bottom" id="Database Changes" order="17" show_stripe_button="false" />
@@ -1300,6 +1287,12 @@
           <properties />
           <option name="timeStamp" value="330" />
         </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java</url>
+          <line>97</line>
+          <properties />
+          <option name="timeStamp" value="331" />
+        </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
   </component>
@@ -1308,144 +1301,18 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgContructionStatic.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="88">
-          <caret line="4" column="19" selection-start-line="4" selection-start-column="19" selection-end-line="4" selection-end-column="19" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-16">
-          <caret line="14" column="7" lean-forward="true" selection-start-line="14" selection-start-column="7" selection-end-line="14" selection-end-column="7" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="572">
-          <caret line="86" column="9" lean-forward="true" selection-start-line="86" selection-start-column="9" selection-end-line="86" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="281">
-          <caret line="282" column="26" lean-forward="true" selection-start-line="282" selection-start-column="26" selection-end-line="282" selection-end-column="26" />
-          <folding>
-            <element signature="e#8075#8091#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionStiatistic.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="8" column="5" lean-forward="true" selection-start-line="8" selection-start-column="5" selection-end-line="8" selection-end-column="5" />
-          <folding>
-            <element signature="e#160#161#0" expanded="true" />
-            <element signature="e#195#196#0" expanded="true" />
-            <element signature="e#251#252#0" expanded="true" />
-            <element signature="e#299#300#0" expanded="true" />
-          </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 relative-caret-position="369">
-          <caret line="279" column="5" lean-forward="true" selection-start-line="279" selection-start-column="5" selection-end-line="279" selection-end-column="5" />
-          <folding>
-            <element signature="e#10272#10288#0" expanded="true" />
-            <element signature="e#10399#10425#0" expanded="true" />
-            <element signature="e#11494#11520#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="27" lean-forward="true" selection-start-line="27" selection-end-line="27" />
-          <folding>
-            <element signature="method#getPgContructionByName#0;class#PgConstructionManager#0" />
-            <element signature="method#getPgContructionByNameOrType#0;class#PgConstructionManager#0" />
-            <element signature="method#getPgContructionDtoByNameOrType#0;class#PgConstructionManager#0" />
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-            <element signature="e#3750#3776#0" expanded="true" />
-            <element signature="method#getStatisticByPar#0;class#PgConstructionManager#0" />
-            <element signature="method#getStatisticByType#0;class#PgConstructionManager#0" />
-            <element signature="method#getConstructionNum#0;class#PgConstructionManager#0" />
-            <element signature="method#getConstructionToday#0;class#PgConstructionManager#0" />
-            <element signature="method#getPgConstructionList#0;class#PgConstructionManager#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDateStatistic.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="11" column="16" lean-forward="true" selection-start-line="11" selection-start-column="16" selection-end-line="11" selection-end-column="16" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2024">
-          <caret line="138" column="16" lean-forward="true" selection-start-line="138" selection-start-column="16" selection-end-line="138" selection-end-column="16" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionParStatisticDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="44">
-          <caret line="2" column="75" selection-start-line="2" selection-start-column="75" selection-end-line="2" selection-end-column="75" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="308">
-          <caret line="16" lean-forward="true" selection-start-line="16" selection-end-line="16" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeNumStatisticDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="14" column="1" lean-forward="true" selection-start-line="14" selection-start-column="1" selection-end-line="14" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeStatisticDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="66">
-          <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="110">
-          <caret line="13" column="34" lean-forward="true" selection-start-line="13" selection-start-column="34" selection-end-line="13" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="124">
-          <caret line="9" column="21" selection-start-line="9" selection-start-column="21" selection-end-line="9" selection-end-column="21" />
-        </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 relative-caret-position="124">
-          <caret line="9" column="20" selection-start-line="9" selection-start-column="20" selection-end-line="9" selection-end-column="20" />
-        </state>
-      </provider>
-    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionStiatistic.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDateStatistic.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionParStatisticDto.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeDto.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeNumStatisticDto.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeStatisticDto.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java" />
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-8">
@@ -1453,27 +1320,9 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="124">
-          <caret line="9" column="20" selection-start-line="9" selection-start-column="20" selection-end-line="9" selection-end-column="20" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="124">
-          <caret line="9" column="20" selection-start-line="9" selection-start-column="20" selection-end-line="9" selection-end-column="20" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="168">
-          <caret line="11" column="22" lean-forward="true" selection-start-line="11" selection-start-column="22" selection-end-line="11" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java" />
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="154">
@@ -1481,20 +1330,8 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="110">
-          <caret line="5" column="25" selection-start-line="5" selection-start-column="25" selection-end-line="5" selection-end-column="25" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="124">
-          <caret line="8" column="27" selection-start-line="8" selection-start-column="27" selection-end-line="8" selection-end-column="27" />
-        </state>
-      </provider>
-    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java" />
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="124">
@@ -1502,27 +1339,9 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="124">
-          <caret line="7" column="28" selection-start-line="7" selection-start-column="28" selection-end-line="7" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeStatisticDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="110">
-          <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="124">
-          <caret line="10" column="27" selection-start-line="10" selection-start-column="27" selection-end-line="10" selection-end-column="27" />
-        </state>
-      </provider>
-    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeStatisticDto.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java" />
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="154">
@@ -1537,32 +1356,9 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineLengthStatic.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="110">
-          <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="154">
-          <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="132">
-          <caret line="7" column="22" selection-start-line="7" selection-start-column="22" selection-end-line="7" selection-end-column="22" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="method#ConvertToDTO#0;class#PgRoadDto#0" />
-            <element signature="method#ConvertToDTOList#0;class#PgRoadDto#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineLengthStatic.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" />
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="124">
@@ -1570,60 +1366,13 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="154">
-          <caret line="7" column="26" lean-forward="true" selection-start-line="7" selection-start-column="26" selection-end-line="7" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="132">
-          <caret line="6" column="28" selection-start-line="6" selection-start-column="28" selection-end-line="6" selection-end-column="28" />
-          <folding>
-            <element signature="e#186#187#0" expanded="true" />
-            <element signature="e#224#225#0" expanded="true" />
-            <element signature="e#254#255#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="124">
-          <caret line="7" column="27" selection-start-line="7" selection-start-column="27" selection-end-line="7" selection-end-column="27" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="124">
-          <caret line="8" column="27" selection-start-line="8" selection-start-column="27" selection-end-line="8" selection-end-column="27" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="124">
-          <caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="124">
-          <caret line="7" column="28" selection-start-line="7" selection-start-column="28" selection-end-line="7" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="124">
-          <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/devTable/dto/PipeGalleryStatic.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java" />
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="124">
@@ -1631,55 +1380,13 @@
         </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 relative-caret-position="124">
-          <caret line="7" column="29" selection-start-line="7" selection-start-column="29" selection-end-line="7" selection-end-column="29" />
-        </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 relative-caret-position="124">
-          <caret line="9" column="26" selection-start-line="9" selection-start-column="26" selection-end-line="9" selection-end-column="26" />
-        </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 relative-caret-position="124">
-          <caret line="7" column="30" selection-start-line="7" selection-start-column="30" selection-end-line="7" selection-end-column="30" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDocDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="124">
-          <caret line="8" column="27" selection-start-line="8" selection-start-column="27" selection-end-line="8" selection-end-column="27" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="124">
-          <caret line="9" column="24" selection-start-line="9" selection-start-column="24" selection-end-line="9" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="124">
-          <caret line="7" column="22" selection-start-line="7" selection-start-column="22" selection-end-line="7" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="124">
-          <caret line="7" column="22" selection-start-line="7" selection-start-column="22" selection-end-line="7" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDocDto.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainTypeDto.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDocDto.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java" />
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="146">
@@ -1687,17 +1394,32 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolMaintainInfoDto.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolMaintainInfoDto.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/httpInterfaceTest.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="110">
-          <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
+        <state relative-caret-position="250">
+          <caret line="63" lean-forward="true" selection-start-line="63" selection-end-line="63" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/httpInterfaceTest.java">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/index.jsp">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="13" lean-forward="true" selection-start-line="13" selection-end-line="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="182">
-          <caret line="9" column="11" selection-start-line="9" selection-start-column="11" selection-end-line="9" selection-end-column="11" />
+          <caret line="117" column="32" lean-forward="true" selection-start-line="117" selection-start-column="32" selection-end-line="117" selection-end-column="32" />
+          <folding>
+            <element signature="method#addEquipment#0;class#PgEquipmentRs#0" />
+          </folding>
         </state>
       </provider>
     </entry>

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 99c29b1..73e784d 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,36 +8,8 @@
   <component name="ChangeListManager">
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="修改施工统计问题">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDocDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDocDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainTypeDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainTypeDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDocDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDocDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/httpInterfaceTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/httpInterfaceTest.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明新需求.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明新需求.docx" afterDir="false" />
     </list>
     <ignored path="PgInterface.iws" />
     <ignored path=".idea/workspace.xml" />
@@ -62,7 +34,7 @@
           <entry key="project.open.time.126" value="1" />
           <entry key="project.open.time.140" value="1" />
           <entry key="project.open.time.19" value="2" />
-          <entry key="project.open.time.2" value="2" />
+          <entry key="project.open.time.2" value="3" />
           <entry key="project.open.time.235" value="1" />
           <entry key="project.open.time.246" value="1" />
           <entry key="project.open.time.3" value="1" />
@@ -70,19 +42,22 @@
           <entry key="project.open.time.72" value="1" />
           <entry key="project.open.time.76" value="1" />
           <entry key="project.open.time.9" value="1" />
-          <entry key="project.opened" value="14" />
+          <entry key="project.opened" value="15" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.open">
         <counts>
           <entry key="class" value="1" />
-          <entry key="java" value="228" />
+          <entry key="java" value="230" />
+          <entry key="jsp" value="1" />
+          <entry key="properties" value="1" />
+          <entry key="xml" value="1" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.vcs.git.usages" />
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="9381" />
+          <entry key="JAVA" value="9431" />
           <entry key="PLAIN_TEXT" value="66" />
         </counts>
       </usages-collector>
@@ -91,14 +66,17 @@
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
           <entry key="dummy" value="28" />
-          <entry key="java" value="9381" />
+          <entry key="java" value="9431" />
           <entry key="txt" value="38" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="1" />
-          <entry key="JAVA" value="228" />
+          <entry key="JAVA" value="230" />
+          <entry key="JSP" value="1" />
+          <entry key="Properties" value="1" />
+          <entry key="XML" value="1" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.spring.boot.mvc.usages" />
@@ -110,10 +88,13 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/httpInterfaceTest.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="182">
-              <caret line="9" column="11" selection-start-line="9" selection-start-column="11" selection-end-line="9" selection-end-column="11" />
+              <caret line="117" column="32" lean-forward="true" selection-start-line="117" selection-start-column="32" selection-end-line="117" selection-end-column="32" />
+              <folding>
+                <element signature="method#addEquipment#0;class#PgEquipmentRs#0" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -161,7 +142,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" />
@@ -212,6 +192,7 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/httpInterfaceTest.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
       </list>
     </option>
   </component>
@@ -275,10 +256,9 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="-8" />
-    <option name="y" value="-8" />
-    <option name="width" value="941" />
-    <option name="height" value="668" />
+    <option name="x" value="-6" />
+    <option name="width" value="1378" />
+    <option name="height" value="744" />
   </component>
   <component name="ProjectReloadState">
     <option name="STATE" value="0" />
@@ -288,6 +268,8 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="Scope" />
+      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -328,14 +310,19 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="test" type="462c0819:PsiDirectoryNode" />
+              <item name="rs" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
+              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="webapp" type="462c0819:PsiDirectoryNode" />
             </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="Scope" />
-      <pane id="PackagesPane" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -365,8 +352,8 @@
     <property name="MemberChooser.sorted" value="false" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1541489466148" />
-    <property name="last_opened_file_path" value="D:/DZ/bs/PHM_DZ/.idea" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1541994868995" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/webapp" />
     <property name="options.lastSelected" value="xpath.settings" />
     <property name="options.searchVisible" value="true" />
     <property name="options.splitter.details.proportions" value="0.2" />
@@ -553,9 +540,7 @@
       </ConfigurationWrapper>
       <method v="2">
         <option name="Make" enabled="true" />
-        <option name="BuildArtifacts" enabled="true">
-          <artifact name="PgInterface" />
-        </option>
+        <option name="BuildArtifacts" enabled="true" />
       </method>
     </configuration>
     <configuration default="true" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" ALTERNATIVE_JRE_ENABLED="false" ALTERNATIVE_JRE_PATH="">
@@ -805,6 +790,7 @@
       <workItem from="1541303711282" duration="5696000" />
       <workItem from="1541379811355" duration="26465000" />
       <workItem from="1541465806633" duration="12993000" />
+      <workItem from="1541993902728" duration="773000" />
     </task>
     <task id="LOCAL-00011" summary="新需求输入前上传">
       <created>1521168093758</created>
@@ -1153,7 +1139,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="1070566000" />
+    <option name="totallyTimeSpent" value="1071339000" />
   </component>
   <component name="TodoView" selected-index="1">
     <todo-panel id="selected-file">
@@ -1166,8 +1152,9 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
+    <editor active="true" />
     <layout>
-      <window_info active="true" id="Project" order="0" sideWeight="0.91929823" visible="true" weight="0.2965204" />
+      <window_info active="true" id="Project" order="0" sideWeight="0.91929823" visible="true" weight="0.2322239" />
       <window_info id="Structure" order="1" weight="0.25" />
       <window_info id="Palette&#9;" order="2" />
       <window_info id="Build Variants" order="3" side_tool="true" />
@@ -1190,7 +1177,7 @@
       <window_info anchor="bottom" id="Version Control" order="11" />
       <window_info anchor="bottom" id="Application Servers" order="12" weight="0.32764506" />
       <window_info anchor="bottom" id="Terminal" order="13" weight="0.32935154" />
-      <window_info anchor="bottom" id="Messages" order="14" visible="true" weight="0.31740615" />
+      <window_info anchor="bottom" id="Messages" order="14" weight="0.31740615" />
       <window_info anchor="bottom" id="Android" order="15" />
       <window_info anchor="bottom" id="Spring" order="16" weight="0.32935154" />
       <window_info anchor="bottom" id="Database Changes" order="17" show_stripe_button="false" />
@@ -1300,6 +1287,12 @@
           <properties />
           <option name="timeStamp" value="330" />
         </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java</url>
+          <line>97</line>
+          <properties />
+          <option name="timeStamp" value="331" />
+        </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
   </component>
@@ -1308,144 +1301,18 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgContructionStatic.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="88">
-          <caret line="4" column="19" selection-start-line="4" selection-start-column="19" selection-end-line="4" selection-end-column="19" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-16">
-          <caret line="14" column="7" lean-forward="true" selection-start-line="14" selection-start-column="7" selection-end-line="14" selection-end-column="7" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="572">
-          <caret line="86" column="9" lean-forward="true" selection-start-line="86" selection-start-column="9" selection-end-line="86" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="281">
-          <caret line="282" column="26" lean-forward="true" selection-start-line="282" selection-start-column="26" selection-end-line="282" selection-end-column="26" />
-          <folding>
-            <element signature="e#8075#8091#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionStiatistic.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="8" column="5" lean-forward="true" selection-start-line="8" selection-start-column="5" selection-end-line="8" selection-end-column="5" />
-          <folding>
-            <element signature="e#160#161#0" expanded="true" />
-            <element signature="e#195#196#0" expanded="true" />
-            <element signature="e#251#252#0" expanded="true" />
-            <element signature="e#299#300#0" expanded="true" />
-          </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 relative-caret-position="369">
-          <caret line="279" column="5" lean-forward="true" selection-start-line="279" selection-start-column="5" selection-end-line="279" selection-end-column="5" />
-          <folding>
-            <element signature="e#10272#10288#0" expanded="true" />
-            <element signature="e#10399#10425#0" expanded="true" />
-            <element signature="e#11494#11520#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="27" lean-forward="true" selection-start-line="27" selection-end-line="27" />
-          <folding>
-            <element signature="method#getPgContructionByName#0;class#PgConstructionManager#0" />
-            <element signature="method#getPgContructionByNameOrType#0;class#PgConstructionManager#0" />
-            <element signature="method#getPgContructionDtoByNameOrType#0;class#PgConstructionManager#0" />
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-            <element signature="e#3750#3776#0" expanded="true" />
-            <element signature="method#getStatisticByPar#0;class#PgConstructionManager#0" />
-            <element signature="method#getStatisticByType#0;class#PgConstructionManager#0" />
-            <element signature="method#getConstructionNum#0;class#PgConstructionManager#0" />
-            <element signature="method#getConstructionToday#0;class#PgConstructionManager#0" />
-            <element signature="method#getPgConstructionList#0;class#PgConstructionManager#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDateStatistic.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="11" column="16" lean-forward="true" selection-start-line="11" selection-start-column="16" selection-end-line="11" selection-end-column="16" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2024">
-          <caret line="138" column="16" lean-forward="true" selection-start-line="138" selection-start-column="16" selection-end-line="138" selection-end-column="16" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionParStatisticDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="44">
-          <caret line="2" column="75" selection-start-line="2" selection-start-column="75" selection-end-line="2" selection-end-column="75" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="308">
-          <caret line="16" lean-forward="true" selection-start-line="16" selection-end-line="16" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeNumStatisticDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="14" column="1" lean-forward="true" selection-start-line="14" selection-start-column="1" selection-end-line="14" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeStatisticDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="66">
-          <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="110">
-          <caret line="13" column="34" lean-forward="true" selection-start-line="13" selection-start-column="34" selection-end-line="13" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="124">
-          <caret line="9" column="21" selection-start-line="9" selection-start-column="21" selection-end-line="9" selection-end-column="21" />
-        </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 relative-caret-position="124">
-          <caret line="9" column="20" selection-start-line="9" selection-start-column="20" selection-end-line="9" selection-end-column="20" />
-        </state>
-      </provider>
-    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionStiatistic.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDateStatistic.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionParStatisticDto.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeDto.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeNumStatisticDto.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeStatisticDto.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java" />
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-8">
@@ -1453,27 +1320,9 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="124">
-          <caret line="9" column="20" selection-start-line="9" selection-start-column="20" selection-end-line="9" selection-end-column="20" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="124">
-          <caret line="9" column="20" selection-start-line="9" selection-start-column="20" selection-end-line="9" selection-end-column="20" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="168">
-          <caret line="11" column="22" lean-forward="true" selection-start-line="11" selection-start-column="22" selection-end-line="11" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java" />
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="154">
@@ -1481,20 +1330,8 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="110">
-          <caret line="5" column="25" selection-start-line="5" selection-start-column="25" selection-end-line="5" selection-end-column="25" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="124">
-          <caret line="8" column="27" selection-start-line="8" selection-start-column="27" selection-end-line="8" selection-end-column="27" />
-        </state>
-      </provider>
-    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java" />
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="124">
@@ -1502,27 +1339,9 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="124">
-          <caret line="7" column="28" selection-start-line="7" selection-start-column="28" selection-end-line="7" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeStatisticDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="110">
-          <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="124">
-          <caret line="10" column="27" selection-start-line="10" selection-start-column="27" selection-end-line="10" selection-end-column="27" />
-        </state>
-      </provider>
-    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeStatisticDto.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java" />
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="154">
@@ -1537,32 +1356,9 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineLengthStatic.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="110">
-          <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="154">
-          <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="132">
-          <caret line="7" column="22" selection-start-line="7" selection-start-column="22" selection-end-line="7" selection-end-column="22" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="method#ConvertToDTO#0;class#PgRoadDto#0" />
-            <element signature="method#ConvertToDTOList#0;class#PgRoadDto#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineLengthStatic.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" />
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="124">
@@ -1570,60 +1366,13 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="154">
-          <caret line="7" column="26" lean-forward="true" selection-start-line="7" selection-start-column="26" selection-end-line="7" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="132">
-          <caret line="6" column="28" selection-start-line="6" selection-start-column="28" selection-end-line="6" selection-end-column="28" />
-          <folding>
-            <element signature="e#186#187#0" expanded="true" />
-            <element signature="e#224#225#0" expanded="true" />
-            <element signature="e#254#255#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="124">
-          <caret line="7" column="27" selection-start-line="7" selection-start-column="27" selection-end-line="7" selection-end-column="27" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="124">
-          <caret line="8" column="27" selection-start-line="8" selection-start-column="27" selection-end-line="8" selection-end-column="27" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="124">
-          <caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="124">
-          <caret line="7" column="28" selection-start-line="7" selection-start-column="28" selection-end-line="7" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="124">
-          <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/devTable/dto/PipeGalleryStatic.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java" />
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="124">
@@ -1631,55 +1380,13 @@
         </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 relative-caret-position="124">
-          <caret line="7" column="29" selection-start-line="7" selection-start-column="29" selection-end-line="7" selection-end-column="29" />
-        </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 relative-caret-position="124">
-          <caret line="9" column="26" selection-start-line="9" selection-start-column="26" selection-end-line="9" selection-end-column="26" />
-        </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 relative-caret-position="124">
-          <caret line="7" column="30" selection-start-line="7" selection-start-column="30" selection-end-line="7" selection-end-column="30" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDocDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="124">
-          <caret line="8" column="27" selection-start-line="8" selection-start-column="27" selection-end-line="8" selection-end-column="27" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="124">
-          <caret line="9" column="24" selection-start-line="9" selection-start-column="24" selection-end-line="9" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="124">
-          <caret line="7" column="22" selection-start-line="7" selection-start-column="22" selection-end-line="7" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="124">
-          <caret line="7" column="22" selection-start-line="7" selection-start-column="22" selection-end-line="7" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDocDto.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainTypeDto.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDocDto.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java" />
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="146">
@@ -1687,17 +1394,32 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolMaintainInfoDto.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolMaintainInfoDto.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/httpInterfaceTest.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="110">
-          <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
+        <state relative-caret-position="250">
+          <caret line="63" lean-forward="true" selection-start-line="63" selection-end-line="63" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/httpInterfaceTest.java">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/index.jsp">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="13" lean-forward="true" selection-start-line="13" selection-end-line="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="182">
-          <caret line="9" column="11" selection-start-line="9" selection-start-column="11" selection-end-line="9" selection-end-column="11" />
+          <caret line="117" column="32" lean-forward="true" selection-start-line="117" selection-start-column="32" selection-end-line="117" selection-end-column="32" />
+          <folding>
+            <element signature="method#addEquipment#0;class#PgEquipmentRs#0" />
+          </folding>
         </state>
       </provider>
     </entry>
diff --git a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
index fc1f05f..6b48f0e 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
@@ -95,7 +95,7 @@
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 
         try {
-            PgEquipment pgEquipment=pgEquipmentManager.get(id);
+            PgEquipment pgEquipment=pgEquipmentManager.get(Long.valueOf(id));
             if(pgEquipment==null)
             {
                 msg="不存在工器具";
@@ -111,6 +111,8 @@
                 pgEquipment.setEnterDate(sdf.parse(enterDate));
 
                 pgEquipmentManager.save(pgEquipment);
+                msg="编辑成功";
+                result="true";
             }
         } catch (Exception e) {
             e.printStackTrace();
@@ -164,7 +166,7 @@
         String result = "";
 
         try {
-            PgEquipment pgEquipment=pgEquipmentManager.get(id);
+            PgEquipment pgEquipment=pgEquipmentManager.get(Long.valueOf(id));
             if(pgEquipment==null)
             {
                 msg="不存在工器具";

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 99c29b1..73e784d 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,36 +8,8 @@
   <component name="ChangeListManager">
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="修改施工统计问题">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDocDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDocDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainTypeDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainTypeDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDocDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDocDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/httpInterfaceTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/httpInterfaceTest.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明新需求.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明新需求.docx" afterDir="false" />
     </list>
     <ignored path="PgInterface.iws" />
     <ignored path=".idea/workspace.xml" />
@@ -62,7 +34,7 @@
           <entry key="project.open.time.126" value="1" />
           <entry key="project.open.time.140" value="1" />
           <entry key="project.open.time.19" value="2" />
-          <entry key="project.open.time.2" value="2" />
+          <entry key="project.open.time.2" value="3" />
           <entry key="project.open.time.235" value="1" />
           <entry key="project.open.time.246" value="1" />
           <entry key="project.open.time.3" value="1" />
@@ -70,19 +42,22 @@
           <entry key="project.open.time.72" value="1" />
           <entry key="project.open.time.76" value="1" />
           <entry key="project.open.time.9" value="1" />
-          <entry key="project.opened" value="14" />
+          <entry key="project.opened" value="15" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.open">
         <counts>
           <entry key="class" value="1" />
-          <entry key="java" value="228" />
+          <entry key="java" value="230" />
+          <entry key="jsp" value="1" />
+          <entry key="properties" value="1" />
+          <entry key="xml" value="1" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.vcs.git.usages" />
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="9381" />
+          <entry key="JAVA" value="9431" />
           <entry key="PLAIN_TEXT" value="66" />
         </counts>
       </usages-collector>
@@ -91,14 +66,17 @@
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
           <entry key="dummy" value="28" />
-          <entry key="java" value="9381" />
+          <entry key="java" value="9431" />
           <entry key="txt" value="38" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="1" />
-          <entry key="JAVA" value="228" />
+          <entry key="JAVA" value="230" />
+          <entry key="JSP" value="1" />
+          <entry key="Properties" value="1" />
+          <entry key="XML" value="1" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.spring.boot.mvc.usages" />
@@ -110,10 +88,13 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/httpInterfaceTest.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="182">
-              <caret line="9" column="11" selection-start-line="9" selection-start-column="11" selection-end-line="9" selection-end-column="11" />
+              <caret line="117" column="32" lean-forward="true" selection-start-line="117" selection-start-column="32" selection-end-line="117" selection-end-column="32" />
+              <folding>
+                <element signature="method#addEquipment#0;class#PgEquipmentRs#0" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -161,7 +142,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" />
@@ -212,6 +192,7 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/httpInterfaceTest.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
       </list>
     </option>
   </component>
@@ -275,10 +256,9 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="-8" />
-    <option name="y" value="-8" />
-    <option name="width" value="941" />
-    <option name="height" value="668" />
+    <option name="x" value="-6" />
+    <option name="width" value="1378" />
+    <option name="height" value="744" />
   </component>
   <component name="ProjectReloadState">
     <option name="STATE" value="0" />
@@ -288,6 +268,8 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="Scope" />
+      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -328,14 +310,19 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="test" type="462c0819:PsiDirectoryNode" />
+              <item name="rs" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
+              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="webapp" type="462c0819:PsiDirectoryNode" />
             </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="Scope" />
-      <pane id="PackagesPane" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -365,8 +352,8 @@
     <property name="MemberChooser.sorted" value="false" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1541489466148" />
-    <property name="last_opened_file_path" value="D:/DZ/bs/PHM_DZ/.idea" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1541994868995" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/webapp" />
     <property name="options.lastSelected" value="xpath.settings" />
     <property name="options.searchVisible" value="true" />
     <property name="options.splitter.details.proportions" value="0.2" />
@@ -553,9 +540,7 @@
       </ConfigurationWrapper>
       <method v="2">
         <option name="Make" enabled="true" />
-        <option name="BuildArtifacts" enabled="true">
-          <artifact name="PgInterface" />
-        </option>
+        <option name="BuildArtifacts" enabled="true" />
       </method>
     </configuration>
     <configuration default="true" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" ALTERNATIVE_JRE_ENABLED="false" ALTERNATIVE_JRE_PATH="">
@@ -805,6 +790,7 @@
       <workItem from="1541303711282" duration="5696000" />
       <workItem from="1541379811355" duration="26465000" />
       <workItem from="1541465806633" duration="12993000" />
+      <workItem from="1541993902728" duration="773000" />
     </task>
     <task id="LOCAL-00011" summary="新需求输入前上传">
       <created>1521168093758</created>
@@ -1153,7 +1139,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="1070566000" />
+    <option name="totallyTimeSpent" value="1071339000" />
   </component>
   <component name="TodoView" selected-index="1">
     <todo-panel id="selected-file">
@@ -1166,8 +1152,9 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
+    <editor active="true" />
     <layout>
-      <window_info active="true" id="Project" order="0" sideWeight="0.91929823" visible="true" weight="0.2965204" />
+      <window_info active="true" id="Project" order="0" sideWeight="0.91929823" visible="true" weight="0.2322239" />
       <window_info id="Structure" order="1" weight="0.25" />
       <window_info id="Palette&#9;" order="2" />
       <window_info id="Build Variants" order="3" side_tool="true" />
@@ -1190,7 +1177,7 @@
       <window_info anchor="bottom" id="Version Control" order="11" />
       <window_info anchor="bottom" id="Application Servers" order="12" weight="0.32764506" />
       <window_info anchor="bottom" id="Terminal" order="13" weight="0.32935154" />
-      <window_info anchor="bottom" id="Messages" order="14" visible="true" weight="0.31740615" />
+      <window_info anchor="bottom" id="Messages" order="14" weight="0.31740615" />
       <window_info anchor="bottom" id="Android" order="15" />
       <window_info anchor="bottom" id="Spring" order="16" weight="0.32935154" />
       <window_info anchor="bottom" id="Database Changes" order="17" show_stripe_button="false" />
@@ -1300,6 +1287,12 @@
           <properties />
           <option name="timeStamp" value="330" />
         </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java</url>
+          <line>97</line>
+          <properties />
+          <option name="timeStamp" value="331" />
+        </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
   </component>
@@ -1308,144 +1301,18 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgContructionStatic.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="88">
-          <caret line="4" column="19" selection-start-line="4" selection-start-column="19" selection-end-line="4" selection-end-column="19" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-16">
-          <caret line="14" column="7" lean-forward="true" selection-start-line="14" selection-start-column="7" selection-end-line="14" selection-end-column="7" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="572">
-          <caret line="86" column="9" lean-forward="true" selection-start-line="86" selection-start-column="9" selection-end-line="86" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="281">
-          <caret line="282" column="26" lean-forward="true" selection-start-line="282" selection-start-column="26" selection-end-line="282" selection-end-column="26" />
-          <folding>
-            <element signature="e#8075#8091#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionStiatistic.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="8" column="5" lean-forward="true" selection-start-line="8" selection-start-column="5" selection-end-line="8" selection-end-column="5" />
-          <folding>
-            <element signature="e#160#161#0" expanded="true" />
-            <element signature="e#195#196#0" expanded="true" />
-            <element signature="e#251#252#0" expanded="true" />
-            <element signature="e#299#300#0" expanded="true" />
-          </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 relative-caret-position="369">
-          <caret line="279" column="5" lean-forward="true" selection-start-line="279" selection-start-column="5" selection-end-line="279" selection-end-column="5" />
-          <folding>
-            <element signature="e#10272#10288#0" expanded="true" />
-            <element signature="e#10399#10425#0" expanded="true" />
-            <element signature="e#11494#11520#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="27" lean-forward="true" selection-start-line="27" selection-end-line="27" />
-          <folding>
-            <element signature="method#getPgContructionByName#0;class#PgConstructionManager#0" />
-            <element signature="method#getPgContructionByNameOrType#0;class#PgConstructionManager#0" />
-            <element signature="method#getPgContructionDtoByNameOrType#0;class#PgConstructionManager#0" />
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-            <element signature="e#3750#3776#0" expanded="true" />
-            <element signature="method#getStatisticByPar#0;class#PgConstructionManager#0" />
-            <element signature="method#getStatisticByType#0;class#PgConstructionManager#0" />
-            <element signature="method#getConstructionNum#0;class#PgConstructionManager#0" />
-            <element signature="method#getConstructionToday#0;class#PgConstructionManager#0" />
-            <element signature="method#getPgConstructionList#0;class#PgConstructionManager#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDateStatistic.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="11" column="16" lean-forward="true" selection-start-line="11" selection-start-column="16" selection-end-line="11" selection-end-column="16" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2024">
-          <caret line="138" column="16" lean-forward="true" selection-start-line="138" selection-start-column="16" selection-end-line="138" selection-end-column="16" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionParStatisticDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="44">
-          <caret line="2" column="75" selection-start-line="2" selection-start-column="75" selection-end-line="2" selection-end-column="75" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="308">
-          <caret line="16" lean-forward="true" selection-start-line="16" selection-end-line="16" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeNumStatisticDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="14" column="1" lean-forward="true" selection-start-line="14" selection-start-column="1" selection-end-line="14" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeStatisticDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="66">
-          <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="110">
-          <caret line="13" column="34" lean-forward="true" selection-start-line="13" selection-start-column="34" selection-end-line="13" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="124">
-          <caret line="9" column="21" selection-start-line="9" selection-start-column="21" selection-end-line="9" selection-end-column="21" />
-        </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 relative-caret-position="124">
-          <caret line="9" column="20" selection-start-line="9" selection-start-column="20" selection-end-line="9" selection-end-column="20" />
-        </state>
-      </provider>
-    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionStiatistic.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDateStatistic.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionParStatisticDto.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeDto.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeNumStatisticDto.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeStatisticDto.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java" />
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-8">
@@ -1453,27 +1320,9 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="124">
-          <caret line="9" column="20" selection-start-line="9" selection-start-column="20" selection-end-line="9" selection-end-column="20" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="124">
-          <caret line="9" column="20" selection-start-line="9" selection-start-column="20" selection-end-line="9" selection-end-column="20" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="168">
-          <caret line="11" column="22" lean-forward="true" selection-start-line="11" selection-start-column="22" selection-end-line="11" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java" />
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="154">
@@ -1481,20 +1330,8 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="110">
-          <caret line="5" column="25" selection-start-line="5" selection-start-column="25" selection-end-line="5" selection-end-column="25" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="124">
-          <caret line="8" column="27" selection-start-line="8" selection-start-column="27" selection-end-line="8" selection-end-column="27" />
-        </state>
-      </provider>
-    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java" />
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="124">
@@ -1502,27 +1339,9 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="124">
-          <caret line="7" column="28" selection-start-line="7" selection-start-column="28" selection-end-line="7" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeStatisticDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="110">
-          <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="124">
-          <caret line="10" column="27" selection-start-line="10" selection-start-column="27" selection-end-line="10" selection-end-column="27" />
-        </state>
-      </provider>
-    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeStatisticDto.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java" />
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="154">
@@ -1537,32 +1356,9 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineLengthStatic.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="110">
-          <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="154">
-          <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="132">
-          <caret line="7" column="22" selection-start-line="7" selection-start-column="22" selection-end-line="7" selection-end-column="22" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="method#ConvertToDTO#0;class#PgRoadDto#0" />
-            <element signature="method#ConvertToDTOList#0;class#PgRoadDto#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineLengthStatic.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" />
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="124">
@@ -1570,60 +1366,13 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="154">
-          <caret line="7" column="26" lean-forward="true" selection-start-line="7" selection-start-column="26" selection-end-line="7" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="132">
-          <caret line="6" column="28" selection-start-line="6" selection-start-column="28" selection-end-line="6" selection-end-column="28" />
-          <folding>
-            <element signature="e#186#187#0" expanded="true" />
-            <element signature="e#224#225#0" expanded="true" />
-            <element signature="e#254#255#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="124">
-          <caret line="7" column="27" selection-start-line="7" selection-start-column="27" selection-end-line="7" selection-end-column="27" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="124">
-          <caret line="8" column="27" selection-start-line="8" selection-start-column="27" selection-end-line="8" selection-end-column="27" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="124">
-          <caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="124">
-          <caret line="7" column="28" selection-start-line="7" selection-start-column="28" selection-end-line="7" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="124">
-          <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/devTable/dto/PipeGalleryStatic.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java" />
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="124">
@@ -1631,55 +1380,13 @@
         </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 relative-caret-position="124">
-          <caret line="7" column="29" selection-start-line="7" selection-start-column="29" selection-end-line="7" selection-end-column="29" />
-        </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 relative-caret-position="124">
-          <caret line="9" column="26" selection-start-line="9" selection-start-column="26" selection-end-line="9" selection-end-column="26" />
-        </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 relative-caret-position="124">
-          <caret line="7" column="30" selection-start-line="7" selection-start-column="30" selection-end-line="7" selection-end-column="30" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDocDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="124">
-          <caret line="8" column="27" selection-start-line="8" selection-start-column="27" selection-end-line="8" selection-end-column="27" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="124">
-          <caret line="9" column="24" selection-start-line="9" selection-start-column="24" selection-end-line="9" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="124">
-          <caret line="7" column="22" selection-start-line="7" selection-start-column="22" selection-end-line="7" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="124">
-          <caret line="7" column="22" selection-start-line="7" selection-start-column="22" selection-end-line="7" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDocDto.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainTypeDto.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDocDto.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java" />
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="146">
@@ -1687,17 +1394,32 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolMaintainInfoDto.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolMaintainInfoDto.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/httpInterfaceTest.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="110">
-          <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
+        <state relative-caret-position="250">
+          <caret line="63" lean-forward="true" selection-start-line="63" selection-end-line="63" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/httpInterfaceTest.java">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/index.jsp">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="13" lean-forward="true" selection-start-line="13" selection-end-line="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="182">
-          <caret line="9" column="11" selection-start-line="9" selection-start-column="11" selection-end-line="9" selection-end-column="11" />
+          <caret line="117" column="32" lean-forward="true" selection-start-line="117" selection-start-column="32" selection-end-line="117" selection-end-column="32" />
+          <folding>
+            <element signature="method#addEquipment#0;class#PgEquipmentRs#0" />
+          </folding>
         </state>
       </provider>
     </entry>
diff --git a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
index fc1f05f..6b48f0e 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
@@ -95,7 +95,7 @@
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 
         try {
-            PgEquipment pgEquipment=pgEquipmentManager.get(id);
+            PgEquipment pgEquipment=pgEquipmentManager.get(Long.valueOf(id));
             if(pgEquipment==null)
             {
                 msg="不存在工器具";
@@ -111,6 +111,8 @@
                 pgEquipment.setEnterDate(sdf.parse(enterDate));
 
                 pgEquipmentManager.save(pgEquipment);
+                msg="编辑成功";
+                result="true";
             }
         } catch (Exception e) {
             e.printStackTrace();
@@ -164,7 +166,7 @@
         String result = "";
 
         try {
-            PgEquipment pgEquipment=pgEquipmentManager.get(id);
+            PgEquipment pgEquipment=pgEquipmentManager.get(Long.valueOf(id));
             if(pgEquipment==null)
             {
                 msg="不存在工器具";
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 5be635e..6070ba0 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