diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 25ded8a..283d7ab 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,20 +7,56 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" 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/construction/manager/PgCsDocumentManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/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/manager/PgAlarmManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/~$说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/~$说明20191207.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.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$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/接口说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明20191207.docx" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
@@ -51,7 +87,7 @@
         <counts>
           <entry key="class" value="4" />
           <entry key="iml" value="2" />
-          <entry key="java" value="707" />
+          <entry key="java" value="820" />
           <entry key="properties" value="14" />
           <entry key="xml" value="7" />
         </counts>
@@ -60,7 +96,7 @@
         <counts>
           <entry key="CLASS" value="4" />
           <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="707" />
+          <entry key="JAVA" value="820" />
           <entry key="Properties" value="14" />
           <entry key="XML" value="7" />
         </counts>
@@ -68,32 +104,32 @@
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
           <entry key="dummy" value="38" />
-          <entry key="java" value="30161" />
+          <entry key="java" value="40859" />
           <entry key="properties" value="100" />
-          <entry key="txt" value="176" />
+          <entry key="txt" value="186" />
           <entry key="xml" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="30161" />
-          <entry key="PLAIN_TEXT" value="214" />
+          <entry key="JAVA" value="40859" />
+          <entry key="PLAIN_TEXT" value="224" />
           <entry key="Properties" value="100" />
           <entry key="XML" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="48" />
+          <entry key="project.closed" value="51" />
           <entry key="project.open.time.1" value="5" />
           <entry key="project.open.time.12" value="2" />
           <entry key="project.open.time.13" value="1" />
           <entry key="project.open.time.15" value="1" />
           <entry key="project.open.time.16" value="1" />
           <entry key="project.open.time.17" value="1" />
-          <entry key="project.open.time.2" value="1" />
+          <entry key="project.open.time.2" value="2" />
           <entry key="project.open.time.20" value="1" />
-          <entry key="project.open.time.23" value="1" />
+          <entry key="project.open.time.23" value="2" />
           <entry key="project.open.time.24" value="2" />
           <entry key="project.open.time.251" value="1" />
           <entry key="project.open.time.27" value="2" />
@@ -106,8 +142,8 @@
           <entry key="project.open.time.36" value="1" />
           <entry key="project.open.time.37" value="1" />
           <entry key="project.open.time.39" value="2" />
-          <entry key="project.open.time.4" value="2" />
-          <entry key="project.open.time.40" value="1" />
+          <entry key="project.open.time.4" value="3" />
+          <entry key="project.open.time.40" value="2" />
           <entry key="project.open.time.41" value="2" />
           <entry key="project.open.time.42" value="2" />
           <entry key="project.open.time.43" value="2" />
@@ -122,23 +158,25 @@
           <entry key="project.open.time.6" value="3" />
           <entry key="project.open.time.63" value="2" />
           <entry key="project.open.time.64" value="1" />
+          <entry key="project.open.time.66" value="1" />
           <entry key="project.open.time.71" value="2" />
+          <entry key="project.open.time.74" value="1" />
           <entry key="project.open.time.76" value="1" />
           <entry key="project.open.time.8" value="2" />
           <entry key="project.open.time.9" value="1" />
           <entry key="project.open.time.97" value="1" />
-          <entry key="project.opened" value="78" />
+          <entry key="project.opened" value="84" />
         </counts>
       </usages-collector>
     </session>
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+            <state relative-caret-position="396">
+              <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
               <folding>
                 <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
                 <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -147,73 +185,6 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <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="99">
-              <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-              <folding>
-                <element signature="imports" expanded="true" />
-                <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-1170">
-              <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state>
-              <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
-              <folding>
-                <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-                <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="true">
-        <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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-              <folding>
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-                <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>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <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="352">
-              <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -225,18 +196,9 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>inCriteria</find>
-      <find>getPgPlanResulList</find>
-      <find>getPileAcuListByPileAcuStr</find>
-      <find>distinct</find>
-      <find>order</find>
-      <find>canPlanLine</find>
-      <find>isExistLine</find>
-      <find>getPlanResult</find>
       <find>pgPipeLine</find>
       <find>getPipeLineBylineName</find>
       <find>StringU</find>
-      <find>getAllAlarm</find>
       <find>getAlarmList</find>
       <find>getPgInPersonListByDay</find>
       <find>getDayInPgStatistic</find>
@@ -254,7 +216,16 @@
       <find>getPgContructionByNameOrType</find>
       <find>&quot;&quot;,&quot;&quot;,</find>
       <find>getPgContructionDtoByNameOrType</find>
+      <find>addConstruction</find>
+      <find>getPgLineAcuHole</find>
+      <find>getPlanResult</find>
       <find>getConstruction</find>
+      <find>addPipeLine</find>
+      <find>未找到入廊数据</find>
+      <find>getCurrentHoleByAcu</find>
+      <find>getAllAlarm</find>
+      <find>getPgDeviceDtoListByPartition</find>
+      <find>getPgDeviceByDevType</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -263,57 +234,57 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlan.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileHoleManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/planData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/PlanData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
       </list>
     </option>
   </component>
@@ -359,7 +330,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -421,53 +391,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="dto" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="manager" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -479,29 +402,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="rs" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -516,6 +416,7 @@
         </subPane>
       </pane>
       <pane id="Scope" />
+      <pane id="PackagesPane" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -710,7 +611,13 @@
       <workItem from="1574902733573" duration="1829000" />
       <workItem from="1574998240004" duration="7016000" />
       <workItem from="1575247959683" duration="6997000" />
-      <workItem from="1575704345590" duration="40473000" />
+      <workItem from="1575704345590" duration="69381000" />
+      <workItem from="1575869479666" duration="721000" />
+      <workItem from="1575947104878" duration="6101000" />
+      <workItem from="1576128264436" duration="3347000" />
+      <workItem from="1576208571543" duration="22000" />
+      <workItem from="1576227513917" duration="862000" />
+      <workItem from="1576293721220" duration="18246000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -817,11 +724,18 @@
       <option name="project" value="LOCAL" />
       <updated>1575775489149</updated>
     </task>
-    <option name="localTasksCounter" value="16" />
+    <task id="LOCAL-00016" summary="整改施工信息">
+      <created>1575791780774</created>
+      <option name="number" value="00016" />
+      <option name="presentableId" value="LOCAL-00016" />
+      <option name="project" value="LOCAL" />
+      <updated>1575791780774</updated>
+    </task>
+    <option name="localTasksCounter" value="17" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="452131000" />
+    <option name="totallyTimeSpent" value="510338000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -834,9 +748,8 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
-    <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.24205749" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2647504" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -847,7 +760,7 @@
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.3295082" />
       <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.4819672" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.65737706" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.3295082" />
@@ -939,7 +852,8 @@
     <MESSAGE value="重新设计智能规划部分" />
     <MESSAGE value="完成智能规划对接" />
     <MESSAGE value="修改报警统计" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改报警统计" />
+    <MESSAGE value="整改施工信息" />
+    <option name="LAST_COMMIT_MESSAGE" value="整改施工信息" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -951,16 +865,10 @@
           <option name="timeStamp" value="3" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java</url>
-          <line>69</line>
+          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java</url>
+          <line>40</line>
           <properties />
-          <option name="timeStamp" value="21" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java</url>
-          <line>96</line>
-          <properties />
-          <option name="timeStamp" value="38" />
+          <option name="timeStamp" value="122" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
@@ -970,394 +878,452 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <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="2068">
-          <caret line="154" column="35" selection-start-line="154" selection-start-column="35" selection-end-line="154" selection-end-column="35" />
-        </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="3300">
-          <caret line="297" column="22" selection-start-line="297" selection-start-column="22" selection-end-line="297" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/StringUtils.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
-          <caret line="13" column="48" lean-forward="true" selection-start-line="13" selection-start-column="48" selection-end-line="13" selection-end-column="48" />
+          <caret line="11" column="5" selection-start-line="11" selection-start-column="5" selection-end-line="11" selection-end-column="5" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="78" lean-forward="true" selection-start-line="78" selection-end-line="78" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="616">
-          <caret line="41" column="1" selection-start-line="41" selection-start-column="1" selection-end-line="41" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="110">
-          <caret line="12" column="23" selection-start-line="12" selection-start-column="23" selection-end-line="12" selection-end-column="23" />
+        <state relative-caret-position="516">
+          <caret line="114" column="12" selection-start-line="114" selection-start-column="12" selection-end-line="114" selection-end-column="12" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="164">
-          <caret line="56" lean-forward="true" selection-start-line="56" selection-end-line="56" />
+        <state relative-caret-position="418">
+          <caret line="33" column="44" selection-start-line="33" selection-start-column="44" selection-end-line="33" selection-end-column="44" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="258">
-          <caret line="27" column="12" lean-forward="true" selection-start-line="27" selection-start-column="12" selection-end-line="27" selection-end-column="12" />
+        <state relative-caret-position="132">
+          <caret line="11" column="20" lean-forward="true" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="20" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.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="-12">
-          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        <state relative-caret-position="516">
+          <caret line="142" column="54" selection-start-line="142" selection-start-column="54" selection-end-line="142" selection-end-column="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="858">
-          <caret line="55" column="27" lean-forward="true" selection-start-line="55" selection-start-column="27" selection-end-line="55" selection-end-column="27" />
+        <state relative-caret-position="66">
+          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="58">
+          <caret line="18" column="28" selection-start-line="18" selection-start-column="19" selection-end-line="18" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="305">
+          <caret line="24" column="31" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="714">
+          <caret line="58" column="5" lean-forward="true" selection-start-line="58" selection-start-column="5" selection-end-line="58" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="924">
+          <caret line="134" column="92" selection-start-line="134" selection-start-column="92" selection-end-line="134" selection-end-column="92" />
+          <folding>
+            <element signature="method#linkDevice#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkPartitionCamera#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkReservePlan#0;class#PgAlarmLinkRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1066">
+          <caret line="90" lean-forward="true" selection-start-line="90" selection-end-line="90" />
+          <folding>
+            <element signature="method#getTjResultByAlarmType#0;class#PgAlarmTjRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="946">
+          <caret line="148" column="11" lean-forward="true" selection-start-line="148" selection-start-column="11" selection-end-line="148" selection-end-column="11" />
+          <folding>
+            <element signature="method#getAlarmTypeList#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#addAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#editAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#deleteAlarmType#0;class#PgAlarmTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="208">
+          <caret line="46" column="23" lean-forward="true" selection-start-line="46" selection-start-column="23" selection-end-line="46" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="113" column="9" lean-forward="true" selection-start-line="113" selection-start-column="9" selection-end-line="113" selection-end-column="9" />
+          <folding>
+            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
+            <element signature="method#getNewestCh4InfoByDev#0;class#PgCh4Rs#0" />
+            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="145" column="6" lean-forward="true" selection-start-line="145" selection-start-column="6" selection-end-line="145" selection-end-column="6" />
+          <folding>
+            <element signature="method#addAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#editAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#deleteAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#getAuthorityList#0;class#PgAuthorityRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="58" column="1" lean-forward="true" selection-start-line="58" selection-start-column="1" selection-end-line="58" selection-end-column="1" />
+          <folding>
+            <element signature="method#getPgAssetPlanList#0;class#PgAssetPlanRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="370">
+          <caret line="371" column="66" selection-start-line="371" selection-start-column="66" selection-end-line="371" selection-end-column="66" />
+          <folding>
+            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#searchConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionDev#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="139" column="13" lean-forward="true" selection-start-line="139" selection-start-column="13" selection-end-line="139" selection-end-column="13" />
+          <folding>
+            <element signature="method#getCoInfoByDevAndDate#0;class#PgCoRs#0" />
+            <element signature="method#getNewestCoInfoByDev#0;class#PgCoRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="540">
+          <caret line="223" column="5" lean-forward="true" selection-start-line="223" selection-start-column="5" selection-end-line="223" selection-end-column="5" />
+          <folding>
+            <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="682">
+          <caret line="100" lean-forward="true" selection-start-line="100" selection-end-line="100" />
+          <folding>
+            <element signature="method#getDeviceTpeyList#0;class#PgDeviceTypeRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="377">
+          <caret line="225" column="35" selection-start-line="225" selection-start-column="35" selection-end-line="225" selection-end-column="35" />
+          <folding>
+            <element signature="method#addEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#addEquipment#1;class#PgEquipmentRs#0" />
+            <element signature="method#getEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#deleteEquipment#0;class#PgEquipmentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="406">
+          <caret line="109" lean-forward="true" selection-start-line="109" selection-end-line="109" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="154">
+          <caret line="28" column="19" selection-start-line="28" selection-start-column="19" selection-end-line="28" selection-end-column="19" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="748">
-          <caret line="49" column="5" lean-forward="true" selection-start-line="49" selection-start-column="5" selection-end-line="49" selection-end-column="5" />
+        <state relative-caret-position="296">
+          <caret line="161" column="35" selection-start-line="161" selection-start-column="35" selection-end-line="161" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="384">
+          <caret line="99" column="5" lean-forward="true" selection-start-line="99" selection-start-column="5" selection-end-line="99" selection-end-column="5" />
+        </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="362">
+          <caret line="340" column="35" selection-start-line="340" selection-start-column="35" selection-end-line="340" selection-end-column="35" />
+          <folding>
+            <element signature="method#addInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPersonInPg#0;class#PgInPgPersonRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-606">
+          <caret line="76" column="20" lean-forward="true" selection-start-line="76" selection-start-column="20" selection-end-line="76" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="65" column="35" selection-start-line="65" selection-start-column="35" selection-end-line="65" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="101" column="35" selection-start-line="101" selection-start-column="35" selection-end-line="101" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="84" column="35" selection-start-line="84" selection-start-column="35" selection-end-line="84" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="59" lean-forward="true" selection-start-line="59" selection-end-line="59" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="60" column="1" lean-forward="true" selection-start-line="60" selection-start-column="1" selection-end-line="60" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="145" column="35" selection-start-line="145" selection-start-column="35" selection-end-line="145" selection-end-column="35" />
+        </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="274">
+          <caret line="350" column="35" selection-start-line="350" selection-start-column="35" selection-end-line="350" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="121" column="39" selection-start-line="121" selection-start-column="39" selection-end-line="121" selection-end-column="39" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="28" column="8" lean-forward="true" selection-start-line="28" selection-start-column="8" selection-end-line="28" selection-end-column="8" />
+        <state relative-caret-position="340">
+          <caret line="103" selection-start-line="103" selection-end-line="103" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="226" column="35" selection-start-line="226" selection-start-column="35" selection-end-line="226" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="203" column="35" selection-start-line="203" selection-start-column="35" selection-end-line="203" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="241" column="35" selection-start-line="241" selection-start-column="35" selection-end-line="241" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="225" column="1" lean-forward="true" selection-start-line="225" selection-start-column="1" selection-end-line="225" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="176" column="5" lean-forward="true" selection-start-line="176" selection-start-column="5" selection-end-line="176" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="178" column="35" lean-forward="true" selection-start-line="178" selection-start-column="35" selection-end-line="178" selection-end-column="35" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="516">
-          <caret line="94" column="53" selection-start-line="94" selection-start-column="53" selection-end-line="94" selection-end-column="53" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="814">
-          <caret line="52" column="9" lean-forward="true" selection-start-line="52" selection-start-column="9" selection-end-line="52" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="182">
-          <caret line="58" column="12" lean-forward="true" selection-start-line="58" selection-start-column="12" selection-end-line="58" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="34" lean-forward="true" selection-start-line="34" selection-end-line="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="32" lean-forward="true" selection-start-line="32" selection-end-line="32" />
-          <folding>
-            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
-            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="185">
-          <caret line="63" column="13" selection-start-line="63" selection-start-column="13" selection-end-line="63" selection-end-column="13" />
-          <folding>
-            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
-            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
-            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="e#6319#6324#0" />
-            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
-          </folding>
+          <caret line="240" lean-forward="true" selection-start-line="240" selection-end-line="240" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
-          <caret line="58" column="28" lean-forward="true" selection-start-line="58" selection-start-column="28" selection-end-line="58" selection-end-column="28" />
-          <folding>
-            <element signature="method#addTempHumData#0;class#PgTempHumRs#0" />
-          </folding>
+        <state relative-caret-position="340">
+          <caret line="148" column="34" selection-start-line="148" selection-start-column="34" selection-end-line="148" selection-end-column="34" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
+        <state relative-caret-position="458">
+          <caret line="99" column="35" selection-start-line="99" selection-start-column="35" selection-end-line="99" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+        <state relative-caret-position="384">
+          <caret line="145" column="32" lean-forward="true" selection-start-line="145" selection-start-column="32" selection-end-line="145" selection-end-column="32" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="414">
-          <caret line="22" column="46" lean-forward="true" selection-start-line="22" selection-start-column="46" selection-end-line="22" selection-end-column="46" />
-        </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="396">
-          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" column="83" selection-start-line="11" selection-start-column="83" selection-end-line="11" selection-end-column="83" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="26">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
-          <folding>
-            <element signature="method#getPgInPgStatusByPerson#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNumByName#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNum#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPersonListByDay#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPgStatusByPgInPgPerson#0;class#PgInPgStatusManager#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="44">
-          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-12">
-          <caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="87" lean-forward="true" selection-start-line="87" selection-end-line="87" />
-          <folding>
-            <element signature="method#getConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#addConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#deleteConstructionType#0;class#PgConstructionTypeRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
-          <folding>
-            <element signature="method#getConstructionTypeByType#0;class#PgConstructionTypeManager#0" />
-            <element signature="method#getAllConstructionTypeDto#0;class#PgConstructionTypeManager#0" />
-          </folding>
-        </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="145">
-          <caret line="258" column="9" lean-forward="true" selection-start-line="258" selection-start-column="9" selection-end-line="258" selection-end-column="9" />
-          <folding>
-            <element signature="method#getMonthInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayInPgStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgOverViewRs#0" />
-            <element signature="method#getAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getMonthAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayAlarmStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgOverViewRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="103">
-          <caret line="105" column="50" lean-forward="true" selection-start-line="105" selection-start-column="50" selection-end-line="105" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateBasicDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="99">
-          <caret line="125" selection-start-line="125" selection-end-line="125" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="190">
-          <caret line="24" column="35" lean-forward="true" selection-start-line="24" selection-start-column="35" selection-end-line="24" selection-end-column="35" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="436">
-          <caret line="24" lean-forward="true" selection-start-line="24" selection-end-line="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" lean-forward="true" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="300">
-          <caret line="34" column="31" lean-forward="true" selection-start-line="34" selection-start-column="31" selection-end-line="34" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="42" column="13" lean-forward="true" selection-start-line="42" selection-start-column="13" selection-end-line="42" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="120" column="72" lean-forward="true" selection-start-line="120" selection-start-column="72" selection-end-line="120" selection-end-column="72" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="293">
-          <caret line="58" column="73" lean-forward="true" selection-start-line="58" selection-start-column="73" selection-end-line="58" selection-end-column="73" />
-          <folding>
-            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
-            <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
-          </folding>
-        </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="307">
-          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
+        <state relative-caret-position="758">
+          <caret line="130" column="5" lean-forward="true" selection-start-line="130" selection-start-column="5" selection-end-line="130" selection-end-column="5" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1170">
-          <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
+        <state relative-caret-position="494">
+          <caret line="86" column="62" lean-forward="true" selection-start-line="86" selection-start-column="62" selection-end-line="86" selection-end-column="62" />
           <folding>
-            <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-            <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+            <element signature="method#getAllDevice#0;class#PgDeviceManager#0" />
+            <element signature="method#getAllDev#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="195" column="28" lean-forward="true" selection-start-line="195" selection-start-column="28" selection-end-line="195" selection-end-column="28" />
+        <state relative-caret-position="166">
+          <caret line="174" column="13" lean-forward="true" selection-start-line="174" selection-start-column="13" selection-end-line="174" selection-end-column="13" />
           <folding>
-            <element signature="method#getAlarmByTypeAndTime#0;class#PgAlarmManager#0" />
-            <element signature="method#getAlarmNum#0;class#PgAlarmManager#0" />
             <element signature="method#getDayAlarmStatistic#0;class#PgAlarmManager#0" />
+            <element signature="method#getAlarmList#0;class#PgAlarmManager#0" />
             <element signature="method#createDTO#0;class#PgAlarmManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="364">
+          <caret line="46" column="56" lean-forward="true" selection-start-line="46" selection-start-column="56" selection-end-line="46" selection-end-column="56" />
+          <folding>
+            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
+            <element signature="method#getPgDev#0;class#PgDeviceRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
+            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+        <state relative-caret-position="396">
+          <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
           <folding>
             <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
             <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -1365,52 +1331,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="239">
-          <caret line="21" column="33" lean-forward="true" selection-start-line="21" selection-start-column="33" selection-end-line="21" selection-end-column="33" />
-        </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="352">
-          <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-        </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="99">
-          <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-          </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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-          <folding>
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-            <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>
   </component>
   <component name="masterDetails">
     <states>

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 25ded8a..283d7ab 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,20 +7,56 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" 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/construction/manager/PgCsDocumentManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/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/manager/PgAlarmManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/~$说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/~$说明20191207.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.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$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/接口说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明20191207.docx" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
@@ -51,7 +87,7 @@
         <counts>
           <entry key="class" value="4" />
           <entry key="iml" value="2" />
-          <entry key="java" value="707" />
+          <entry key="java" value="820" />
           <entry key="properties" value="14" />
           <entry key="xml" value="7" />
         </counts>
@@ -60,7 +96,7 @@
         <counts>
           <entry key="CLASS" value="4" />
           <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="707" />
+          <entry key="JAVA" value="820" />
           <entry key="Properties" value="14" />
           <entry key="XML" value="7" />
         </counts>
@@ -68,32 +104,32 @@
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
           <entry key="dummy" value="38" />
-          <entry key="java" value="30161" />
+          <entry key="java" value="40859" />
           <entry key="properties" value="100" />
-          <entry key="txt" value="176" />
+          <entry key="txt" value="186" />
           <entry key="xml" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="30161" />
-          <entry key="PLAIN_TEXT" value="214" />
+          <entry key="JAVA" value="40859" />
+          <entry key="PLAIN_TEXT" value="224" />
           <entry key="Properties" value="100" />
           <entry key="XML" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="48" />
+          <entry key="project.closed" value="51" />
           <entry key="project.open.time.1" value="5" />
           <entry key="project.open.time.12" value="2" />
           <entry key="project.open.time.13" value="1" />
           <entry key="project.open.time.15" value="1" />
           <entry key="project.open.time.16" value="1" />
           <entry key="project.open.time.17" value="1" />
-          <entry key="project.open.time.2" value="1" />
+          <entry key="project.open.time.2" value="2" />
           <entry key="project.open.time.20" value="1" />
-          <entry key="project.open.time.23" value="1" />
+          <entry key="project.open.time.23" value="2" />
           <entry key="project.open.time.24" value="2" />
           <entry key="project.open.time.251" value="1" />
           <entry key="project.open.time.27" value="2" />
@@ -106,8 +142,8 @@
           <entry key="project.open.time.36" value="1" />
           <entry key="project.open.time.37" value="1" />
           <entry key="project.open.time.39" value="2" />
-          <entry key="project.open.time.4" value="2" />
-          <entry key="project.open.time.40" value="1" />
+          <entry key="project.open.time.4" value="3" />
+          <entry key="project.open.time.40" value="2" />
           <entry key="project.open.time.41" value="2" />
           <entry key="project.open.time.42" value="2" />
           <entry key="project.open.time.43" value="2" />
@@ -122,23 +158,25 @@
           <entry key="project.open.time.6" value="3" />
           <entry key="project.open.time.63" value="2" />
           <entry key="project.open.time.64" value="1" />
+          <entry key="project.open.time.66" value="1" />
           <entry key="project.open.time.71" value="2" />
+          <entry key="project.open.time.74" value="1" />
           <entry key="project.open.time.76" value="1" />
           <entry key="project.open.time.8" value="2" />
           <entry key="project.open.time.9" value="1" />
           <entry key="project.open.time.97" value="1" />
-          <entry key="project.opened" value="78" />
+          <entry key="project.opened" value="84" />
         </counts>
       </usages-collector>
     </session>
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+            <state relative-caret-position="396">
+              <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
               <folding>
                 <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
                 <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -147,73 +185,6 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <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="99">
-              <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-              <folding>
-                <element signature="imports" expanded="true" />
-                <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-1170">
-              <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state>
-              <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
-              <folding>
-                <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-                <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="true">
-        <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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-              <folding>
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-                <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>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <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="352">
-              <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -225,18 +196,9 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>inCriteria</find>
-      <find>getPgPlanResulList</find>
-      <find>getPileAcuListByPileAcuStr</find>
-      <find>distinct</find>
-      <find>order</find>
-      <find>canPlanLine</find>
-      <find>isExistLine</find>
-      <find>getPlanResult</find>
       <find>pgPipeLine</find>
       <find>getPipeLineBylineName</find>
       <find>StringU</find>
-      <find>getAllAlarm</find>
       <find>getAlarmList</find>
       <find>getPgInPersonListByDay</find>
       <find>getDayInPgStatistic</find>
@@ -254,7 +216,16 @@
       <find>getPgContructionByNameOrType</find>
       <find>&quot;&quot;,&quot;&quot;,</find>
       <find>getPgContructionDtoByNameOrType</find>
+      <find>addConstruction</find>
+      <find>getPgLineAcuHole</find>
+      <find>getPlanResult</find>
       <find>getConstruction</find>
+      <find>addPipeLine</find>
+      <find>未找到入廊数据</find>
+      <find>getCurrentHoleByAcu</find>
+      <find>getAllAlarm</find>
+      <find>getPgDeviceDtoListByPartition</find>
+      <find>getPgDeviceByDevType</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -263,57 +234,57 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlan.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileHoleManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/planData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/PlanData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
       </list>
     </option>
   </component>
@@ -359,7 +330,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -421,53 +391,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="dto" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="manager" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -479,29 +402,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="rs" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -516,6 +416,7 @@
         </subPane>
       </pane>
       <pane id="Scope" />
+      <pane id="PackagesPane" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -710,7 +611,13 @@
       <workItem from="1574902733573" duration="1829000" />
       <workItem from="1574998240004" duration="7016000" />
       <workItem from="1575247959683" duration="6997000" />
-      <workItem from="1575704345590" duration="40473000" />
+      <workItem from="1575704345590" duration="69381000" />
+      <workItem from="1575869479666" duration="721000" />
+      <workItem from="1575947104878" duration="6101000" />
+      <workItem from="1576128264436" duration="3347000" />
+      <workItem from="1576208571543" duration="22000" />
+      <workItem from="1576227513917" duration="862000" />
+      <workItem from="1576293721220" duration="18246000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -817,11 +724,18 @@
       <option name="project" value="LOCAL" />
       <updated>1575775489149</updated>
     </task>
-    <option name="localTasksCounter" value="16" />
+    <task id="LOCAL-00016" summary="整改施工信息">
+      <created>1575791780774</created>
+      <option name="number" value="00016" />
+      <option name="presentableId" value="LOCAL-00016" />
+      <option name="project" value="LOCAL" />
+      <updated>1575791780774</updated>
+    </task>
+    <option name="localTasksCounter" value="17" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="452131000" />
+    <option name="totallyTimeSpent" value="510338000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -834,9 +748,8 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
-    <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.24205749" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2647504" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -847,7 +760,7 @@
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.3295082" />
       <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.4819672" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.65737706" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.3295082" />
@@ -939,7 +852,8 @@
     <MESSAGE value="重新设计智能规划部分" />
     <MESSAGE value="完成智能规划对接" />
     <MESSAGE value="修改报警统计" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改报警统计" />
+    <MESSAGE value="整改施工信息" />
+    <option name="LAST_COMMIT_MESSAGE" value="整改施工信息" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -951,16 +865,10 @@
           <option name="timeStamp" value="3" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java</url>
-          <line>69</line>
+          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java</url>
+          <line>40</line>
           <properties />
-          <option name="timeStamp" value="21" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java</url>
-          <line>96</line>
-          <properties />
-          <option name="timeStamp" value="38" />
+          <option name="timeStamp" value="122" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
@@ -970,394 +878,452 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <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="2068">
-          <caret line="154" column="35" selection-start-line="154" selection-start-column="35" selection-end-line="154" selection-end-column="35" />
-        </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="3300">
-          <caret line="297" column="22" selection-start-line="297" selection-start-column="22" selection-end-line="297" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/StringUtils.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
-          <caret line="13" column="48" lean-forward="true" selection-start-line="13" selection-start-column="48" selection-end-line="13" selection-end-column="48" />
+          <caret line="11" column="5" selection-start-line="11" selection-start-column="5" selection-end-line="11" selection-end-column="5" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="78" lean-forward="true" selection-start-line="78" selection-end-line="78" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="616">
-          <caret line="41" column="1" selection-start-line="41" selection-start-column="1" selection-end-line="41" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="110">
-          <caret line="12" column="23" selection-start-line="12" selection-start-column="23" selection-end-line="12" selection-end-column="23" />
+        <state relative-caret-position="516">
+          <caret line="114" column="12" selection-start-line="114" selection-start-column="12" selection-end-line="114" selection-end-column="12" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="164">
-          <caret line="56" lean-forward="true" selection-start-line="56" selection-end-line="56" />
+        <state relative-caret-position="418">
+          <caret line="33" column="44" selection-start-line="33" selection-start-column="44" selection-end-line="33" selection-end-column="44" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="258">
-          <caret line="27" column="12" lean-forward="true" selection-start-line="27" selection-start-column="12" selection-end-line="27" selection-end-column="12" />
+        <state relative-caret-position="132">
+          <caret line="11" column="20" lean-forward="true" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="20" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.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="-12">
-          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        <state relative-caret-position="516">
+          <caret line="142" column="54" selection-start-line="142" selection-start-column="54" selection-end-line="142" selection-end-column="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="858">
-          <caret line="55" column="27" lean-forward="true" selection-start-line="55" selection-start-column="27" selection-end-line="55" selection-end-column="27" />
+        <state relative-caret-position="66">
+          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="58">
+          <caret line="18" column="28" selection-start-line="18" selection-start-column="19" selection-end-line="18" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="305">
+          <caret line="24" column="31" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="714">
+          <caret line="58" column="5" lean-forward="true" selection-start-line="58" selection-start-column="5" selection-end-line="58" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="924">
+          <caret line="134" column="92" selection-start-line="134" selection-start-column="92" selection-end-line="134" selection-end-column="92" />
+          <folding>
+            <element signature="method#linkDevice#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkPartitionCamera#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkReservePlan#0;class#PgAlarmLinkRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1066">
+          <caret line="90" lean-forward="true" selection-start-line="90" selection-end-line="90" />
+          <folding>
+            <element signature="method#getTjResultByAlarmType#0;class#PgAlarmTjRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="946">
+          <caret line="148" column="11" lean-forward="true" selection-start-line="148" selection-start-column="11" selection-end-line="148" selection-end-column="11" />
+          <folding>
+            <element signature="method#getAlarmTypeList#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#addAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#editAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#deleteAlarmType#0;class#PgAlarmTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="208">
+          <caret line="46" column="23" lean-forward="true" selection-start-line="46" selection-start-column="23" selection-end-line="46" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="113" column="9" lean-forward="true" selection-start-line="113" selection-start-column="9" selection-end-line="113" selection-end-column="9" />
+          <folding>
+            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
+            <element signature="method#getNewestCh4InfoByDev#0;class#PgCh4Rs#0" />
+            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="145" column="6" lean-forward="true" selection-start-line="145" selection-start-column="6" selection-end-line="145" selection-end-column="6" />
+          <folding>
+            <element signature="method#addAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#editAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#deleteAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#getAuthorityList#0;class#PgAuthorityRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="58" column="1" lean-forward="true" selection-start-line="58" selection-start-column="1" selection-end-line="58" selection-end-column="1" />
+          <folding>
+            <element signature="method#getPgAssetPlanList#0;class#PgAssetPlanRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="370">
+          <caret line="371" column="66" selection-start-line="371" selection-start-column="66" selection-end-line="371" selection-end-column="66" />
+          <folding>
+            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#searchConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionDev#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="139" column="13" lean-forward="true" selection-start-line="139" selection-start-column="13" selection-end-line="139" selection-end-column="13" />
+          <folding>
+            <element signature="method#getCoInfoByDevAndDate#0;class#PgCoRs#0" />
+            <element signature="method#getNewestCoInfoByDev#0;class#PgCoRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="540">
+          <caret line="223" column="5" lean-forward="true" selection-start-line="223" selection-start-column="5" selection-end-line="223" selection-end-column="5" />
+          <folding>
+            <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="682">
+          <caret line="100" lean-forward="true" selection-start-line="100" selection-end-line="100" />
+          <folding>
+            <element signature="method#getDeviceTpeyList#0;class#PgDeviceTypeRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="377">
+          <caret line="225" column="35" selection-start-line="225" selection-start-column="35" selection-end-line="225" selection-end-column="35" />
+          <folding>
+            <element signature="method#addEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#addEquipment#1;class#PgEquipmentRs#0" />
+            <element signature="method#getEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#deleteEquipment#0;class#PgEquipmentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="406">
+          <caret line="109" lean-forward="true" selection-start-line="109" selection-end-line="109" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="154">
+          <caret line="28" column="19" selection-start-line="28" selection-start-column="19" selection-end-line="28" selection-end-column="19" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="748">
-          <caret line="49" column="5" lean-forward="true" selection-start-line="49" selection-start-column="5" selection-end-line="49" selection-end-column="5" />
+        <state relative-caret-position="296">
+          <caret line="161" column="35" selection-start-line="161" selection-start-column="35" selection-end-line="161" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="384">
+          <caret line="99" column="5" lean-forward="true" selection-start-line="99" selection-start-column="5" selection-end-line="99" selection-end-column="5" />
+        </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="362">
+          <caret line="340" column="35" selection-start-line="340" selection-start-column="35" selection-end-line="340" selection-end-column="35" />
+          <folding>
+            <element signature="method#addInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPersonInPg#0;class#PgInPgPersonRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-606">
+          <caret line="76" column="20" lean-forward="true" selection-start-line="76" selection-start-column="20" selection-end-line="76" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="65" column="35" selection-start-line="65" selection-start-column="35" selection-end-line="65" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="101" column="35" selection-start-line="101" selection-start-column="35" selection-end-line="101" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="84" column="35" selection-start-line="84" selection-start-column="35" selection-end-line="84" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="59" lean-forward="true" selection-start-line="59" selection-end-line="59" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="60" column="1" lean-forward="true" selection-start-line="60" selection-start-column="1" selection-end-line="60" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="145" column="35" selection-start-line="145" selection-start-column="35" selection-end-line="145" selection-end-column="35" />
+        </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="274">
+          <caret line="350" column="35" selection-start-line="350" selection-start-column="35" selection-end-line="350" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="121" column="39" selection-start-line="121" selection-start-column="39" selection-end-line="121" selection-end-column="39" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="28" column="8" lean-forward="true" selection-start-line="28" selection-start-column="8" selection-end-line="28" selection-end-column="8" />
+        <state relative-caret-position="340">
+          <caret line="103" selection-start-line="103" selection-end-line="103" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="226" column="35" selection-start-line="226" selection-start-column="35" selection-end-line="226" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="203" column="35" selection-start-line="203" selection-start-column="35" selection-end-line="203" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="241" column="35" selection-start-line="241" selection-start-column="35" selection-end-line="241" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="225" column="1" lean-forward="true" selection-start-line="225" selection-start-column="1" selection-end-line="225" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="176" column="5" lean-forward="true" selection-start-line="176" selection-start-column="5" selection-end-line="176" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="178" column="35" lean-forward="true" selection-start-line="178" selection-start-column="35" selection-end-line="178" selection-end-column="35" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="516">
-          <caret line="94" column="53" selection-start-line="94" selection-start-column="53" selection-end-line="94" selection-end-column="53" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="814">
-          <caret line="52" column="9" lean-forward="true" selection-start-line="52" selection-start-column="9" selection-end-line="52" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="182">
-          <caret line="58" column="12" lean-forward="true" selection-start-line="58" selection-start-column="12" selection-end-line="58" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="34" lean-forward="true" selection-start-line="34" selection-end-line="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="32" lean-forward="true" selection-start-line="32" selection-end-line="32" />
-          <folding>
-            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
-            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="185">
-          <caret line="63" column="13" selection-start-line="63" selection-start-column="13" selection-end-line="63" selection-end-column="13" />
-          <folding>
-            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
-            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
-            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="e#6319#6324#0" />
-            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
-          </folding>
+          <caret line="240" lean-forward="true" selection-start-line="240" selection-end-line="240" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
-          <caret line="58" column="28" lean-forward="true" selection-start-line="58" selection-start-column="28" selection-end-line="58" selection-end-column="28" />
-          <folding>
-            <element signature="method#addTempHumData#0;class#PgTempHumRs#0" />
-          </folding>
+        <state relative-caret-position="340">
+          <caret line="148" column="34" selection-start-line="148" selection-start-column="34" selection-end-line="148" selection-end-column="34" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
+        <state relative-caret-position="458">
+          <caret line="99" column="35" selection-start-line="99" selection-start-column="35" selection-end-line="99" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+        <state relative-caret-position="384">
+          <caret line="145" column="32" lean-forward="true" selection-start-line="145" selection-start-column="32" selection-end-line="145" selection-end-column="32" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="414">
-          <caret line="22" column="46" lean-forward="true" selection-start-line="22" selection-start-column="46" selection-end-line="22" selection-end-column="46" />
-        </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="396">
-          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" column="83" selection-start-line="11" selection-start-column="83" selection-end-line="11" selection-end-column="83" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="26">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
-          <folding>
-            <element signature="method#getPgInPgStatusByPerson#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNumByName#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNum#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPersonListByDay#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPgStatusByPgInPgPerson#0;class#PgInPgStatusManager#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="44">
-          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-12">
-          <caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="87" lean-forward="true" selection-start-line="87" selection-end-line="87" />
-          <folding>
-            <element signature="method#getConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#addConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#deleteConstructionType#0;class#PgConstructionTypeRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
-          <folding>
-            <element signature="method#getConstructionTypeByType#0;class#PgConstructionTypeManager#0" />
-            <element signature="method#getAllConstructionTypeDto#0;class#PgConstructionTypeManager#0" />
-          </folding>
-        </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="145">
-          <caret line="258" column="9" lean-forward="true" selection-start-line="258" selection-start-column="9" selection-end-line="258" selection-end-column="9" />
-          <folding>
-            <element signature="method#getMonthInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayInPgStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgOverViewRs#0" />
-            <element signature="method#getAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getMonthAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayAlarmStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgOverViewRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="103">
-          <caret line="105" column="50" lean-forward="true" selection-start-line="105" selection-start-column="50" selection-end-line="105" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateBasicDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="99">
-          <caret line="125" selection-start-line="125" selection-end-line="125" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="190">
-          <caret line="24" column="35" lean-forward="true" selection-start-line="24" selection-start-column="35" selection-end-line="24" selection-end-column="35" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="436">
-          <caret line="24" lean-forward="true" selection-start-line="24" selection-end-line="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" lean-forward="true" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="300">
-          <caret line="34" column="31" lean-forward="true" selection-start-line="34" selection-start-column="31" selection-end-line="34" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="42" column="13" lean-forward="true" selection-start-line="42" selection-start-column="13" selection-end-line="42" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="120" column="72" lean-forward="true" selection-start-line="120" selection-start-column="72" selection-end-line="120" selection-end-column="72" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="293">
-          <caret line="58" column="73" lean-forward="true" selection-start-line="58" selection-start-column="73" selection-end-line="58" selection-end-column="73" />
-          <folding>
-            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
-            <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
-          </folding>
-        </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="307">
-          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
+        <state relative-caret-position="758">
+          <caret line="130" column="5" lean-forward="true" selection-start-line="130" selection-start-column="5" selection-end-line="130" selection-end-column="5" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1170">
-          <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
+        <state relative-caret-position="494">
+          <caret line="86" column="62" lean-forward="true" selection-start-line="86" selection-start-column="62" selection-end-line="86" selection-end-column="62" />
           <folding>
-            <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-            <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+            <element signature="method#getAllDevice#0;class#PgDeviceManager#0" />
+            <element signature="method#getAllDev#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="195" column="28" lean-forward="true" selection-start-line="195" selection-start-column="28" selection-end-line="195" selection-end-column="28" />
+        <state relative-caret-position="166">
+          <caret line="174" column="13" lean-forward="true" selection-start-line="174" selection-start-column="13" selection-end-line="174" selection-end-column="13" />
           <folding>
-            <element signature="method#getAlarmByTypeAndTime#0;class#PgAlarmManager#0" />
-            <element signature="method#getAlarmNum#0;class#PgAlarmManager#0" />
             <element signature="method#getDayAlarmStatistic#0;class#PgAlarmManager#0" />
+            <element signature="method#getAlarmList#0;class#PgAlarmManager#0" />
             <element signature="method#createDTO#0;class#PgAlarmManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="364">
+          <caret line="46" column="56" lean-forward="true" selection-start-line="46" selection-start-column="56" selection-end-line="46" selection-end-column="56" />
+          <folding>
+            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
+            <element signature="method#getPgDev#0;class#PgDeviceRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
+            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+        <state relative-caret-position="396">
+          <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
           <folding>
             <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
             <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -1365,52 +1331,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="239">
-          <caret line="21" column="33" lean-forward="true" selection-start-line="21" selection-start-column="33" selection-end-line="21" selection-end-column="33" />
-        </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="352">
-          <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-        </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="99">
-          <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-          </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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-          <folding>
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-            <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>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
index c436c93..e913155 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
@@ -132,7 +132,10 @@
             this.setAlarmType("");
         else
             this.setAlarmType(pgAlarm.getAlarmTypeId().getAlarmType());
-        this.setAlarmValue(pgAlarm.getAlarmValue());
+        if(pgAlarm.getAlarmValue()==null)
+            this.setAlarmValue("");
+        else
+            this.setAlarmValue(pgAlarm.getAlarmValue());
         if (pgAlarm.getAlarmDate() != null)
             this.setAlarmDate(sdf.format(pgAlarm.getAlarmDate()));
         else

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 25ded8a..283d7ab 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,20 +7,56 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" 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/construction/manager/PgCsDocumentManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/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/manager/PgAlarmManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/~$说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/~$说明20191207.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.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$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/接口说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明20191207.docx" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
@@ -51,7 +87,7 @@
         <counts>
           <entry key="class" value="4" />
           <entry key="iml" value="2" />
-          <entry key="java" value="707" />
+          <entry key="java" value="820" />
           <entry key="properties" value="14" />
           <entry key="xml" value="7" />
         </counts>
@@ -60,7 +96,7 @@
         <counts>
           <entry key="CLASS" value="4" />
           <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="707" />
+          <entry key="JAVA" value="820" />
           <entry key="Properties" value="14" />
           <entry key="XML" value="7" />
         </counts>
@@ -68,32 +104,32 @@
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
           <entry key="dummy" value="38" />
-          <entry key="java" value="30161" />
+          <entry key="java" value="40859" />
           <entry key="properties" value="100" />
-          <entry key="txt" value="176" />
+          <entry key="txt" value="186" />
           <entry key="xml" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="30161" />
-          <entry key="PLAIN_TEXT" value="214" />
+          <entry key="JAVA" value="40859" />
+          <entry key="PLAIN_TEXT" value="224" />
           <entry key="Properties" value="100" />
           <entry key="XML" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="48" />
+          <entry key="project.closed" value="51" />
           <entry key="project.open.time.1" value="5" />
           <entry key="project.open.time.12" value="2" />
           <entry key="project.open.time.13" value="1" />
           <entry key="project.open.time.15" value="1" />
           <entry key="project.open.time.16" value="1" />
           <entry key="project.open.time.17" value="1" />
-          <entry key="project.open.time.2" value="1" />
+          <entry key="project.open.time.2" value="2" />
           <entry key="project.open.time.20" value="1" />
-          <entry key="project.open.time.23" value="1" />
+          <entry key="project.open.time.23" value="2" />
           <entry key="project.open.time.24" value="2" />
           <entry key="project.open.time.251" value="1" />
           <entry key="project.open.time.27" value="2" />
@@ -106,8 +142,8 @@
           <entry key="project.open.time.36" value="1" />
           <entry key="project.open.time.37" value="1" />
           <entry key="project.open.time.39" value="2" />
-          <entry key="project.open.time.4" value="2" />
-          <entry key="project.open.time.40" value="1" />
+          <entry key="project.open.time.4" value="3" />
+          <entry key="project.open.time.40" value="2" />
           <entry key="project.open.time.41" value="2" />
           <entry key="project.open.time.42" value="2" />
           <entry key="project.open.time.43" value="2" />
@@ -122,23 +158,25 @@
           <entry key="project.open.time.6" value="3" />
           <entry key="project.open.time.63" value="2" />
           <entry key="project.open.time.64" value="1" />
+          <entry key="project.open.time.66" value="1" />
           <entry key="project.open.time.71" value="2" />
+          <entry key="project.open.time.74" value="1" />
           <entry key="project.open.time.76" value="1" />
           <entry key="project.open.time.8" value="2" />
           <entry key="project.open.time.9" value="1" />
           <entry key="project.open.time.97" value="1" />
-          <entry key="project.opened" value="78" />
+          <entry key="project.opened" value="84" />
         </counts>
       </usages-collector>
     </session>
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+            <state relative-caret-position="396">
+              <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
               <folding>
                 <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
                 <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -147,73 +185,6 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <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="99">
-              <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-              <folding>
-                <element signature="imports" expanded="true" />
-                <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-1170">
-              <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state>
-              <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
-              <folding>
-                <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-                <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="true">
-        <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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-              <folding>
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-                <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>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <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="352">
-              <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -225,18 +196,9 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>inCriteria</find>
-      <find>getPgPlanResulList</find>
-      <find>getPileAcuListByPileAcuStr</find>
-      <find>distinct</find>
-      <find>order</find>
-      <find>canPlanLine</find>
-      <find>isExistLine</find>
-      <find>getPlanResult</find>
       <find>pgPipeLine</find>
       <find>getPipeLineBylineName</find>
       <find>StringU</find>
-      <find>getAllAlarm</find>
       <find>getAlarmList</find>
       <find>getPgInPersonListByDay</find>
       <find>getDayInPgStatistic</find>
@@ -254,7 +216,16 @@
       <find>getPgContructionByNameOrType</find>
       <find>&quot;&quot;,&quot;&quot;,</find>
       <find>getPgContructionDtoByNameOrType</find>
+      <find>addConstruction</find>
+      <find>getPgLineAcuHole</find>
+      <find>getPlanResult</find>
       <find>getConstruction</find>
+      <find>addPipeLine</find>
+      <find>未找到入廊数据</find>
+      <find>getCurrentHoleByAcu</find>
+      <find>getAllAlarm</find>
+      <find>getPgDeviceDtoListByPartition</find>
+      <find>getPgDeviceByDevType</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -263,57 +234,57 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlan.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileHoleManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/planData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/PlanData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
       </list>
     </option>
   </component>
@@ -359,7 +330,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -421,53 +391,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="dto" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="manager" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -479,29 +402,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="rs" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -516,6 +416,7 @@
         </subPane>
       </pane>
       <pane id="Scope" />
+      <pane id="PackagesPane" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -710,7 +611,13 @@
       <workItem from="1574902733573" duration="1829000" />
       <workItem from="1574998240004" duration="7016000" />
       <workItem from="1575247959683" duration="6997000" />
-      <workItem from="1575704345590" duration="40473000" />
+      <workItem from="1575704345590" duration="69381000" />
+      <workItem from="1575869479666" duration="721000" />
+      <workItem from="1575947104878" duration="6101000" />
+      <workItem from="1576128264436" duration="3347000" />
+      <workItem from="1576208571543" duration="22000" />
+      <workItem from="1576227513917" duration="862000" />
+      <workItem from="1576293721220" duration="18246000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -817,11 +724,18 @@
       <option name="project" value="LOCAL" />
       <updated>1575775489149</updated>
     </task>
-    <option name="localTasksCounter" value="16" />
+    <task id="LOCAL-00016" summary="整改施工信息">
+      <created>1575791780774</created>
+      <option name="number" value="00016" />
+      <option name="presentableId" value="LOCAL-00016" />
+      <option name="project" value="LOCAL" />
+      <updated>1575791780774</updated>
+    </task>
+    <option name="localTasksCounter" value="17" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="452131000" />
+    <option name="totallyTimeSpent" value="510338000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -834,9 +748,8 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
-    <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.24205749" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2647504" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -847,7 +760,7 @@
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.3295082" />
       <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.4819672" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.65737706" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.3295082" />
@@ -939,7 +852,8 @@
     <MESSAGE value="重新设计智能规划部分" />
     <MESSAGE value="完成智能规划对接" />
     <MESSAGE value="修改报警统计" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改报警统计" />
+    <MESSAGE value="整改施工信息" />
+    <option name="LAST_COMMIT_MESSAGE" value="整改施工信息" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -951,16 +865,10 @@
           <option name="timeStamp" value="3" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java</url>
-          <line>69</line>
+          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java</url>
+          <line>40</line>
           <properties />
-          <option name="timeStamp" value="21" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java</url>
-          <line>96</line>
-          <properties />
-          <option name="timeStamp" value="38" />
+          <option name="timeStamp" value="122" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
@@ -970,394 +878,452 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <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="2068">
-          <caret line="154" column="35" selection-start-line="154" selection-start-column="35" selection-end-line="154" selection-end-column="35" />
-        </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="3300">
-          <caret line="297" column="22" selection-start-line="297" selection-start-column="22" selection-end-line="297" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/StringUtils.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
-          <caret line="13" column="48" lean-forward="true" selection-start-line="13" selection-start-column="48" selection-end-line="13" selection-end-column="48" />
+          <caret line="11" column="5" selection-start-line="11" selection-start-column="5" selection-end-line="11" selection-end-column="5" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="78" lean-forward="true" selection-start-line="78" selection-end-line="78" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="616">
-          <caret line="41" column="1" selection-start-line="41" selection-start-column="1" selection-end-line="41" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="110">
-          <caret line="12" column="23" selection-start-line="12" selection-start-column="23" selection-end-line="12" selection-end-column="23" />
+        <state relative-caret-position="516">
+          <caret line="114" column="12" selection-start-line="114" selection-start-column="12" selection-end-line="114" selection-end-column="12" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="164">
-          <caret line="56" lean-forward="true" selection-start-line="56" selection-end-line="56" />
+        <state relative-caret-position="418">
+          <caret line="33" column="44" selection-start-line="33" selection-start-column="44" selection-end-line="33" selection-end-column="44" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="258">
-          <caret line="27" column="12" lean-forward="true" selection-start-line="27" selection-start-column="12" selection-end-line="27" selection-end-column="12" />
+        <state relative-caret-position="132">
+          <caret line="11" column="20" lean-forward="true" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="20" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.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="-12">
-          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        <state relative-caret-position="516">
+          <caret line="142" column="54" selection-start-line="142" selection-start-column="54" selection-end-line="142" selection-end-column="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="858">
-          <caret line="55" column="27" lean-forward="true" selection-start-line="55" selection-start-column="27" selection-end-line="55" selection-end-column="27" />
+        <state relative-caret-position="66">
+          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="58">
+          <caret line="18" column="28" selection-start-line="18" selection-start-column="19" selection-end-line="18" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="305">
+          <caret line="24" column="31" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="714">
+          <caret line="58" column="5" lean-forward="true" selection-start-line="58" selection-start-column="5" selection-end-line="58" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="924">
+          <caret line="134" column="92" selection-start-line="134" selection-start-column="92" selection-end-line="134" selection-end-column="92" />
+          <folding>
+            <element signature="method#linkDevice#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkPartitionCamera#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkReservePlan#0;class#PgAlarmLinkRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1066">
+          <caret line="90" lean-forward="true" selection-start-line="90" selection-end-line="90" />
+          <folding>
+            <element signature="method#getTjResultByAlarmType#0;class#PgAlarmTjRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="946">
+          <caret line="148" column="11" lean-forward="true" selection-start-line="148" selection-start-column="11" selection-end-line="148" selection-end-column="11" />
+          <folding>
+            <element signature="method#getAlarmTypeList#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#addAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#editAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#deleteAlarmType#0;class#PgAlarmTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="208">
+          <caret line="46" column="23" lean-forward="true" selection-start-line="46" selection-start-column="23" selection-end-line="46" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="113" column="9" lean-forward="true" selection-start-line="113" selection-start-column="9" selection-end-line="113" selection-end-column="9" />
+          <folding>
+            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
+            <element signature="method#getNewestCh4InfoByDev#0;class#PgCh4Rs#0" />
+            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="145" column="6" lean-forward="true" selection-start-line="145" selection-start-column="6" selection-end-line="145" selection-end-column="6" />
+          <folding>
+            <element signature="method#addAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#editAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#deleteAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#getAuthorityList#0;class#PgAuthorityRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="58" column="1" lean-forward="true" selection-start-line="58" selection-start-column="1" selection-end-line="58" selection-end-column="1" />
+          <folding>
+            <element signature="method#getPgAssetPlanList#0;class#PgAssetPlanRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="370">
+          <caret line="371" column="66" selection-start-line="371" selection-start-column="66" selection-end-line="371" selection-end-column="66" />
+          <folding>
+            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#searchConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionDev#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="139" column="13" lean-forward="true" selection-start-line="139" selection-start-column="13" selection-end-line="139" selection-end-column="13" />
+          <folding>
+            <element signature="method#getCoInfoByDevAndDate#0;class#PgCoRs#0" />
+            <element signature="method#getNewestCoInfoByDev#0;class#PgCoRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="540">
+          <caret line="223" column="5" lean-forward="true" selection-start-line="223" selection-start-column="5" selection-end-line="223" selection-end-column="5" />
+          <folding>
+            <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="682">
+          <caret line="100" lean-forward="true" selection-start-line="100" selection-end-line="100" />
+          <folding>
+            <element signature="method#getDeviceTpeyList#0;class#PgDeviceTypeRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="377">
+          <caret line="225" column="35" selection-start-line="225" selection-start-column="35" selection-end-line="225" selection-end-column="35" />
+          <folding>
+            <element signature="method#addEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#addEquipment#1;class#PgEquipmentRs#0" />
+            <element signature="method#getEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#deleteEquipment#0;class#PgEquipmentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="406">
+          <caret line="109" lean-forward="true" selection-start-line="109" selection-end-line="109" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="154">
+          <caret line="28" column="19" selection-start-line="28" selection-start-column="19" selection-end-line="28" selection-end-column="19" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="748">
-          <caret line="49" column="5" lean-forward="true" selection-start-line="49" selection-start-column="5" selection-end-line="49" selection-end-column="5" />
+        <state relative-caret-position="296">
+          <caret line="161" column="35" selection-start-line="161" selection-start-column="35" selection-end-line="161" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="384">
+          <caret line="99" column="5" lean-forward="true" selection-start-line="99" selection-start-column="5" selection-end-line="99" selection-end-column="5" />
+        </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="362">
+          <caret line="340" column="35" selection-start-line="340" selection-start-column="35" selection-end-line="340" selection-end-column="35" />
+          <folding>
+            <element signature="method#addInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPersonInPg#0;class#PgInPgPersonRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-606">
+          <caret line="76" column="20" lean-forward="true" selection-start-line="76" selection-start-column="20" selection-end-line="76" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="65" column="35" selection-start-line="65" selection-start-column="35" selection-end-line="65" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="101" column="35" selection-start-line="101" selection-start-column="35" selection-end-line="101" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="84" column="35" selection-start-line="84" selection-start-column="35" selection-end-line="84" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="59" lean-forward="true" selection-start-line="59" selection-end-line="59" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="60" column="1" lean-forward="true" selection-start-line="60" selection-start-column="1" selection-end-line="60" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="145" column="35" selection-start-line="145" selection-start-column="35" selection-end-line="145" selection-end-column="35" />
+        </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="274">
+          <caret line="350" column="35" selection-start-line="350" selection-start-column="35" selection-end-line="350" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="121" column="39" selection-start-line="121" selection-start-column="39" selection-end-line="121" selection-end-column="39" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="28" column="8" lean-forward="true" selection-start-line="28" selection-start-column="8" selection-end-line="28" selection-end-column="8" />
+        <state relative-caret-position="340">
+          <caret line="103" selection-start-line="103" selection-end-line="103" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="226" column="35" selection-start-line="226" selection-start-column="35" selection-end-line="226" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="203" column="35" selection-start-line="203" selection-start-column="35" selection-end-line="203" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="241" column="35" selection-start-line="241" selection-start-column="35" selection-end-line="241" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="225" column="1" lean-forward="true" selection-start-line="225" selection-start-column="1" selection-end-line="225" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="176" column="5" lean-forward="true" selection-start-line="176" selection-start-column="5" selection-end-line="176" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="178" column="35" lean-forward="true" selection-start-line="178" selection-start-column="35" selection-end-line="178" selection-end-column="35" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="516">
-          <caret line="94" column="53" selection-start-line="94" selection-start-column="53" selection-end-line="94" selection-end-column="53" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="814">
-          <caret line="52" column="9" lean-forward="true" selection-start-line="52" selection-start-column="9" selection-end-line="52" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="182">
-          <caret line="58" column="12" lean-forward="true" selection-start-line="58" selection-start-column="12" selection-end-line="58" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="34" lean-forward="true" selection-start-line="34" selection-end-line="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="32" lean-forward="true" selection-start-line="32" selection-end-line="32" />
-          <folding>
-            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
-            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="185">
-          <caret line="63" column="13" selection-start-line="63" selection-start-column="13" selection-end-line="63" selection-end-column="13" />
-          <folding>
-            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
-            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
-            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="e#6319#6324#0" />
-            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
-          </folding>
+          <caret line="240" lean-forward="true" selection-start-line="240" selection-end-line="240" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
-          <caret line="58" column="28" lean-forward="true" selection-start-line="58" selection-start-column="28" selection-end-line="58" selection-end-column="28" />
-          <folding>
-            <element signature="method#addTempHumData#0;class#PgTempHumRs#0" />
-          </folding>
+        <state relative-caret-position="340">
+          <caret line="148" column="34" selection-start-line="148" selection-start-column="34" selection-end-line="148" selection-end-column="34" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
+        <state relative-caret-position="458">
+          <caret line="99" column="35" selection-start-line="99" selection-start-column="35" selection-end-line="99" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+        <state relative-caret-position="384">
+          <caret line="145" column="32" lean-forward="true" selection-start-line="145" selection-start-column="32" selection-end-line="145" selection-end-column="32" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="414">
-          <caret line="22" column="46" lean-forward="true" selection-start-line="22" selection-start-column="46" selection-end-line="22" selection-end-column="46" />
-        </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="396">
-          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" column="83" selection-start-line="11" selection-start-column="83" selection-end-line="11" selection-end-column="83" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="26">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
-          <folding>
-            <element signature="method#getPgInPgStatusByPerson#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNumByName#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNum#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPersonListByDay#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPgStatusByPgInPgPerson#0;class#PgInPgStatusManager#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="44">
-          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-12">
-          <caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="87" lean-forward="true" selection-start-line="87" selection-end-line="87" />
-          <folding>
-            <element signature="method#getConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#addConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#deleteConstructionType#0;class#PgConstructionTypeRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
-          <folding>
-            <element signature="method#getConstructionTypeByType#0;class#PgConstructionTypeManager#0" />
-            <element signature="method#getAllConstructionTypeDto#0;class#PgConstructionTypeManager#0" />
-          </folding>
-        </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="145">
-          <caret line="258" column="9" lean-forward="true" selection-start-line="258" selection-start-column="9" selection-end-line="258" selection-end-column="9" />
-          <folding>
-            <element signature="method#getMonthInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayInPgStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgOverViewRs#0" />
-            <element signature="method#getAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getMonthAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayAlarmStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgOverViewRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="103">
-          <caret line="105" column="50" lean-forward="true" selection-start-line="105" selection-start-column="50" selection-end-line="105" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateBasicDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="99">
-          <caret line="125" selection-start-line="125" selection-end-line="125" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="190">
-          <caret line="24" column="35" lean-forward="true" selection-start-line="24" selection-start-column="35" selection-end-line="24" selection-end-column="35" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="436">
-          <caret line="24" lean-forward="true" selection-start-line="24" selection-end-line="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" lean-forward="true" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="300">
-          <caret line="34" column="31" lean-forward="true" selection-start-line="34" selection-start-column="31" selection-end-line="34" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="42" column="13" lean-forward="true" selection-start-line="42" selection-start-column="13" selection-end-line="42" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="120" column="72" lean-forward="true" selection-start-line="120" selection-start-column="72" selection-end-line="120" selection-end-column="72" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="293">
-          <caret line="58" column="73" lean-forward="true" selection-start-line="58" selection-start-column="73" selection-end-line="58" selection-end-column="73" />
-          <folding>
-            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
-            <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
-          </folding>
-        </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="307">
-          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
+        <state relative-caret-position="758">
+          <caret line="130" column="5" lean-forward="true" selection-start-line="130" selection-start-column="5" selection-end-line="130" selection-end-column="5" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1170">
-          <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
+        <state relative-caret-position="494">
+          <caret line="86" column="62" lean-forward="true" selection-start-line="86" selection-start-column="62" selection-end-line="86" selection-end-column="62" />
           <folding>
-            <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-            <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+            <element signature="method#getAllDevice#0;class#PgDeviceManager#0" />
+            <element signature="method#getAllDev#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="195" column="28" lean-forward="true" selection-start-line="195" selection-start-column="28" selection-end-line="195" selection-end-column="28" />
+        <state relative-caret-position="166">
+          <caret line="174" column="13" lean-forward="true" selection-start-line="174" selection-start-column="13" selection-end-line="174" selection-end-column="13" />
           <folding>
-            <element signature="method#getAlarmByTypeAndTime#0;class#PgAlarmManager#0" />
-            <element signature="method#getAlarmNum#0;class#PgAlarmManager#0" />
             <element signature="method#getDayAlarmStatistic#0;class#PgAlarmManager#0" />
+            <element signature="method#getAlarmList#0;class#PgAlarmManager#0" />
             <element signature="method#createDTO#0;class#PgAlarmManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="364">
+          <caret line="46" column="56" lean-forward="true" selection-start-line="46" selection-start-column="56" selection-end-line="46" selection-end-column="56" />
+          <folding>
+            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
+            <element signature="method#getPgDev#0;class#PgDeviceRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
+            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+        <state relative-caret-position="396">
+          <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
           <folding>
             <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
             <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -1365,52 +1331,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="239">
-          <caret line="21" column="33" lean-forward="true" selection-start-line="21" selection-start-column="33" selection-end-line="21" selection-end-column="33" />
-        </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="352">
-          <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-        </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="99">
-          <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-          </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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-          <folding>
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-            <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>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
index c436c93..e913155 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
@@ -132,7 +132,10 @@
             this.setAlarmType("");
         else
             this.setAlarmType(pgAlarm.getAlarmTypeId().getAlarmType());
-        this.setAlarmValue(pgAlarm.getAlarmValue());
+        if(pgAlarm.getAlarmValue()==null)
+            this.setAlarmValue("");
+        else
+            this.setAlarmValue(pgAlarm.getAlarmValue());
         if (pgAlarm.getAlarmDate() != null)
             this.setAlarmDate(sdf.format(pgAlarm.getAlarmDate()));
         else
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
index a43965c..565cb41 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -159,11 +159,21 @@
     }
 
     //获取历史报警消息列表
-    public List<PgAlarmDto> getAllAlarm(String alarmType,String startDay,String endDay,String isNew,int page,int rows) {
-        try {
+    public  Map<String, Object> getAllAlarm(String alarmType,String partition,String startDay,String endDay,String isNew,int page,int rows) {
 
+        Map<String, Object> resultMap = new HashMap<>();
+        String msg="";
+
+        try {
             Criteria criteria = createCriteria(PgAlarm.class);
 
+            if (StringUtils.isNotBlank(partition)) {
+                DetachedCriteria inCriteria = DetachedCriteria.forClass(PgDevice.class);
+                inCriteria.add(Restrictions.eq("partition", partition));
+                inCriteria.setProjection(Property.forName("id"));
+                criteria.add(Property.forName("alarmDevId").in(inCriteria));
+            }
+
             if (StringUtils.isNotBlank(alarmType)&&!alarmType.contains("全部")&&pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
                 criteria.add(Restrictions.eq("alarmTypeId", pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)));
 
@@ -190,8 +200,16 @@
             for (PgAlarm pgAlarm : pgAlarmList) {
                 pgAlarmDtoList.add(new PgAlarmDto(pgAlarm));
             }
-
-            return pgAlarmDtoList;
+            if(pgAlarmDtoList==null||pgAlarmDtoList.size()==0) {
+                resultMap.put("msg", "没有报警信息");
+                resultMap.put("code","0");
+            }else {
+                resultMap.put("code","200");
+                resultMap.put("msg", "报警信息获取成功");
+            }
+            resultMap.put("count",pg.getTotalCount());
+            resultMap.put("result",pgAlarmDtoList);
+            return resultMap;
         }
         catch(Exception ex){
             ex.printStackTrace();

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 25ded8a..283d7ab 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,20 +7,56 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" 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/construction/manager/PgCsDocumentManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/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/manager/PgAlarmManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/~$说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/~$说明20191207.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.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$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/接口说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明20191207.docx" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
@@ -51,7 +87,7 @@
         <counts>
           <entry key="class" value="4" />
           <entry key="iml" value="2" />
-          <entry key="java" value="707" />
+          <entry key="java" value="820" />
           <entry key="properties" value="14" />
           <entry key="xml" value="7" />
         </counts>
@@ -60,7 +96,7 @@
         <counts>
           <entry key="CLASS" value="4" />
           <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="707" />
+          <entry key="JAVA" value="820" />
           <entry key="Properties" value="14" />
           <entry key="XML" value="7" />
         </counts>
@@ -68,32 +104,32 @@
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
           <entry key="dummy" value="38" />
-          <entry key="java" value="30161" />
+          <entry key="java" value="40859" />
           <entry key="properties" value="100" />
-          <entry key="txt" value="176" />
+          <entry key="txt" value="186" />
           <entry key="xml" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="30161" />
-          <entry key="PLAIN_TEXT" value="214" />
+          <entry key="JAVA" value="40859" />
+          <entry key="PLAIN_TEXT" value="224" />
           <entry key="Properties" value="100" />
           <entry key="XML" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="48" />
+          <entry key="project.closed" value="51" />
           <entry key="project.open.time.1" value="5" />
           <entry key="project.open.time.12" value="2" />
           <entry key="project.open.time.13" value="1" />
           <entry key="project.open.time.15" value="1" />
           <entry key="project.open.time.16" value="1" />
           <entry key="project.open.time.17" value="1" />
-          <entry key="project.open.time.2" value="1" />
+          <entry key="project.open.time.2" value="2" />
           <entry key="project.open.time.20" value="1" />
-          <entry key="project.open.time.23" value="1" />
+          <entry key="project.open.time.23" value="2" />
           <entry key="project.open.time.24" value="2" />
           <entry key="project.open.time.251" value="1" />
           <entry key="project.open.time.27" value="2" />
@@ -106,8 +142,8 @@
           <entry key="project.open.time.36" value="1" />
           <entry key="project.open.time.37" value="1" />
           <entry key="project.open.time.39" value="2" />
-          <entry key="project.open.time.4" value="2" />
-          <entry key="project.open.time.40" value="1" />
+          <entry key="project.open.time.4" value="3" />
+          <entry key="project.open.time.40" value="2" />
           <entry key="project.open.time.41" value="2" />
           <entry key="project.open.time.42" value="2" />
           <entry key="project.open.time.43" value="2" />
@@ -122,23 +158,25 @@
           <entry key="project.open.time.6" value="3" />
           <entry key="project.open.time.63" value="2" />
           <entry key="project.open.time.64" value="1" />
+          <entry key="project.open.time.66" value="1" />
           <entry key="project.open.time.71" value="2" />
+          <entry key="project.open.time.74" value="1" />
           <entry key="project.open.time.76" value="1" />
           <entry key="project.open.time.8" value="2" />
           <entry key="project.open.time.9" value="1" />
           <entry key="project.open.time.97" value="1" />
-          <entry key="project.opened" value="78" />
+          <entry key="project.opened" value="84" />
         </counts>
       </usages-collector>
     </session>
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+            <state relative-caret-position="396">
+              <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
               <folding>
                 <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
                 <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -147,73 +185,6 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <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="99">
-              <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-              <folding>
-                <element signature="imports" expanded="true" />
-                <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-1170">
-              <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state>
-              <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
-              <folding>
-                <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-                <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="true">
-        <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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-              <folding>
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-                <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>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <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="352">
-              <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -225,18 +196,9 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>inCriteria</find>
-      <find>getPgPlanResulList</find>
-      <find>getPileAcuListByPileAcuStr</find>
-      <find>distinct</find>
-      <find>order</find>
-      <find>canPlanLine</find>
-      <find>isExistLine</find>
-      <find>getPlanResult</find>
       <find>pgPipeLine</find>
       <find>getPipeLineBylineName</find>
       <find>StringU</find>
-      <find>getAllAlarm</find>
       <find>getAlarmList</find>
       <find>getPgInPersonListByDay</find>
       <find>getDayInPgStatistic</find>
@@ -254,7 +216,16 @@
       <find>getPgContructionByNameOrType</find>
       <find>&quot;&quot;,&quot;&quot;,</find>
       <find>getPgContructionDtoByNameOrType</find>
+      <find>addConstruction</find>
+      <find>getPgLineAcuHole</find>
+      <find>getPlanResult</find>
       <find>getConstruction</find>
+      <find>addPipeLine</find>
+      <find>未找到入廊数据</find>
+      <find>getCurrentHoleByAcu</find>
+      <find>getAllAlarm</find>
+      <find>getPgDeviceDtoListByPartition</find>
+      <find>getPgDeviceByDevType</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -263,57 +234,57 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlan.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileHoleManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/planData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/PlanData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
       </list>
     </option>
   </component>
@@ -359,7 +330,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -421,53 +391,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="dto" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="manager" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -479,29 +402,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="rs" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -516,6 +416,7 @@
         </subPane>
       </pane>
       <pane id="Scope" />
+      <pane id="PackagesPane" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -710,7 +611,13 @@
       <workItem from="1574902733573" duration="1829000" />
       <workItem from="1574998240004" duration="7016000" />
       <workItem from="1575247959683" duration="6997000" />
-      <workItem from="1575704345590" duration="40473000" />
+      <workItem from="1575704345590" duration="69381000" />
+      <workItem from="1575869479666" duration="721000" />
+      <workItem from="1575947104878" duration="6101000" />
+      <workItem from="1576128264436" duration="3347000" />
+      <workItem from="1576208571543" duration="22000" />
+      <workItem from="1576227513917" duration="862000" />
+      <workItem from="1576293721220" duration="18246000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -817,11 +724,18 @@
       <option name="project" value="LOCAL" />
       <updated>1575775489149</updated>
     </task>
-    <option name="localTasksCounter" value="16" />
+    <task id="LOCAL-00016" summary="整改施工信息">
+      <created>1575791780774</created>
+      <option name="number" value="00016" />
+      <option name="presentableId" value="LOCAL-00016" />
+      <option name="project" value="LOCAL" />
+      <updated>1575791780774</updated>
+    </task>
+    <option name="localTasksCounter" value="17" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="452131000" />
+    <option name="totallyTimeSpent" value="510338000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -834,9 +748,8 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
-    <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.24205749" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2647504" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -847,7 +760,7 @@
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.3295082" />
       <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.4819672" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.65737706" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.3295082" />
@@ -939,7 +852,8 @@
     <MESSAGE value="重新设计智能规划部分" />
     <MESSAGE value="完成智能规划对接" />
     <MESSAGE value="修改报警统计" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改报警统计" />
+    <MESSAGE value="整改施工信息" />
+    <option name="LAST_COMMIT_MESSAGE" value="整改施工信息" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -951,16 +865,10 @@
           <option name="timeStamp" value="3" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java</url>
-          <line>69</line>
+          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java</url>
+          <line>40</line>
           <properties />
-          <option name="timeStamp" value="21" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java</url>
-          <line>96</line>
-          <properties />
-          <option name="timeStamp" value="38" />
+          <option name="timeStamp" value="122" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
@@ -970,394 +878,452 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <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="2068">
-          <caret line="154" column="35" selection-start-line="154" selection-start-column="35" selection-end-line="154" selection-end-column="35" />
-        </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="3300">
-          <caret line="297" column="22" selection-start-line="297" selection-start-column="22" selection-end-line="297" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/StringUtils.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
-          <caret line="13" column="48" lean-forward="true" selection-start-line="13" selection-start-column="48" selection-end-line="13" selection-end-column="48" />
+          <caret line="11" column="5" selection-start-line="11" selection-start-column="5" selection-end-line="11" selection-end-column="5" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="78" lean-forward="true" selection-start-line="78" selection-end-line="78" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="616">
-          <caret line="41" column="1" selection-start-line="41" selection-start-column="1" selection-end-line="41" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="110">
-          <caret line="12" column="23" selection-start-line="12" selection-start-column="23" selection-end-line="12" selection-end-column="23" />
+        <state relative-caret-position="516">
+          <caret line="114" column="12" selection-start-line="114" selection-start-column="12" selection-end-line="114" selection-end-column="12" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="164">
-          <caret line="56" lean-forward="true" selection-start-line="56" selection-end-line="56" />
+        <state relative-caret-position="418">
+          <caret line="33" column="44" selection-start-line="33" selection-start-column="44" selection-end-line="33" selection-end-column="44" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="258">
-          <caret line="27" column="12" lean-forward="true" selection-start-line="27" selection-start-column="12" selection-end-line="27" selection-end-column="12" />
+        <state relative-caret-position="132">
+          <caret line="11" column="20" lean-forward="true" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="20" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.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="-12">
-          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        <state relative-caret-position="516">
+          <caret line="142" column="54" selection-start-line="142" selection-start-column="54" selection-end-line="142" selection-end-column="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="858">
-          <caret line="55" column="27" lean-forward="true" selection-start-line="55" selection-start-column="27" selection-end-line="55" selection-end-column="27" />
+        <state relative-caret-position="66">
+          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="58">
+          <caret line="18" column="28" selection-start-line="18" selection-start-column="19" selection-end-line="18" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="305">
+          <caret line="24" column="31" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="714">
+          <caret line="58" column="5" lean-forward="true" selection-start-line="58" selection-start-column="5" selection-end-line="58" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="924">
+          <caret line="134" column="92" selection-start-line="134" selection-start-column="92" selection-end-line="134" selection-end-column="92" />
+          <folding>
+            <element signature="method#linkDevice#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkPartitionCamera#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkReservePlan#0;class#PgAlarmLinkRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1066">
+          <caret line="90" lean-forward="true" selection-start-line="90" selection-end-line="90" />
+          <folding>
+            <element signature="method#getTjResultByAlarmType#0;class#PgAlarmTjRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="946">
+          <caret line="148" column="11" lean-forward="true" selection-start-line="148" selection-start-column="11" selection-end-line="148" selection-end-column="11" />
+          <folding>
+            <element signature="method#getAlarmTypeList#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#addAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#editAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#deleteAlarmType#0;class#PgAlarmTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="208">
+          <caret line="46" column="23" lean-forward="true" selection-start-line="46" selection-start-column="23" selection-end-line="46" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="113" column="9" lean-forward="true" selection-start-line="113" selection-start-column="9" selection-end-line="113" selection-end-column="9" />
+          <folding>
+            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
+            <element signature="method#getNewestCh4InfoByDev#0;class#PgCh4Rs#0" />
+            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="145" column="6" lean-forward="true" selection-start-line="145" selection-start-column="6" selection-end-line="145" selection-end-column="6" />
+          <folding>
+            <element signature="method#addAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#editAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#deleteAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#getAuthorityList#0;class#PgAuthorityRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="58" column="1" lean-forward="true" selection-start-line="58" selection-start-column="1" selection-end-line="58" selection-end-column="1" />
+          <folding>
+            <element signature="method#getPgAssetPlanList#0;class#PgAssetPlanRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="370">
+          <caret line="371" column="66" selection-start-line="371" selection-start-column="66" selection-end-line="371" selection-end-column="66" />
+          <folding>
+            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#searchConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionDev#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="139" column="13" lean-forward="true" selection-start-line="139" selection-start-column="13" selection-end-line="139" selection-end-column="13" />
+          <folding>
+            <element signature="method#getCoInfoByDevAndDate#0;class#PgCoRs#0" />
+            <element signature="method#getNewestCoInfoByDev#0;class#PgCoRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="540">
+          <caret line="223" column="5" lean-forward="true" selection-start-line="223" selection-start-column="5" selection-end-line="223" selection-end-column="5" />
+          <folding>
+            <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="682">
+          <caret line="100" lean-forward="true" selection-start-line="100" selection-end-line="100" />
+          <folding>
+            <element signature="method#getDeviceTpeyList#0;class#PgDeviceTypeRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="377">
+          <caret line="225" column="35" selection-start-line="225" selection-start-column="35" selection-end-line="225" selection-end-column="35" />
+          <folding>
+            <element signature="method#addEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#addEquipment#1;class#PgEquipmentRs#0" />
+            <element signature="method#getEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#deleteEquipment#0;class#PgEquipmentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="406">
+          <caret line="109" lean-forward="true" selection-start-line="109" selection-end-line="109" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="154">
+          <caret line="28" column="19" selection-start-line="28" selection-start-column="19" selection-end-line="28" selection-end-column="19" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="748">
-          <caret line="49" column="5" lean-forward="true" selection-start-line="49" selection-start-column="5" selection-end-line="49" selection-end-column="5" />
+        <state relative-caret-position="296">
+          <caret line="161" column="35" selection-start-line="161" selection-start-column="35" selection-end-line="161" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="384">
+          <caret line="99" column="5" lean-forward="true" selection-start-line="99" selection-start-column="5" selection-end-line="99" selection-end-column="5" />
+        </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="362">
+          <caret line="340" column="35" selection-start-line="340" selection-start-column="35" selection-end-line="340" selection-end-column="35" />
+          <folding>
+            <element signature="method#addInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPersonInPg#0;class#PgInPgPersonRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-606">
+          <caret line="76" column="20" lean-forward="true" selection-start-line="76" selection-start-column="20" selection-end-line="76" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="65" column="35" selection-start-line="65" selection-start-column="35" selection-end-line="65" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="101" column="35" selection-start-line="101" selection-start-column="35" selection-end-line="101" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="84" column="35" selection-start-line="84" selection-start-column="35" selection-end-line="84" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="59" lean-forward="true" selection-start-line="59" selection-end-line="59" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="60" column="1" lean-forward="true" selection-start-line="60" selection-start-column="1" selection-end-line="60" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="145" column="35" selection-start-line="145" selection-start-column="35" selection-end-line="145" selection-end-column="35" />
+        </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="274">
+          <caret line="350" column="35" selection-start-line="350" selection-start-column="35" selection-end-line="350" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="121" column="39" selection-start-line="121" selection-start-column="39" selection-end-line="121" selection-end-column="39" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="28" column="8" lean-forward="true" selection-start-line="28" selection-start-column="8" selection-end-line="28" selection-end-column="8" />
+        <state relative-caret-position="340">
+          <caret line="103" selection-start-line="103" selection-end-line="103" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="226" column="35" selection-start-line="226" selection-start-column="35" selection-end-line="226" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="203" column="35" selection-start-line="203" selection-start-column="35" selection-end-line="203" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="241" column="35" selection-start-line="241" selection-start-column="35" selection-end-line="241" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="225" column="1" lean-forward="true" selection-start-line="225" selection-start-column="1" selection-end-line="225" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="176" column="5" lean-forward="true" selection-start-line="176" selection-start-column="5" selection-end-line="176" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="178" column="35" lean-forward="true" selection-start-line="178" selection-start-column="35" selection-end-line="178" selection-end-column="35" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="516">
-          <caret line="94" column="53" selection-start-line="94" selection-start-column="53" selection-end-line="94" selection-end-column="53" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="814">
-          <caret line="52" column="9" lean-forward="true" selection-start-line="52" selection-start-column="9" selection-end-line="52" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="182">
-          <caret line="58" column="12" lean-forward="true" selection-start-line="58" selection-start-column="12" selection-end-line="58" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="34" lean-forward="true" selection-start-line="34" selection-end-line="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="32" lean-forward="true" selection-start-line="32" selection-end-line="32" />
-          <folding>
-            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
-            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="185">
-          <caret line="63" column="13" selection-start-line="63" selection-start-column="13" selection-end-line="63" selection-end-column="13" />
-          <folding>
-            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
-            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
-            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="e#6319#6324#0" />
-            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
-          </folding>
+          <caret line="240" lean-forward="true" selection-start-line="240" selection-end-line="240" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
-          <caret line="58" column="28" lean-forward="true" selection-start-line="58" selection-start-column="28" selection-end-line="58" selection-end-column="28" />
-          <folding>
-            <element signature="method#addTempHumData#0;class#PgTempHumRs#0" />
-          </folding>
+        <state relative-caret-position="340">
+          <caret line="148" column="34" selection-start-line="148" selection-start-column="34" selection-end-line="148" selection-end-column="34" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
+        <state relative-caret-position="458">
+          <caret line="99" column="35" selection-start-line="99" selection-start-column="35" selection-end-line="99" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+        <state relative-caret-position="384">
+          <caret line="145" column="32" lean-forward="true" selection-start-line="145" selection-start-column="32" selection-end-line="145" selection-end-column="32" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="414">
-          <caret line="22" column="46" lean-forward="true" selection-start-line="22" selection-start-column="46" selection-end-line="22" selection-end-column="46" />
-        </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="396">
-          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" column="83" selection-start-line="11" selection-start-column="83" selection-end-line="11" selection-end-column="83" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="26">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
-          <folding>
-            <element signature="method#getPgInPgStatusByPerson#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNumByName#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNum#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPersonListByDay#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPgStatusByPgInPgPerson#0;class#PgInPgStatusManager#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="44">
-          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-12">
-          <caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="87" lean-forward="true" selection-start-line="87" selection-end-line="87" />
-          <folding>
-            <element signature="method#getConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#addConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#deleteConstructionType#0;class#PgConstructionTypeRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
-          <folding>
-            <element signature="method#getConstructionTypeByType#0;class#PgConstructionTypeManager#0" />
-            <element signature="method#getAllConstructionTypeDto#0;class#PgConstructionTypeManager#0" />
-          </folding>
-        </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="145">
-          <caret line="258" column="9" lean-forward="true" selection-start-line="258" selection-start-column="9" selection-end-line="258" selection-end-column="9" />
-          <folding>
-            <element signature="method#getMonthInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayInPgStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgOverViewRs#0" />
-            <element signature="method#getAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getMonthAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayAlarmStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgOverViewRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="103">
-          <caret line="105" column="50" lean-forward="true" selection-start-line="105" selection-start-column="50" selection-end-line="105" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateBasicDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="99">
-          <caret line="125" selection-start-line="125" selection-end-line="125" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="190">
-          <caret line="24" column="35" lean-forward="true" selection-start-line="24" selection-start-column="35" selection-end-line="24" selection-end-column="35" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="436">
-          <caret line="24" lean-forward="true" selection-start-line="24" selection-end-line="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" lean-forward="true" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="300">
-          <caret line="34" column="31" lean-forward="true" selection-start-line="34" selection-start-column="31" selection-end-line="34" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="42" column="13" lean-forward="true" selection-start-line="42" selection-start-column="13" selection-end-line="42" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="120" column="72" lean-forward="true" selection-start-line="120" selection-start-column="72" selection-end-line="120" selection-end-column="72" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="293">
-          <caret line="58" column="73" lean-forward="true" selection-start-line="58" selection-start-column="73" selection-end-line="58" selection-end-column="73" />
-          <folding>
-            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
-            <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
-          </folding>
-        </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="307">
-          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
+        <state relative-caret-position="758">
+          <caret line="130" column="5" lean-forward="true" selection-start-line="130" selection-start-column="5" selection-end-line="130" selection-end-column="5" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1170">
-          <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
+        <state relative-caret-position="494">
+          <caret line="86" column="62" lean-forward="true" selection-start-line="86" selection-start-column="62" selection-end-line="86" selection-end-column="62" />
           <folding>
-            <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-            <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+            <element signature="method#getAllDevice#0;class#PgDeviceManager#0" />
+            <element signature="method#getAllDev#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="195" column="28" lean-forward="true" selection-start-line="195" selection-start-column="28" selection-end-line="195" selection-end-column="28" />
+        <state relative-caret-position="166">
+          <caret line="174" column="13" lean-forward="true" selection-start-line="174" selection-start-column="13" selection-end-line="174" selection-end-column="13" />
           <folding>
-            <element signature="method#getAlarmByTypeAndTime#0;class#PgAlarmManager#0" />
-            <element signature="method#getAlarmNum#0;class#PgAlarmManager#0" />
             <element signature="method#getDayAlarmStatistic#0;class#PgAlarmManager#0" />
+            <element signature="method#getAlarmList#0;class#PgAlarmManager#0" />
             <element signature="method#createDTO#0;class#PgAlarmManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="364">
+          <caret line="46" column="56" lean-forward="true" selection-start-line="46" selection-start-column="56" selection-end-line="46" selection-end-column="56" />
+          <folding>
+            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
+            <element signature="method#getPgDev#0;class#PgDeviceRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
+            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+        <state relative-caret-position="396">
+          <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
           <folding>
             <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
             <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -1365,52 +1331,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="239">
-          <caret line="21" column="33" lean-forward="true" selection-start-line="21" selection-start-column="33" selection-end-line="21" selection-end-column="33" />
-        </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="352">
-          <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-        </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="99">
-          <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-          </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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-          <folding>
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-            <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>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
index c436c93..e913155 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
@@ -132,7 +132,10 @@
             this.setAlarmType("");
         else
             this.setAlarmType(pgAlarm.getAlarmTypeId().getAlarmType());
-        this.setAlarmValue(pgAlarm.getAlarmValue());
+        if(pgAlarm.getAlarmValue()==null)
+            this.setAlarmValue("");
+        else
+            this.setAlarmValue(pgAlarm.getAlarmValue());
         if (pgAlarm.getAlarmDate() != null)
             this.setAlarmDate(sdf.format(pgAlarm.getAlarmDate()));
         else
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
index a43965c..565cb41 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -159,11 +159,21 @@
     }
 
     //获取历史报警消息列表
-    public List<PgAlarmDto> getAllAlarm(String alarmType,String startDay,String endDay,String isNew,int page,int rows) {
-        try {
+    public  Map<String, Object> getAllAlarm(String alarmType,String partition,String startDay,String endDay,String isNew,int page,int rows) {
 
+        Map<String, Object> resultMap = new HashMap<>();
+        String msg="";
+
+        try {
             Criteria criteria = createCriteria(PgAlarm.class);
 
+            if (StringUtils.isNotBlank(partition)) {
+                DetachedCriteria inCriteria = DetachedCriteria.forClass(PgDevice.class);
+                inCriteria.add(Restrictions.eq("partition", partition));
+                inCriteria.setProjection(Property.forName("id"));
+                criteria.add(Property.forName("alarmDevId").in(inCriteria));
+            }
+
             if (StringUtils.isNotBlank(alarmType)&&!alarmType.contains("全部")&&pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
                 criteria.add(Restrictions.eq("alarmTypeId", pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)));
 
@@ -190,8 +200,16 @@
             for (PgAlarm pgAlarm : pgAlarmList) {
                 pgAlarmDtoList.add(new PgAlarmDto(pgAlarm));
             }
-
-            return pgAlarmDtoList;
+            if(pgAlarmDtoList==null||pgAlarmDtoList.size()==0) {
+                resultMap.put("msg", "没有报警信息");
+                resultMap.put("code","0");
+            }else {
+                resultMap.put("code","200");
+                resultMap.put("msg", "报警信息获取成功");
+            }
+            resultMap.put("count",pg.getTotalCount());
+            resultMap.put("result",pgAlarmDtoList);
+            return resultMap;
         }
         catch(Exception ex){
             ex.printStackTrace();
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index 7547560..654f49e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -24,11 +24,11 @@
 
         Criteria criteria = createCriteria(PgDevice.class);
 
-        if(road!=null)
+        if(StringUtils.isNotBlank(road))
             criteria.add(Restrictions.eq("road",road));
-        if(partition!=null)
+        if(StringUtils.isNotBlank(partition))
             criteria.add(Restrictions.eq("partition",partition));
-        if(devType!=null)
+        if(StringUtils.isNotBlank(devType))
             criteria.add(Restrictions.eq("devType",devType));
 
         criteria.add(Restrictions.eq("active", 1));
@@ -43,6 +43,29 @@
         return pgDeviceDtoList;
     }
 
+    public List<PgDeviceDto> getAllDev(String road,String partition,String devType) {
+
+        Criteria criteria = createCriteria(PgDevice.class);
+
+        if(StringUtils.isNotBlank(road))
+            criteria.add(Restrictions.eq("road",road));
+        if(StringUtils.isNotBlank(partition))
+            criteria.add(Restrictions.eq("partition",partition));
+        if(StringUtils.isNotBlank(devType))
+            criteria.add(Restrictions.like("devType","%"+devType+"%"));
+
+        criteria.add(Restrictions.eq("active", 1));
+        criteria.addOrder(Order.desc("id"));
+        List<PgDevice> pgDeviceList = criteria.list();
+
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
+        for (PgDevice pgDevice : pgDeviceList) {
+            pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
+        }
+
+        return pgDeviceDtoList;
+    }
+
     //根据名字获取当前设备
     public PgDevice getDeviceByAssetCode(String assetCode) {
         Criteria criteria=createCriteria(PgDevice.class);
@@ -56,9 +79,9 @@
     }
 
     //根据类型获取设备列表
-    public List<PgDeviceDto> getDeviceByDevTypee(String devType) {
+    public List<PgDeviceDto> getDeviceByDevType(String devType) {
         Criteria criteria=createCriteria(PgDevice.class);
-        criteria.add(Restrictions.eq("devType",devType));
+        criteria.add(Restrictions.like("devType","%"+devType+"%"));
 
         List<PgDevice> pgDeviceList=criteria.list();
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
@@ -106,7 +129,7 @@
         criteria.add(Restrictions.eq("partition",partition));
 
         List<PgDevice> pgDeviceList=criteria.list();
-        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<PgDeviceDto>();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
 
         for (PgDevice pgDevice : pgDeviceList) {
             pgDeviceDtoList.add(new PgDeviceDto(pgDevice));

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 25ded8a..283d7ab 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,20 +7,56 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" 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/construction/manager/PgCsDocumentManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/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/manager/PgAlarmManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/~$说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/~$说明20191207.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.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$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/接口说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明20191207.docx" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
@@ -51,7 +87,7 @@
         <counts>
           <entry key="class" value="4" />
           <entry key="iml" value="2" />
-          <entry key="java" value="707" />
+          <entry key="java" value="820" />
           <entry key="properties" value="14" />
           <entry key="xml" value="7" />
         </counts>
@@ -60,7 +96,7 @@
         <counts>
           <entry key="CLASS" value="4" />
           <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="707" />
+          <entry key="JAVA" value="820" />
           <entry key="Properties" value="14" />
           <entry key="XML" value="7" />
         </counts>
@@ -68,32 +104,32 @@
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
           <entry key="dummy" value="38" />
-          <entry key="java" value="30161" />
+          <entry key="java" value="40859" />
           <entry key="properties" value="100" />
-          <entry key="txt" value="176" />
+          <entry key="txt" value="186" />
           <entry key="xml" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="30161" />
-          <entry key="PLAIN_TEXT" value="214" />
+          <entry key="JAVA" value="40859" />
+          <entry key="PLAIN_TEXT" value="224" />
           <entry key="Properties" value="100" />
           <entry key="XML" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="48" />
+          <entry key="project.closed" value="51" />
           <entry key="project.open.time.1" value="5" />
           <entry key="project.open.time.12" value="2" />
           <entry key="project.open.time.13" value="1" />
           <entry key="project.open.time.15" value="1" />
           <entry key="project.open.time.16" value="1" />
           <entry key="project.open.time.17" value="1" />
-          <entry key="project.open.time.2" value="1" />
+          <entry key="project.open.time.2" value="2" />
           <entry key="project.open.time.20" value="1" />
-          <entry key="project.open.time.23" value="1" />
+          <entry key="project.open.time.23" value="2" />
           <entry key="project.open.time.24" value="2" />
           <entry key="project.open.time.251" value="1" />
           <entry key="project.open.time.27" value="2" />
@@ -106,8 +142,8 @@
           <entry key="project.open.time.36" value="1" />
           <entry key="project.open.time.37" value="1" />
           <entry key="project.open.time.39" value="2" />
-          <entry key="project.open.time.4" value="2" />
-          <entry key="project.open.time.40" value="1" />
+          <entry key="project.open.time.4" value="3" />
+          <entry key="project.open.time.40" value="2" />
           <entry key="project.open.time.41" value="2" />
           <entry key="project.open.time.42" value="2" />
           <entry key="project.open.time.43" value="2" />
@@ -122,23 +158,25 @@
           <entry key="project.open.time.6" value="3" />
           <entry key="project.open.time.63" value="2" />
           <entry key="project.open.time.64" value="1" />
+          <entry key="project.open.time.66" value="1" />
           <entry key="project.open.time.71" value="2" />
+          <entry key="project.open.time.74" value="1" />
           <entry key="project.open.time.76" value="1" />
           <entry key="project.open.time.8" value="2" />
           <entry key="project.open.time.9" value="1" />
           <entry key="project.open.time.97" value="1" />
-          <entry key="project.opened" value="78" />
+          <entry key="project.opened" value="84" />
         </counts>
       </usages-collector>
     </session>
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+            <state relative-caret-position="396">
+              <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
               <folding>
                 <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
                 <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -147,73 +185,6 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <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="99">
-              <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-              <folding>
-                <element signature="imports" expanded="true" />
-                <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-1170">
-              <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state>
-              <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
-              <folding>
-                <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-                <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="true">
-        <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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-              <folding>
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-                <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>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <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="352">
-              <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -225,18 +196,9 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>inCriteria</find>
-      <find>getPgPlanResulList</find>
-      <find>getPileAcuListByPileAcuStr</find>
-      <find>distinct</find>
-      <find>order</find>
-      <find>canPlanLine</find>
-      <find>isExistLine</find>
-      <find>getPlanResult</find>
       <find>pgPipeLine</find>
       <find>getPipeLineBylineName</find>
       <find>StringU</find>
-      <find>getAllAlarm</find>
       <find>getAlarmList</find>
       <find>getPgInPersonListByDay</find>
       <find>getDayInPgStatistic</find>
@@ -254,7 +216,16 @@
       <find>getPgContructionByNameOrType</find>
       <find>&quot;&quot;,&quot;&quot;,</find>
       <find>getPgContructionDtoByNameOrType</find>
+      <find>addConstruction</find>
+      <find>getPgLineAcuHole</find>
+      <find>getPlanResult</find>
       <find>getConstruction</find>
+      <find>addPipeLine</find>
+      <find>未找到入廊数据</find>
+      <find>getCurrentHoleByAcu</find>
+      <find>getAllAlarm</find>
+      <find>getPgDeviceDtoListByPartition</find>
+      <find>getPgDeviceByDevType</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -263,57 +234,57 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlan.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileHoleManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/planData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/PlanData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
       </list>
     </option>
   </component>
@@ -359,7 +330,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -421,53 +391,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="dto" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="manager" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -479,29 +402,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="rs" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -516,6 +416,7 @@
         </subPane>
       </pane>
       <pane id="Scope" />
+      <pane id="PackagesPane" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -710,7 +611,13 @@
       <workItem from="1574902733573" duration="1829000" />
       <workItem from="1574998240004" duration="7016000" />
       <workItem from="1575247959683" duration="6997000" />
-      <workItem from="1575704345590" duration="40473000" />
+      <workItem from="1575704345590" duration="69381000" />
+      <workItem from="1575869479666" duration="721000" />
+      <workItem from="1575947104878" duration="6101000" />
+      <workItem from="1576128264436" duration="3347000" />
+      <workItem from="1576208571543" duration="22000" />
+      <workItem from="1576227513917" duration="862000" />
+      <workItem from="1576293721220" duration="18246000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -817,11 +724,18 @@
       <option name="project" value="LOCAL" />
       <updated>1575775489149</updated>
     </task>
-    <option name="localTasksCounter" value="16" />
+    <task id="LOCAL-00016" summary="整改施工信息">
+      <created>1575791780774</created>
+      <option name="number" value="00016" />
+      <option name="presentableId" value="LOCAL-00016" />
+      <option name="project" value="LOCAL" />
+      <updated>1575791780774</updated>
+    </task>
+    <option name="localTasksCounter" value="17" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="452131000" />
+    <option name="totallyTimeSpent" value="510338000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -834,9 +748,8 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
-    <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.24205749" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2647504" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -847,7 +760,7 @@
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.3295082" />
       <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.4819672" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.65737706" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.3295082" />
@@ -939,7 +852,8 @@
     <MESSAGE value="重新设计智能规划部分" />
     <MESSAGE value="完成智能规划对接" />
     <MESSAGE value="修改报警统计" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改报警统计" />
+    <MESSAGE value="整改施工信息" />
+    <option name="LAST_COMMIT_MESSAGE" value="整改施工信息" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -951,16 +865,10 @@
           <option name="timeStamp" value="3" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java</url>
-          <line>69</line>
+          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java</url>
+          <line>40</line>
           <properties />
-          <option name="timeStamp" value="21" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java</url>
-          <line>96</line>
-          <properties />
-          <option name="timeStamp" value="38" />
+          <option name="timeStamp" value="122" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
@@ -970,394 +878,452 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <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="2068">
-          <caret line="154" column="35" selection-start-line="154" selection-start-column="35" selection-end-line="154" selection-end-column="35" />
-        </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="3300">
-          <caret line="297" column="22" selection-start-line="297" selection-start-column="22" selection-end-line="297" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/StringUtils.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
-          <caret line="13" column="48" lean-forward="true" selection-start-line="13" selection-start-column="48" selection-end-line="13" selection-end-column="48" />
+          <caret line="11" column="5" selection-start-line="11" selection-start-column="5" selection-end-line="11" selection-end-column="5" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="78" lean-forward="true" selection-start-line="78" selection-end-line="78" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="616">
-          <caret line="41" column="1" selection-start-line="41" selection-start-column="1" selection-end-line="41" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="110">
-          <caret line="12" column="23" selection-start-line="12" selection-start-column="23" selection-end-line="12" selection-end-column="23" />
+        <state relative-caret-position="516">
+          <caret line="114" column="12" selection-start-line="114" selection-start-column="12" selection-end-line="114" selection-end-column="12" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="164">
-          <caret line="56" lean-forward="true" selection-start-line="56" selection-end-line="56" />
+        <state relative-caret-position="418">
+          <caret line="33" column="44" selection-start-line="33" selection-start-column="44" selection-end-line="33" selection-end-column="44" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="258">
-          <caret line="27" column="12" lean-forward="true" selection-start-line="27" selection-start-column="12" selection-end-line="27" selection-end-column="12" />
+        <state relative-caret-position="132">
+          <caret line="11" column="20" lean-forward="true" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="20" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.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="-12">
-          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        <state relative-caret-position="516">
+          <caret line="142" column="54" selection-start-line="142" selection-start-column="54" selection-end-line="142" selection-end-column="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="858">
-          <caret line="55" column="27" lean-forward="true" selection-start-line="55" selection-start-column="27" selection-end-line="55" selection-end-column="27" />
+        <state relative-caret-position="66">
+          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="58">
+          <caret line="18" column="28" selection-start-line="18" selection-start-column="19" selection-end-line="18" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="305">
+          <caret line="24" column="31" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="714">
+          <caret line="58" column="5" lean-forward="true" selection-start-line="58" selection-start-column="5" selection-end-line="58" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="924">
+          <caret line="134" column="92" selection-start-line="134" selection-start-column="92" selection-end-line="134" selection-end-column="92" />
+          <folding>
+            <element signature="method#linkDevice#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkPartitionCamera#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkReservePlan#0;class#PgAlarmLinkRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1066">
+          <caret line="90" lean-forward="true" selection-start-line="90" selection-end-line="90" />
+          <folding>
+            <element signature="method#getTjResultByAlarmType#0;class#PgAlarmTjRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="946">
+          <caret line="148" column="11" lean-forward="true" selection-start-line="148" selection-start-column="11" selection-end-line="148" selection-end-column="11" />
+          <folding>
+            <element signature="method#getAlarmTypeList#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#addAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#editAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#deleteAlarmType#0;class#PgAlarmTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="208">
+          <caret line="46" column="23" lean-forward="true" selection-start-line="46" selection-start-column="23" selection-end-line="46" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="113" column="9" lean-forward="true" selection-start-line="113" selection-start-column="9" selection-end-line="113" selection-end-column="9" />
+          <folding>
+            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
+            <element signature="method#getNewestCh4InfoByDev#0;class#PgCh4Rs#0" />
+            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="145" column="6" lean-forward="true" selection-start-line="145" selection-start-column="6" selection-end-line="145" selection-end-column="6" />
+          <folding>
+            <element signature="method#addAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#editAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#deleteAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#getAuthorityList#0;class#PgAuthorityRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="58" column="1" lean-forward="true" selection-start-line="58" selection-start-column="1" selection-end-line="58" selection-end-column="1" />
+          <folding>
+            <element signature="method#getPgAssetPlanList#0;class#PgAssetPlanRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="370">
+          <caret line="371" column="66" selection-start-line="371" selection-start-column="66" selection-end-line="371" selection-end-column="66" />
+          <folding>
+            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#searchConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionDev#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="139" column="13" lean-forward="true" selection-start-line="139" selection-start-column="13" selection-end-line="139" selection-end-column="13" />
+          <folding>
+            <element signature="method#getCoInfoByDevAndDate#0;class#PgCoRs#0" />
+            <element signature="method#getNewestCoInfoByDev#0;class#PgCoRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="540">
+          <caret line="223" column="5" lean-forward="true" selection-start-line="223" selection-start-column="5" selection-end-line="223" selection-end-column="5" />
+          <folding>
+            <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="682">
+          <caret line="100" lean-forward="true" selection-start-line="100" selection-end-line="100" />
+          <folding>
+            <element signature="method#getDeviceTpeyList#0;class#PgDeviceTypeRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="377">
+          <caret line="225" column="35" selection-start-line="225" selection-start-column="35" selection-end-line="225" selection-end-column="35" />
+          <folding>
+            <element signature="method#addEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#addEquipment#1;class#PgEquipmentRs#0" />
+            <element signature="method#getEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#deleteEquipment#0;class#PgEquipmentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="406">
+          <caret line="109" lean-forward="true" selection-start-line="109" selection-end-line="109" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="154">
+          <caret line="28" column="19" selection-start-line="28" selection-start-column="19" selection-end-line="28" selection-end-column="19" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="748">
-          <caret line="49" column="5" lean-forward="true" selection-start-line="49" selection-start-column="5" selection-end-line="49" selection-end-column="5" />
+        <state relative-caret-position="296">
+          <caret line="161" column="35" selection-start-line="161" selection-start-column="35" selection-end-line="161" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="384">
+          <caret line="99" column="5" lean-forward="true" selection-start-line="99" selection-start-column="5" selection-end-line="99" selection-end-column="5" />
+        </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="362">
+          <caret line="340" column="35" selection-start-line="340" selection-start-column="35" selection-end-line="340" selection-end-column="35" />
+          <folding>
+            <element signature="method#addInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPersonInPg#0;class#PgInPgPersonRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-606">
+          <caret line="76" column="20" lean-forward="true" selection-start-line="76" selection-start-column="20" selection-end-line="76" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="65" column="35" selection-start-line="65" selection-start-column="35" selection-end-line="65" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="101" column="35" selection-start-line="101" selection-start-column="35" selection-end-line="101" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="84" column="35" selection-start-line="84" selection-start-column="35" selection-end-line="84" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="59" lean-forward="true" selection-start-line="59" selection-end-line="59" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="60" column="1" lean-forward="true" selection-start-line="60" selection-start-column="1" selection-end-line="60" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="145" column="35" selection-start-line="145" selection-start-column="35" selection-end-line="145" selection-end-column="35" />
+        </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="274">
+          <caret line="350" column="35" selection-start-line="350" selection-start-column="35" selection-end-line="350" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="121" column="39" selection-start-line="121" selection-start-column="39" selection-end-line="121" selection-end-column="39" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="28" column="8" lean-forward="true" selection-start-line="28" selection-start-column="8" selection-end-line="28" selection-end-column="8" />
+        <state relative-caret-position="340">
+          <caret line="103" selection-start-line="103" selection-end-line="103" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="226" column="35" selection-start-line="226" selection-start-column="35" selection-end-line="226" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="203" column="35" selection-start-line="203" selection-start-column="35" selection-end-line="203" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="241" column="35" selection-start-line="241" selection-start-column="35" selection-end-line="241" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="225" column="1" lean-forward="true" selection-start-line="225" selection-start-column="1" selection-end-line="225" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="176" column="5" lean-forward="true" selection-start-line="176" selection-start-column="5" selection-end-line="176" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="178" column="35" lean-forward="true" selection-start-line="178" selection-start-column="35" selection-end-line="178" selection-end-column="35" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="516">
-          <caret line="94" column="53" selection-start-line="94" selection-start-column="53" selection-end-line="94" selection-end-column="53" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="814">
-          <caret line="52" column="9" lean-forward="true" selection-start-line="52" selection-start-column="9" selection-end-line="52" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="182">
-          <caret line="58" column="12" lean-forward="true" selection-start-line="58" selection-start-column="12" selection-end-line="58" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="34" lean-forward="true" selection-start-line="34" selection-end-line="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="32" lean-forward="true" selection-start-line="32" selection-end-line="32" />
-          <folding>
-            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
-            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="185">
-          <caret line="63" column="13" selection-start-line="63" selection-start-column="13" selection-end-line="63" selection-end-column="13" />
-          <folding>
-            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
-            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
-            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="e#6319#6324#0" />
-            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
-          </folding>
+          <caret line="240" lean-forward="true" selection-start-line="240" selection-end-line="240" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
-          <caret line="58" column="28" lean-forward="true" selection-start-line="58" selection-start-column="28" selection-end-line="58" selection-end-column="28" />
-          <folding>
-            <element signature="method#addTempHumData#0;class#PgTempHumRs#0" />
-          </folding>
+        <state relative-caret-position="340">
+          <caret line="148" column="34" selection-start-line="148" selection-start-column="34" selection-end-line="148" selection-end-column="34" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
+        <state relative-caret-position="458">
+          <caret line="99" column="35" selection-start-line="99" selection-start-column="35" selection-end-line="99" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+        <state relative-caret-position="384">
+          <caret line="145" column="32" lean-forward="true" selection-start-line="145" selection-start-column="32" selection-end-line="145" selection-end-column="32" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="414">
-          <caret line="22" column="46" lean-forward="true" selection-start-line="22" selection-start-column="46" selection-end-line="22" selection-end-column="46" />
-        </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="396">
-          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" column="83" selection-start-line="11" selection-start-column="83" selection-end-line="11" selection-end-column="83" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="26">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
-          <folding>
-            <element signature="method#getPgInPgStatusByPerson#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNumByName#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNum#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPersonListByDay#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPgStatusByPgInPgPerson#0;class#PgInPgStatusManager#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="44">
-          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-12">
-          <caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="87" lean-forward="true" selection-start-line="87" selection-end-line="87" />
-          <folding>
-            <element signature="method#getConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#addConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#deleteConstructionType#0;class#PgConstructionTypeRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
-          <folding>
-            <element signature="method#getConstructionTypeByType#0;class#PgConstructionTypeManager#0" />
-            <element signature="method#getAllConstructionTypeDto#0;class#PgConstructionTypeManager#0" />
-          </folding>
-        </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="145">
-          <caret line="258" column="9" lean-forward="true" selection-start-line="258" selection-start-column="9" selection-end-line="258" selection-end-column="9" />
-          <folding>
-            <element signature="method#getMonthInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayInPgStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgOverViewRs#0" />
-            <element signature="method#getAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getMonthAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayAlarmStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgOverViewRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="103">
-          <caret line="105" column="50" lean-forward="true" selection-start-line="105" selection-start-column="50" selection-end-line="105" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateBasicDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="99">
-          <caret line="125" selection-start-line="125" selection-end-line="125" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="190">
-          <caret line="24" column="35" lean-forward="true" selection-start-line="24" selection-start-column="35" selection-end-line="24" selection-end-column="35" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="436">
-          <caret line="24" lean-forward="true" selection-start-line="24" selection-end-line="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" lean-forward="true" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="300">
-          <caret line="34" column="31" lean-forward="true" selection-start-line="34" selection-start-column="31" selection-end-line="34" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="42" column="13" lean-forward="true" selection-start-line="42" selection-start-column="13" selection-end-line="42" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="120" column="72" lean-forward="true" selection-start-line="120" selection-start-column="72" selection-end-line="120" selection-end-column="72" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="293">
-          <caret line="58" column="73" lean-forward="true" selection-start-line="58" selection-start-column="73" selection-end-line="58" selection-end-column="73" />
-          <folding>
-            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
-            <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
-          </folding>
-        </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="307">
-          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
+        <state relative-caret-position="758">
+          <caret line="130" column="5" lean-forward="true" selection-start-line="130" selection-start-column="5" selection-end-line="130" selection-end-column="5" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1170">
-          <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
+        <state relative-caret-position="494">
+          <caret line="86" column="62" lean-forward="true" selection-start-line="86" selection-start-column="62" selection-end-line="86" selection-end-column="62" />
           <folding>
-            <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-            <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+            <element signature="method#getAllDevice#0;class#PgDeviceManager#0" />
+            <element signature="method#getAllDev#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="195" column="28" lean-forward="true" selection-start-line="195" selection-start-column="28" selection-end-line="195" selection-end-column="28" />
+        <state relative-caret-position="166">
+          <caret line="174" column="13" lean-forward="true" selection-start-line="174" selection-start-column="13" selection-end-line="174" selection-end-column="13" />
           <folding>
-            <element signature="method#getAlarmByTypeAndTime#0;class#PgAlarmManager#0" />
-            <element signature="method#getAlarmNum#0;class#PgAlarmManager#0" />
             <element signature="method#getDayAlarmStatistic#0;class#PgAlarmManager#0" />
+            <element signature="method#getAlarmList#0;class#PgAlarmManager#0" />
             <element signature="method#createDTO#0;class#PgAlarmManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="364">
+          <caret line="46" column="56" lean-forward="true" selection-start-line="46" selection-start-column="56" selection-end-line="46" selection-end-column="56" />
+          <folding>
+            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
+            <element signature="method#getPgDev#0;class#PgDeviceRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
+            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+        <state relative-caret-position="396">
+          <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
           <folding>
             <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
             <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -1365,52 +1331,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="239">
-          <caret line="21" column="33" lean-forward="true" selection-start-line="21" selection-start-column="33" selection-end-line="21" selection-end-column="33" />
-        </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="352">
-          <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-        </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="99">
-          <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-          </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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-          <folding>
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-            <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>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
index c436c93..e913155 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
@@ -132,7 +132,10 @@
             this.setAlarmType("");
         else
             this.setAlarmType(pgAlarm.getAlarmTypeId().getAlarmType());
-        this.setAlarmValue(pgAlarm.getAlarmValue());
+        if(pgAlarm.getAlarmValue()==null)
+            this.setAlarmValue("");
+        else
+            this.setAlarmValue(pgAlarm.getAlarmValue());
         if (pgAlarm.getAlarmDate() != null)
             this.setAlarmDate(sdf.format(pgAlarm.getAlarmDate()));
         else
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
index a43965c..565cb41 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -159,11 +159,21 @@
     }
 
     //获取历史报警消息列表
-    public List<PgAlarmDto> getAllAlarm(String alarmType,String startDay,String endDay,String isNew,int page,int rows) {
-        try {
+    public  Map<String, Object> getAllAlarm(String alarmType,String partition,String startDay,String endDay,String isNew,int page,int rows) {
 
+        Map<String, Object> resultMap = new HashMap<>();
+        String msg="";
+
+        try {
             Criteria criteria = createCriteria(PgAlarm.class);
 
+            if (StringUtils.isNotBlank(partition)) {
+                DetachedCriteria inCriteria = DetachedCriteria.forClass(PgDevice.class);
+                inCriteria.add(Restrictions.eq("partition", partition));
+                inCriteria.setProjection(Property.forName("id"));
+                criteria.add(Property.forName("alarmDevId").in(inCriteria));
+            }
+
             if (StringUtils.isNotBlank(alarmType)&&!alarmType.contains("全部")&&pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
                 criteria.add(Restrictions.eq("alarmTypeId", pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)));
 
@@ -190,8 +200,16 @@
             for (PgAlarm pgAlarm : pgAlarmList) {
                 pgAlarmDtoList.add(new PgAlarmDto(pgAlarm));
             }
-
-            return pgAlarmDtoList;
+            if(pgAlarmDtoList==null||pgAlarmDtoList.size()==0) {
+                resultMap.put("msg", "没有报警信息");
+                resultMap.put("code","0");
+            }else {
+                resultMap.put("code","200");
+                resultMap.put("msg", "报警信息获取成功");
+            }
+            resultMap.put("count",pg.getTotalCount());
+            resultMap.put("result",pgAlarmDtoList);
+            return resultMap;
         }
         catch(Exception ex){
             ex.printStackTrace();
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index 7547560..654f49e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -24,11 +24,11 @@
 
         Criteria criteria = createCriteria(PgDevice.class);
 
-        if(road!=null)
+        if(StringUtils.isNotBlank(road))
             criteria.add(Restrictions.eq("road",road));
-        if(partition!=null)
+        if(StringUtils.isNotBlank(partition))
             criteria.add(Restrictions.eq("partition",partition));
-        if(devType!=null)
+        if(StringUtils.isNotBlank(devType))
             criteria.add(Restrictions.eq("devType",devType));
 
         criteria.add(Restrictions.eq("active", 1));
@@ -43,6 +43,29 @@
         return pgDeviceDtoList;
     }
 
+    public List<PgDeviceDto> getAllDev(String road,String partition,String devType) {
+
+        Criteria criteria = createCriteria(PgDevice.class);
+
+        if(StringUtils.isNotBlank(road))
+            criteria.add(Restrictions.eq("road",road));
+        if(StringUtils.isNotBlank(partition))
+            criteria.add(Restrictions.eq("partition",partition));
+        if(StringUtils.isNotBlank(devType))
+            criteria.add(Restrictions.like("devType","%"+devType+"%"));
+
+        criteria.add(Restrictions.eq("active", 1));
+        criteria.addOrder(Order.desc("id"));
+        List<PgDevice> pgDeviceList = criteria.list();
+
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
+        for (PgDevice pgDevice : pgDeviceList) {
+            pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
+        }
+
+        return pgDeviceDtoList;
+    }
+
     //根据名字获取当前设备
     public PgDevice getDeviceByAssetCode(String assetCode) {
         Criteria criteria=createCriteria(PgDevice.class);
@@ -56,9 +79,9 @@
     }
 
     //根据类型获取设备列表
-    public List<PgDeviceDto> getDeviceByDevTypee(String devType) {
+    public List<PgDeviceDto> getDeviceByDevType(String devType) {
         Criteria criteria=createCriteria(PgDevice.class);
-        criteria.add(Restrictions.eq("devType",devType));
+        criteria.add(Restrictions.like("devType","%"+devType+"%"));
 
         List<PgDevice> pgDeviceList=criteria.list();
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
@@ -106,7 +129,7 @@
         criteria.add(Restrictions.eq("partition",partition));
 
         List<PgDevice> pgDeviceList=criteria.list();
-        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<PgDeviceDto>();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
 
         for (PgDevice pgDevice : pgDeviceList) {
             pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
index 3a3bccd..595730e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
@@ -1,10 +1,13 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.devTable.domain.PgAlarmType;
 import com.casic.PgInterface.devTable.domain.PgPartition;
 import com.casic.PgInterface.devTable.domain.PgRoad;
 import com.casic.PgInterface.devTable.domain.PipeGallery;
 import com.casic.PgInterface.devTable.dto.PgPartitionDto;
+import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
@@ -12,7 +15,9 @@
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Created by yxw on 2017/11/4.
@@ -21,7 +26,8 @@
 public class PgPartitionManager extends HibernateEntityDao<PgPartition> {
 
     @Resource
-    PgRoadManager pgRoadManager;
+    private PgRoadManager pgRoadManager;
+
 
     public PgPartition getPartitionByParName(String parName) {
         Criteria criteria = getSession().createCriteria(PgPartition.class);
@@ -99,4 +105,5 @@
         return pgPartitionDtoList;
     }
 
+
 }
\ No newline at end of file

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 25ded8a..283d7ab 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,20 +7,56 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" 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/construction/manager/PgCsDocumentManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/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/manager/PgAlarmManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/~$说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/~$说明20191207.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.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$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/接口说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明20191207.docx" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
@@ -51,7 +87,7 @@
         <counts>
           <entry key="class" value="4" />
           <entry key="iml" value="2" />
-          <entry key="java" value="707" />
+          <entry key="java" value="820" />
           <entry key="properties" value="14" />
           <entry key="xml" value="7" />
         </counts>
@@ -60,7 +96,7 @@
         <counts>
           <entry key="CLASS" value="4" />
           <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="707" />
+          <entry key="JAVA" value="820" />
           <entry key="Properties" value="14" />
           <entry key="XML" value="7" />
         </counts>
@@ -68,32 +104,32 @@
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
           <entry key="dummy" value="38" />
-          <entry key="java" value="30161" />
+          <entry key="java" value="40859" />
           <entry key="properties" value="100" />
-          <entry key="txt" value="176" />
+          <entry key="txt" value="186" />
           <entry key="xml" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="30161" />
-          <entry key="PLAIN_TEXT" value="214" />
+          <entry key="JAVA" value="40859" />
+          <entry key="PLAIN_TEXT" value="224" />
           <entry key="Properties" value="100" />
           <entry key="XML" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="48" />
+          <entry key="project.closed" value="51" />
           <entry key="project.open.time.1" value="5" />
           <entry key="project.open.time.12" value="2" />
           <entry key="project.open.time.13" value="1" />
           <entry key="project.open.time.15" value="1" />
           <entry key="project.open.time.16" value="1" />
           <entry key="project.open.time.17" value="1" />
-          <entry key="project.open.time.2" value="1" />
+          <entry key="project.open.time.2" value="2" />
           <entry key="project.open.time.20" value="1" />
-          <entry key="project.open.time.23" value="1" />
+          <entry key="project.open.time.23" value="2" />
           <entry key="project.open.time.24" value="2" />
           <entry key="project.open.time.251" value="1" />
           <entry key="project.open.time.27" value="2" />
@@ -106,8 +142,8 @@
           <entry key="project.open.time.36" value="1" />
           <entry key="project.open.time.37" value="1" />
           <entry key="project.open.time.39" value="2" />
-          <entry key="project.open.time.4" value="2" />
-          <entry key="project.open.time.40" value="1" />
+          <entry key="project.open.time.4" value="3" />
+          <entry key="project.open.time.40" value="2" />
           <entry key="project.open.time.41" value="2" />
           <entry key="project.open.time.42" value="2" />
           <entry key="project.open.time.43" value="2" />
@@ -122,23 +158,25 @@
           <entry key="project.open.time.6" value="3" />
           <entry key="project.open.time.63" value="2" />
           <entry key="project.open.time.64" value="1" />
+          <entry key="project.open.time.66" value="1" />
           <entry key="project.open.time.71" value="2" />
+          <entry key="project.open.time.74" value="1" />
           <entry key="project.open.time.76" value="1" />
           <entry key="project.open.time.8" value="2" />
           <entry key="project.open.time.9" value="1" />
           <entry key="project.open.time.97" value="1" />
-          <entry key="project.opened" value="78" />
+          <entry key="project.opened" value="84" />
         </counts>
       </usages-collector>
     </session>
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+            <state relative-caret-position="396">
+              <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
               <folding>
                 <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
                 <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -147,73 +185,6 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <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="99">
-              <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-              <folding>
-                <element signature="imports" expanded="true" />
-                <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-1170">
-              <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state>
-              <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
-              <folding>
-                <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-                <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="true">
-        <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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-              <folding>
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-                <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>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <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="352">
-              <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -225,18 +196,9 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>inCriteria</find>
-      <find>getPgPlanResulList</find>
-      <find>getPileAcuListByPileAcuStr</find>
-      <find>distinct</find>
-      <find>order</find>
-      <find>canPlanLine</find>
-      <find>isExistLine</find>
-      <find>getPlanResult</find>
       <find>pgPipeLine</find>
       <find>getPipeLineBylineName</find>
       <find>StringU</find>
-      <find>getAllAlarm</find>
       <find>getAlarmList</find>
       <find>getPgInPersonListByDay</find>
       <find>getDayInPgStatistic</find>
@@ -254,7 +216,16 @@
       <find>getPgContructionByNameOrType</find>
       <find>&quot;&quot;,&quot;&quot;,</find>
       <find>getPgContructionDtoByNameOrType</find>
+      <find>addConstruction</find>
+      <find>getPgLineAcuHole</find>
+      <find>getPlanResult</find>
       <find>getConstruction</find>
+      <find>addPipeLine</find>
+      <find>未找到入廊数据</find>
+      <find>getCurrentHoleByAcu</find>
+      <find>getAllAlarm</find>
+      <find>getPgDeviceDtoListByPartition</find>
+      <find>getPgDeviceByDevType</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -263,57 +234,57 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlan.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileHoleManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/planData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/PlanData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
       </list>
     </option>
   </component>
@@ -359,7 +330,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -421,53 +391,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="dto" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="manager" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -479,29 +402,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="rs" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -516,6 +416,7 @@
         </subPane>
       </pane>
       <pane id="Scope" />
+      <pane id="PackagesPane" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -710,7 +611,13 @@
       <workItem from="1574902733573" duration="1829000" />
       <workItem from="1574998240004" duration="7016000" />
       <workItem from="1575247959683" duration="6997000" />
-      <workItem from="1575704345590" duration="40473000" />
+      <workItem from="1575704345590" duration="69381000" />
+      <workItem from="1575869479666" duration="721000" />
+      <workItem from="1575947104878" duration="6101000" />
+      <workItem from="1576128264436" duration="3347000" />
+      <workItem from="1576208571543" duration="22000" />
+      <workItem from="1576227513917" duration="862000" />
+      <workItem from="1576293721220" duration="18246000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -817,11 +724,18 @@
       <option name="project" value="LOCAL" />
       <updated>1575775489149</updated>
     </task>
-    <option name="localTasksCounter" value="16" />
+    <task id="LOCAL-00016" summary="整改施工信息">
+      <created>1575791780774</created>
+      <option name="number" value="00016" />
+      <option name="presentableId" value="LOCAL-00016" />
+      <option name="project" value="LOCAL" />
+      <updated>1575791780774</updated>
+    </task>
+    <option name="localTasksCounter" value="17" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="452131000" />
+    <option name="totallyTimeSpent" value="510338000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -834,9 +748,8 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
-    <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.24205749" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2647504" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -847,7 +760,7 @@
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.3295082" />
       <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.4819672" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.65737706" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.3295082" />
@@ -939,7 +852,8 @@
     <MESSAGE value="重新设计智能规划部分" />
     <MESSAGE value="完成智能规划对接" />
     <MESSAGE value="修改报警统计" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改报警统计" />
+    <MESSAGE value="整改施工信息" />
+    <option name="LAST_COMMIT_MESSAGE" value="整改施工信息" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -951,16 +865,10 @@
           <option name="timeStamp" value="3" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java</url>
-          <line>69</line>
+          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java</url>
+          <line>40</line>
           <properties />
-          <option name="timeStamp" value="21" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java</url>
-          <line>96</line>
-          <properties />
-          <option name="timeStamp" value="38" />
+          <option name="timeStamp" value="122" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
@@ -970,394 +878,452 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <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="2068">
-          <caret line="154" column="35" selection-start-line="154" selection-start-column="35" selection-end-line="154" selection-end-column="35" />
-        </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="3300">
-          <caret line="297" column="22" selection-start-line="297" selection-start-column="22" selection-end-line="297" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/StringUtils.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
-          <caret line="13" column="48" lean-forward="true" selection-start-line="13" selection-start-column="48" selection-end-line="13" selection-end-column="48" />
+          <caret line="11" column="5" selection-start-line="11" selection-start-column="5" selection-end-line="11" selection-end-column="5" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="78" lean-forward="true" selection-start-line="78" selection-end-line="78" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="616">
-          <caret line="41" column="1" selection-start-line="41" selection-start-column="1" selection-end-line="41" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="110">
-          <caret line="12" column="23" selection-start-line="12" selection-start-column="23" selection-end-line="12" selection-end-column="23" />
+        <state relative-caret-position="516">
+          <caret line="114" column="12" selection-start-line="114" selection-start-column="12" selection-end-line="114" selection-end-column="12" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="164">
-          <caret line="56" lean-forward="true" selection-start-line="56" selection-end-line="56" />
+        <state relative-caret-position="418">
+          <caret line="33" column="44" selection-start-line="33" selection-start-column="44" selection-end-line="33" selection-end-column="44" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="258">
-          <caret line="27" column="12" lean-forward="true" selection-start-line="27" selection-start-column="12" selection-end-line="27" selection-end-column="12" />
+        <state relative-caret-position="132">
+          <caret line="11" column="20" lean-forward="true" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="20" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.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="-12">
-          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        <state relative-caret-position="516">
+          <caret line="142" column="54" selection-start-line="142" selection-start-column="54" selection-end-line="142" selection-end-column="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="858">
-          <caret line="55" column="27" lean-forward="true" selection-start-line="55" selection-start-column="27" selection-end-line="55" selection-end-column="27" />
+        <state relative-caret-position="66">
+          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="58">
+          <caret line="18" column="28" selection-start-line="18" selection-start-column="19" selection-end-line="18" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="305">
+          <caret line="24" column="31" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="714">
+          <caret line="58" column="5" lean-forward="true" selection-start-line="58" selection-start-column="5" selection-end-line="58" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="924">
+          <caret line="134" column="92" selection-start-line="134" selection-start-column="92" selection-end-line="134" selection-end-column="92" />
+          <folding>
+            <element signature="method#linkDevice#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkPartitionCamera#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkReservePlan#0;class#PgAlarmLinkRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1066">
+          <caret line="90" lean-forward="true" selection-start-line="90" selection-end-line="90" />
+          <folding>
+            <element signature="method#getTjResultByAlarmType#0;class#PgAlarmTjRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="946">
+          <caret line="148" column="11" lean-forward="true" selection-start-line="148" selection-start-column="11" selection-end-line="148" selection-end-column="11" />
+          <folding>
+            <element signature="method#getAlarmTypeList#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#addAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#editAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#deleteAlarmType#0;class#PgAlarmTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="208">
+          <caret line="46" column="23" lean-forward="true" selection-start-line="46" selection-start-column="23" selection-end-line="46" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="113" column="9" lean-forward="true" selection-start-line="113" selection-start-column="9" selection-end-line="113" selection-end-column="9" />
+          <folding>
+            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
+            <element signature="method#getNewestCh4InfoByDev#0;class#PgCh4Rs#0" />
+            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="145" column="6" lean-forward="true" selection-start-line="145" selection-start-column="6" selection-end-line="145" selection-end-column="6" />
+          <folding>
+            <element signature="method#addAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#editAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#deleteAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#getAuthorityList#0;class#PgAuthorityRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="58" column="1" lean-forward="true" selection-start-line="58" selection-start-column="1" selection-end-line="58" selection-end-column="1" />
+          <folding>
+            <element signature="method#getPgAssetPlanList#0;class#PgAssetPlanRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="370">
+          <caret line="371" column="66" selection-start-line="371" selection-start-column="66" selection-end-line="371" selection-end-column="66" />
+          <folding>
+            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#searchConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionDev#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="139" column="13" lean-forward="true" selection-start-line="139" selection-start-column="13" selection-end-line="139" selection-end-column="13" />
+          <folding>
+            <element signature="method#getCoInfoByDevAndDate#0;class#PgCoRs#0" />
+            <element signature="method#getNewestCoInfoByDev#0;class#PgCoRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="540">
+          <caret line="223" column="5" lean-forward="true" selection-start-line="223" selection-start-column="5" selection-end-line="223" selection-end-column="5" />
+          <folding>
+            <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="682">
+          <caret line="100" lean-forward="true" selection-start-line="100" selection-end-line="100" />
+          <folding>
+            <element signature="method#getDeviceTpeyList#0;class#PgDeviceTypeRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="377">
+          <caret line="225" column="35" selection-start-line="225" selection-start-column="35" selection-end-line="225" selection-end-column="35" />
+          <folding>
+            <element signature="method#addEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#addEquipment#1;class#PgEquipmentRs#0" />
+            <element signature="method#getEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#deleteEquipment#0;class#PgEquipmentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="406">
+          <caret line="109" lean-forward="true" selection-start-line="109" selection-end-line="109" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="154">
+          <caret line="28" column="19" selection-start-line="28" selection-start-column="19" selection-end-line="28" selection-end-column="19" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="748">
-          <caret line="49" column="5" lean-forward="true" selection-start-line="49" selection-start-column="5" selection-end-line="49" selection-end-column="5" />
+        <state relative-caret-position="296">
+          <caret line="161" column="35" selection-start-line="161" selection-start-column="35" selection-end-line="161" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="384">
+          <caret line="99" column="5" lean-forward="true" selection-start-line="99" selection-start-column="5" selection-end-line="99" selection-end-column="5" />
+        </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="362">
+          <caret line="340" column="35" selection-start-line="340" selection-start-column="35" selection-end-line="340" selection-end-column="35" />
+          <folding>
+            <element signature="method#addInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPersonInPg#0;class#PgInPgPersonRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-606">
+          <caret line="76" column="20" lean-forward="true" selection-start-line="76" selection-start-column="20" selection-end-line="76" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="65" column="35" selection-start-line="65" selection-start-column="35" selection-end-line="65" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="101" column="35" selection-start-line="101" selection-start-column="35" selection-end-line="101" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="84" column="35" selection-start-line="84" selection-start-column="35" selection-end-line="84" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="59" lean-forward="true" selection-start-line="59" selection-end-line="59" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="60" column="1" lean-forward="true" selection-start-line="60" selection-start-column="1" selection-end-line="60" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="145" column="35" selection-start-line="145" selection-start-column="35" selection-end-line="145" selection-end-column="35" />
+        </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="274">
+          <caret line="350" column="35" selection-start-line="350" selection-start-column="35" selection-end-line="350" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="121" column="39" selection-start-line="121" selection-start-column="39" selection-end-line="121" selection-end-column="39" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="28" column="8" lean-forward="true" selection-start-line="28" selection-start-column="8" selection-end-line="28" selection-end-column="8" />
+        <state relative-caret-position="340">
+          <caret line="103" selection-start-line="103" selection-end-line="103" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="226" column="35" selection-start-line="226" selection-start-column="35" selection-end-line="226" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="203" column="35" selection-start-line="203" selection-start-column="35" selection-end-line="203" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="241" column="35" selection-start-line="241" selection-start-column="35" selection-end-line="241" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="225" column="1" lean-forward="true" selection-start-line="225" selection-start-column="1" selection-end-line="225" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="176" column="5" lean-forward="true" selection-start-line="176" selection-start-column="5" selection-end-line="176" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="178" column="35" lean-forward="true" selection-start-line="178" selection-start-column="35" selection-end-line="178" selection-end-column="35" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="516">
-          <caret line="94" column="53" selection-start-line="94" selection-start-column="53" selection-end-line="94" selection-end-column="53" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="814">
-          <caret line="52" column="9" lean-forward="true" selection-start-line="52" selection-start-column="9" selection-end-line="52" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="182">
-          <caret line="58" column="12" lean-forward="true" selection-start-line="58" selection-start-column="12" selection-end-line="58" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="34" lean-forward="true" selection-start-line="34" selection-end-line="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="32" lean-forward="true" selection-start-line="32" selection-end-line="32" />
-          <folding>
-            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
-            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="185">
-          <caret line="63" column="13" selection-start-line="63" selection-start-column="13" selection-end-line="63" selection-end-column="13" />
-          <folding>
-            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
-            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
-            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="e#6319#6324#0" />
-            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
-          </folding>
+          <caret line="240" lean-forward="true" selection-start-line="240" selection-end-line="240" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
-          <caret line="58" column="28" lean-forward="true" selection-start-line="58" selection-start-column="28" selection-end-line="58" selection-end-column="28" />
-          <folding>
-            <element signature="method#addTempHumData#0;class#PgTempHumRs#0" />
-          </folding>
+        <state relative-caret-position="340">
+          <caret line="148" column="34" selection-start-line="148" selection-start-column="34" selection-end-line="148" selection-end-column="34" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
+        <state relative-caret-position="458">
+          <caret line="99" column="35" selection-start-line="99" selection-start-column="35" selection-end-line="99" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+        <state relative-caret-position="384">
+          <caret line="145" column="32" lean-forward="true" selection-start-line="145" selection-start-column="32" selection-end-line="145" selection-end-column="32" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="414">
-          <caret line="22" column="46" lean-forward="true" selection-start-line="22" selection-start-column="46" selection-end-line="22" selection-end-column="46" />
-        </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="396">
-          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" column="83" selection-start-line="11" selection-start-column="83" selection-end-line="11" selection-end-column="83" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="26">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
-          <folding>
-            <element signature="method#getPgInPgStatusByPerson#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNumByName#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNum#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPersonListByDay#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPgStatusByPgInPgPerson#0;class#PgInPgStatusManager#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="44">
-          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-12">
-          <caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="87" lean-forward="true" selection-start-line="87" selection-end-line="87" />
-          <folding>
-            <element signature="method#getConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#addConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#deleteConstructionType#0;class#PgConstructionTypeRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
-          <folding>
-            <element signature="method#getConstructionTypeByType#0;class#PgConstructionTypeManager#0" />
-            <element signature="method#getAllConstructionTypeDto#0;class#PgConstructionTypeManager#0" />
-          </folding>
-        </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="145">
-          <caret line="258" column="9" lean-forward="true" selection-start-line="258" selection-start-column="9" selection-end-line="258" selection-end-column="9" />
-          <folding>
-            <element signature="method#getMonthInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayInPgStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgOverViewRs#0" />
-            <element signature="method#getAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getMonthAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayAlarmStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgOverViewRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="103">
-          <caret line="105" column="50" lean-forward="true" selection-start-line="105" selection-start-column="50" selection-end-line="105" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateBasicDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="99">
-          <caret line="125" selection-start-line="125" selection-end-line="125" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="190">
-          <caret line="24" column="35" lean-forward="true" selection-start-line="24" selection-start-column="35" selection-end-line="24" selection-end-column="35" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="436">
-          <caret line="24" lean-forward="true" selection-start-line="24" selection-end-line="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" lean-forward="true" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="300">
-          <caret line="34" column="31" lean-forward="true" selection-start-line="34" selection-start-column="31" selection-end-line="34" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="42" column="13" lean-forward="true" selection-start-line="42" selection-start-column="13" selection-end-line="42" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="120" column="72" lean-forward="true" selection-start-line="120" selection-start-column="72" selection-end-line="120" selection-end-column="72" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="293">
-          <caret line="58" column="73" lean-forward="true" selection-start-line="58" selection-start-column="73" selection-end-line="58" selection-end-column="73" />
-          <folding>
-            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
-            <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
-          </folding>
-        </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="307">
-          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
+        <state relative-caret-position="758">
+          <caret line="130" column="5" lean-forward="true" selection-start-line="130" selection-start-column="5" selection-end-line="130" selection-end-column="5" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1170">
-          <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
+        <state relative-caret-position="494">
+          <caret line="86" column="62" lean-forward="true" selection-start-line="86" selection-start-column="62" selection-end-line="86" selection-end-column="62" />
           <folding>
-            <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-            <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+            <element signature="method#getAllDevice#0;class#PgDeviceManager#0" />
+            <element signature="method#getAllDev#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="195" column="28" lean-forward="true" selection-start-line="195" selection-start-column="28" selection-end-line="195" selection-end-column="28" />
+        <state relative-caret-position="166">
+          <caret line="174" column="13" lean-forward="true" selection-start-line="174" selection-start-column="13" selection-end-line="174" selection-end-column="13" />
           <folding>
-            <element signature="method#getAlarmByTypeAndTime#0;class#PgAlarmManager#0" />
-            <element signature="method#getAlarmNum#0;class#PgAlarmManager#0" />
             <element signature="method#getDayAlarmStatistic#0;class#PgAlarmManager#0" />
+            <element signature="method#getAlarmList#0;class#PgAlarmManager#0" />
             <element signature="method#createDTO#0;class#PgAlarmManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="364">
+          <caret line="46" column="56" lean-forward="true" selection-start-line="46" selection-start-column="56" selection-end-line="46" selection-end-column="56" />
+          <folding>
+            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
+            <element signature="method#getPgDev#0;class#PgDeviceRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
+            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+        <state relative-caret-position="396">
+          <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
           <folding>
             <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
             <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -1365,52 +1331,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="239">
-          <caret line="21" column="33" lean-forward="true" selection-start-line="21" selection-start-column="33" selection-end-line="21" selection-end-column="33" />
-        </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="352">
-          <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-        </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="99">
-          <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-          </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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-          <folding>
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-            <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>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
index c436c93..e913155 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
@@ -132,7 +132,10 @@
             this.setAlarmType("");
         else
             this.setAlarmType(pgAlarm.getAlarmTypeId().getAlarmType());
-        this.setAlarmValue(pgAlarm.getAlarmValue());
+        if(pgAlarm.getAlarmValue()==null)
+            this.setAlarmValue("");
+        else
+            this.setAlarmValue(pgAlarm.getAlarmValue());
         if (pgAlarm.getAlarmDate() != null)
             this.setAlarmDate(sdf.format(pgAlarm.getAlarmDate()));
         else
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
index a43965c..565cb41 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -159,11 +159,21 @@
     }
 
     //获取历史报警消息列表
-    public List<PgAlarmDto> getAllAlarm(String alarmType,String startDay,String endDay,String isNew,int page,int rows) {
-        try {
+    public  Map<String, Object> getAllAlarm(String alarmType,String partition,String startDay,String endDay,String isNew,int page,int rows) {
 
+        Map<String, Object> resultMap = new HashMap<>();
+        String msg="";
+
+        try {
             Criteria criteria = createCriteria(PgAlarm.class);
 
+            if (StringUtils.isNotBlank(partition)) {
+                DetachedCriteria inCriteria = DetachedCriteria.forClass(PgDevice.class);
+                inCriteria.add(Restrictions.eq("partition", partition));
+                inCriteria.setProjection(Property.forName("id"));
+                criteria.add(Property.forName("alarmDevId").in(inCriteria));
+            }
+
             if (StringUtils.isNotBlank(alarmType)&&!alarmType.contains("全部")&&pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
                 criteria.add(Restrictions.eq("alarmTypeId", pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)));
 
@@ -190,8 +200,16 @@
             for (PgAlarm pgAlarm : pgAlarmList) {
                 pgAlarmDtoList.add(new PgAlarmDto(pgAlarm));
             }
-
-            return pgAlarmDtoList;
+            if(pgAlarmDtoList==null||pgAlarmDtoList.size()==0) {
+                resultMap.put("msg", "没有报警信息");
+                resultMap.put("code","0");
+            }else {
+                resultMap.put("code","200");
+                resultMap.put("msg", "报警信息获取成功");
+            }
+            resultMap.put("count",pg.getTotalCount());
+            resultMap.put("result",pgAlarmDtoList);
+            return resultMap;
         }
         catch(Exception ex){
             ex.printStackTrace();
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index 7547560..654f49e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -24,11 +24,11 @@
 
         Criteria criteria = createCriteria(PgDevice.class);
 
-        if(road!=null)
+        if(StringUtils.isNotBlank(road))
             criteria.add(Restrictions.eq("road",road));
-        if(partition!=null)
+        if(StringUtils.isNotBlank(partition))
             criteria.add(Restrictions.eq("partition",partition));
-        if(devType!=null)
+        if(StringUtils.isNotBlank(devType))
             criteria.add(Restrictions.eq("devType",devType));
 
         criteria.add(Restrictions.eq("active", 1));
@@ -43,6 +43,29 @@
         return pgDeviceDtoList;
     }
 
+    public List<PgDeviceDto> getAllDev(String road,String partition,String devType) {
+
+        Criteria criteria = createCriteria(PgDevice.class);
+
+        if(StringUtils.isNotBlank(road))
+            criteria.add(Restrictions.eq("road",road));
+        if(StringUtils.isNotBlank(partition))
+            criteria.add(Restrictions.eq("partition",partition));
+        if(StringUtils.isNotBlank(devType))
+            criteria.add(Restrictions.like("devType","%"+devType+"%"));
+
+        criteria.add(Restrictions.eq("active", 1));
+        criteria.addOrder(Order.desc("id"));
+        List<PgDevice> pgDeviceList = criteria.list();
+
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
+        for (PgDevice pgDevice : pgDeviceList) {
+            pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
+        }
+
+        return pgDeviceDtoList;
+    }
+
     //根据名字获取当前设备
     public PgDevice getDeviceByAssetCode(String assetCode) {
         Criteria criteria=createCriteria(PgDevice.class);
@@ -56,9 +79,9 @@
     }
 
     //根据类型获取设备列表
-    public List<PgDeviceDto> getDeviceByDevTypee(String devType) {
+    public List<PgDeviceDto> getDeviceByDevType(String devType) {
         Criteria criteria=createCriteria(PgDevice.class);
-        criteria.add(Restrictions.eq("devType",devType));
+        criteria.add(Restrictions.like("devType","%"+devType+"%"));
 
         List<PgDevice> pgDeviceList=criteria.list();
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
@@ -106,7 +129,7 @@
         criteria.add(Restrictions.eq("partition",partition));
 
         List<PgDevice> pgDeviceList=criteria.list();
-        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<PgDeviceDto>();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
 
         for (PgDevice pgDevice : pgDeviceList) {
             pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
index 3a3bccd..595730e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
@@ -1,10 +1,13 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.devTable.domain.PgAlarmType;
 import com.casic.PgInterface.devTable.domain.PgPartition;
 import com.casic.PgInterface.devTable.domain.PgRoad;
 import com.casic.PgInterface.devTable.domain.PipeGallery;
 import com.casic.PgInterface.devTable.dto.PgPartitionDto;
+import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
@@ -12,7 +15,9 @@
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Created by yxw on 2017/11/4.
@@ -21,7 +26,8 @@
 public class PgPartitionManager extends HibernateEntityDao<PgPartition> {
 
     @Resource
-    PgRoadManager pgRoadManager;
+    private PgRoadManager pgRoadManager;
+
 
     public PgPartition getPartitionByParName(String parName) {
         Criteria criteria = getSession().createCriteria(PgPartition.class);
@@ -99,4 +105,5 @@
         return pgPartitionDtoList;
     }
 
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
index f216360..a6928f1 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
@@ -5,6 +5,7 @@
 public class PgPlanResultRe {
 
     private String taskKey;
+    private List<String> pileAcuList;
     private List<PgPlanResult> pgPlanResultList;
 
     public String getTaskKey() {
@@ -15,6 +16,14 @@
         this.taskKey = taskKey;
     }
 
+    public List<String> getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(List<String> pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+
     public List<PgPlanResult> getPgPlanResultList() {
         return pgPlanResultList;
     }

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 25ded8a..283d7ab 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,20 +7,56 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" 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/construction/manager/PgCsDocumentManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/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/manager/PgAlarmManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/~$说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/~$说明20191207.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.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$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/接口说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明20191207.docx" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
@@ -51,7 +87,7 @@
         <counts>
           <entry key="class" value="4" />
           <entry key="iml" value="2" />
-          <entry key="java" value="707" />
+          <entry key="java" value="820" />
           <entry key="properties" value="14" />
           <entry key="xml" value="7" />
         </counts>
@@ -60,7 +96,7 @@
         <counts>
           <entry key="CLASS" value="4" />
           <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="707" />
+          <entry key="JAVA" value="820" />
           <entry key="Properties" value="14" />
           <entry key="XML" value="7" />
         </counts>
@@ -68,32 +104,32 @@
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
           <entry key="dummy" value="38" />
-          <entry key="java" value="30161" />
+          <entry key="java" value="40859" />
           <entry key="properties" value="100" />
-          <entry key="txt" value="176" />
+          <entry key="txt" value="186" />
           <entry key="xml" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="30161" />
-          <entry key="PLAIN_TEXT" value="214" />
+          <entry key="JAVA" value="40859" />
+          <entry key="PLAIN_TEXT" value="224" />
           <entry key="Properties" value="100" />
           <entry key="XML" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="48" />
+          <entry key="project.closed" value="51" />
           <entry key="project.open.time.1" value="5" />
           <entry key="project.open.time.12" value="2" />
           <entry key="project.open.time.13" value="1" />
           <entry key="project.open.time.15" value="1" />
           <entry key="project.open.time.16" value="1" />
           <entry key="project.open.time.17" value="1" />
-          <entry key="project.open.time.2" value="1" />
+          <entry key="project.open.time.2" value="2" />
           <entry key="project.open.time.20" value="1" />
-          <entry key="project.open.time.23" value="1" />
+          <entry key="project.open.time.23" value="2" />
           <entry key="project.open.time.24" value="2" />
           <entry key="project.open.time.251" value="1" />
           <entry key="project.open.time.27" value="2" />
@@ -106,8 +142,8 @@
           <entry key="project.open.time.36" value="1" />
           <entry key="project.open.time.37" value="1" />
           <entry key="project.open.time.39" value="2" />
-          <entry key="project.open.time.4" value="2" />
-          <entry key="project.open.time.40" value="1" />
+          <entry key="project.open.time.4" value="3" />
+          <entry key="project.open.time.40" value="2" />
           <entry key="project.open.time.41" value="2" />
           <entry key="project.open.time.42" value="2" />
           <entry key="project.open.time.43" value="2" />
@@ -122,23 +158,25 @@
           <entry key="project.open.time.6" value="3" />
           <entry key="project.open.time.63" value="2" />
           <entry key="project.open.time.64" value="1" />
+          <entry key="project.open.time.66" value="1" />
           <entry key="project.open.time.71" value="2" />
+          <entry key="project.open.time.74" value="1" />
           <entry key="project.open.time.76" value="1" />
           <entry key="project.open.time.8" value="2" />
           <entry key="project.open.time.9" value="1" />
           <entry key="project.open.time.97" value="1" />
-          <entry key="project.opened" value="78" />
+          <entry key="project.opened" value="84" />
         </counts>
       </usages-collector>
     </session>
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+            <state relative-caret-position="396">
+              <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
               <folding>
                 <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
                 <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -147,73 +185,6 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <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="99">
-              <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-              <folding>
-                <element signature="imports" expanded="true" />
-                <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-1170">
-              <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state>
-              <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
-              <folding>
-                <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-                <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="true">
-        <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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-              <folding>
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-                <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>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <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="352">
-              <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -225,18 +196,9 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>inCriteria</find>
-      <find>getPgPlanResulList</find>
-      <find>getPileAcuListByPileAcuStr</find>
-      <find>distinct</find>
-      <find>order</find>
-      <find>canPlanLine</find>
-      <find>isExistLine</find>
-      <find>getPlanResult</find>
       <find>pgPipeLine</find>
       <find>getPipeLineBylineName</find>
       <find>StringU</find>
-      <find>getAllAlarm</find>
       <find>getAlarmList</find>
       <find>getPgInPersonListByDay</find>
       <find>getDayInPgStatistic</find>
@@ -254,7 +216,16 @@
       <find>getPgContructionByNameOrType</find>
       <find>&quot;&quot;,&quot;&quot;,</find>
       <find>getPgContructionDtoByNameOrType</find>
+      <find>addConstruction</find>
+      <find>getPgLineAcuHole</find>
+      <find>getPlanResult</find>
       <find>getConstruction</find>
+      <find>addPipeLine</find>
+      <find>未找到入廊数据</find>
+      <find>getCurrentHoleByAcu</find>
+      <find>getAllAlarm</find>
+      <find>getPgDeviceDtoListByPartition</find>
+      <find>getPgDeviceByDevType</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -263,57 +234,57 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlan.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileHoleManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/planData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/PlanData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
       </list>
     </option>
   </component>
@@ -359,7 +330,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -421,53 +391,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="dto" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="manager" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -479,29 +402,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="rs" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -516,6 +416,7 @@
         </subPane>
       </pane>
       <pane id="Scope" />
+      <pane id="PackagesPane" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -710,7 +611,13 @@
       <workItem from="1574902733573" duration="1829000" />
       <workItem from="1574998240004" duration="7016000" />
       <workItem from="1575247959683" duration="6997000" />
-      <workItem from="1575704345590" duration="40473000" />
+      <workItem from="1575704345590" duration="69381000" />
+      <workItem from="1575869479666" duration="721000" />
+      <workItem from="1575947104878" duration="6101000" />
+      <workItem from="1576128264436" duration="3347000" />
+      <workItem from="1576208571543" duration="22000" />
+      <workItem from="1576227513917" duration="862000" />
+      <workItem from="1576293721220" duration="18246000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -817,11 +724,18 @@
       <option name="project" value="LOCAL" />
       <updated>1575775489149</updated>
     </task>
-    <option name="localTasksCounter" value="16" />
+    <task id="LOCAL-00016" summary="整改施工信息">
+      <created>1575791780774</created>
+      <option name="number" value="00016" />
+      <option name="presentableId" value="LOCAL-00016" />
+      <option name="project" value="LOCAL" />
+      <updated>1575791780774</updated>
+    </task>
+    <option name="localTasksCounter" value="17" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="452131000" />
+    <option name="totallyTimeSpent" value="510338000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -834,9 +748,8 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
-    <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.24205749" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2647504" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -847,7 +760,7 @@
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.3295082" />
       <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.4819672" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.65737706" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.3295082" />
@@ -939,7 +852,8 @@
     <MESSAGE value="重新设计智能规划部分" />
     <MESSAGE value="完成智能规划对接" />
     <MESSAGE value="修改报警统计" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改报警统计" />
+    <MESSAGE value="整改施工信息" />
+    <option name="LAST_COMMIT_MESSAGE" value="整改施工信息" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -951,16 +865,10 @@
           <option name="timeStamp" value="3" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java</url>
-          <line>69</line>
+          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java</url>
+          <line>40</line>
           <properties />
-          <option name="timeStamp" value="21" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java</url>
-          <line>96</line>
-          <properties />
-          <option name="timeStamp" value="38" />
+          <option name="timeStamp" value="122" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
@@ -970,394 +878,452 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <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="2068">
-          <caret line="154" column="35" selection-start-line="154" selection-start-column="35" selection-end-line="154" selection-end-column="35" />
-        </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="3300">
-          <caret line="297" column="22" selection-start-line="297" selection-start-column="22" selection-end-line="297" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/StringUtils.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
-          <caret line="13" column="48" lean-forward="true" selection-start-line="13" selection-start-column="48" selection-end-line="13" selection-end-column="48" />
+          <caret line="11" column="5" selection-start-line="11" selection-start-column="5" selection-end-line="11" selection-end-column="5" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="78" lean-forward="true" selection-start-line="78" selection-end-line="78" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="616">
-          <caret line="41" column="1" selection-start-line="41" selection-start-column="1" selection-end-line="41" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="110">
-          <caret line="12" column="23" selection-start-line="12" selection-start-column="23" selection-end-line="12" selection-end-column="23" />
+        <state relative-caret-position="516">
+          <caret line="114" column="12" selection-start-line="114" selection-start-column="12" selection-end-line="114" selection-end-column="12" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="164">
-          <caret line="56" lean-forward="true" selection-start-line="56" selection-end-line="56" />
+        <state relative-caret-position="418">
+          <caret line="33" column="44" selection-start-line="33" selection-start-column="44" selection-end-line="33" selection-end-column="44" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="258">
-          <caret line="27" column="12" lean-forward="true" selection-start-line="27" selection-start-column="12" selection-end-line="27" selection-end-column="12" />
+        <state relative-caret-position="132">
+          <caret line="11" column="20" lean-forward="true" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="20" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.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="-12">
-          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        <state relative-caret-position="516">
+          <caret line="142" column="54" selection-start-line="142" selection-start-column="54" selection-end-line="142" selection-end-column="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="858">
-          <caret line="55" column="27" lean-forward="true" selection-start-line="55" selection-start-column="27" selection-end-line="55" selection-end-column="27" />
+        <state relative-caret-position="66">
+          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="58">
+          <caret line="18" column="28" selection-start-line="18" selection-start-column="19" selection-end-line="18" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="305">
+          <caret line="24" column="31" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="714">
+          <caret line="58" column="5" lean-forward="true" selection-start-line="58" selection-start-column="5" selection-end-line="58" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="924">
+          <caret line="134" column="92" selection-start-line="134" selection-start-column="92" selection-end-line="134" selection-end-column="92" />
+          <folding>
+            <element signature="method#linkDevice#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkPartitionCamera#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkReservePlan#0;class#PgAlarmLinkRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1066">
+          <caret line="90" lean-forward="true" selection-start-line="90" selection-end-line="90" />
+          <folding>
+            <element signature="method#getTjResultByAlarmType#0;class#PgAlarmTjRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="946">
+          <caret line="148" column="11" lean-forward="true" selection-start-line="148" selection-start-column="11" selection-end-line="148" selection-end-column="11" />
+          <folding>
+            <element signature="method#getAlarmTypeList#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#addAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#editAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#deleteAlarmType#0;class#PgAlarmTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="208">
+          <caret line="46" column="23" lean-forward="true" selection-start-line="46" selection-start-column="23" selection-end-line="46" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="113" column="9" lean-forward="true" selection-start-line="113" selection-start-column="9" selection-end-line="113" selection-end-column="9" />
+          <folding>
+            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
+            <element signature="method#getNewestCh4InfoByDev#0;class#PgCh4Rs#0" />
+            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="145" column="6" lean-forward="true" selection-start-line="145" selection-start-column="6" selection-end-line="145" selection-end-column="6" />
+          <folding>
+            <element signature="method#addAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#editAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#deleteAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#getAuthorityList#0;class#PgAuthorityRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="58" column="1" lean-forward="true" selection-start-line="58" selection-start-column="1" selection-end-line="58" selection-end-column="1" />
+          <folding>
+            <element signature="method#getPgAssetPlanList#0;class#PgAssetPlanRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="370">
+          <caret line="371" column="66" selection-start-line="371" selection-start-column="66" selection-end-line="371" selection-end-column="66" />
+          <folding>
+            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#searchConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionDev#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="139" column="13" lean-forward="true" selection-start-line="139" selection-start-column="13" selection-end-line="139" selection-end-column="13" />
+          <folding>
+            <element signature="method#getCoInfoByDevAndDate#0;class#PgCoRs#0" />
+            <element signature="method#getNewestCoInfoByDev#0;class#PgCoRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="540">
+          <caret line="223" column="5" lean-forward="true" selection-start-line="223" selection-start-column="5" selection-end-line="223" selection-end-column="5" />
+          <folding>
+            <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="682">
+          <caret line="100" lean-forward="true" selection-start-line="100" selection-end-line="100" />
+          <folding>
+            <element signature="method#getDeviceTpeyList#0;class#PgDeviceTypeRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="377">
+          <caret line="225" column="35" selection-start-line="225" selection-start-column="35" selection-end-line="225" selection-end-column="35" />
+          <folding>
+            <element signature="method#addEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#addEquipment#1;class#PgEquipmentRs#0" />
+            <element signature="method#getEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#deleteEquipment#0;class#PgEquipmentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="406">
+          <caret line="109" lean-forward="true" selection-start-line="109" selection-end-line="109" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="154">
+          <caret line="28" column="19" selection-start-line="28" selection-start-column="19" selection-end-line="28" selection-end-column="19" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="748">
-          <caret line="49" column="5" lean-forward="true" selection-start-line="49" selection-start-column="5" selection-end-line="49" selection-end-column="5" />
+        <state relative-caret-position="296">
+          <caret line="161" column="35" selection-start-line="161" selection-start-column="35" selection-end-line="161" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="384">
+          <caret line="99" column="5" lean-forward="true" selection-start-line="99" selection-start-column="5" selection-end-line="99" selection-end-column="5" />
+        </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="362">
+          <caret line="340" column="35" selection-start-line="340" selection-start-column="35" selection-end-line="340" selection-end-column="35" />
+          <folding>
+            <element signature="method#addInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPersonInPg#0;class#PgInPgPersonRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-606">
+          <caret line="76" column="20" lean-forward="true" selection-start-line="76" selection-start-column="20" selection-end-line="76" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="65" column="35" selection-start-line="65" selection-start-column="35" selection-end-line="65" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="101" column="35" selection-start-line="101" selection-start-column="35" selection-end-line="101" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="84" column="35" selection-start-line="84" selection-start-column="35" selection-end-line="84" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="59" lean-forward="true" selection-start-line="59" selection-end-line="59" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="60" column="1" lean-forward="true" selection-start-line="60" selection-start-column="1" selection-end-line="60" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="145" column="35" selection-start-line="145" selection-start-column="35" selection-end-line="145" selection-end-column="35" />
+        </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="274">
+          <caret line="350" column="35" selection-start-line="350" selection-start-column="35" selection-end-line="350" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="121" column="39" selection-start-line="121" selection-start-column="39" selection-end-line="121" selection-end-column="39" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="28" column="8" lean-forward="true" selection-start-line="28" selection-start-column="8" selection-end-line="28" selection-end-column="8" />
+        <state relative-caret-position="340">
+          <caret line="103" selection-start-line="103" selection-end-line="103" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="226" column="35" selection-start-line="226" selection-start-column="35" selection-end-line="226" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="203" column="35" selection-start-line="203" selection-start-column="35" selection-end-line="203" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="241" column="35" selection-start-line="241" selection-start-column="35" selection-end-line="241" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="225" column="1" lean-forward="true" selection-start-line="225" selection-start-column="1" selection-end-line="225" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="176" column="5" lean-forward="true" selection-start-line="176" selection-start-column="5" selection-end-line="176" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="178" column="35" lean-forward="true" selection-start-line="178" selection-start-column="35" selection-end-line="178" selection-end-column="35" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="516">
-          <caret line="94" column="53" selection-start-line="94" selection-start-column="53" selection-end-line="94" selection-end-column="53" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="814">
-          <caret line="52" column="9" lean-forward="true" selection-start-line="52" selection-start-column="9" selection-end-line="52" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="182">
-          <caret line="58" column="12" lean-forward="true" selection-start-line="58" selection-start-column="12" selection-end-line="58" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="34" lean-forward="true" selection-start-line="34" selection-end-line="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="32" lean-forward="true" selection-start-line="32" selection-end-line="32" />
-          <folding>
-            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
-            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="185">
-          <caret line="63" column="13" selection-start-line="63" selection-start-column="13" selection-end-line="63" selection-end-column="13" />
-          <folding>
-            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
-            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
-            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="e#6319#6324#0" />
-            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
-          </folding>
+          <caret line="240" lean-forward="true" selection-start-line="240" selection-end-line="240" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
-          <caret line="58" column="28" lean-forward="true" selection-start-line="58" selection-start-column="28" selection-end-line="58" selection-end-column="28" />
-          <folding>
-            <element signature="method#addTempHumData#0;class#PgTempHumRs#0" />
-          </folding>
+        <state relative-caret-position="340">
+          <caret line="148" column="34" selection-start-line="148" selection-start-column="34" selection-end-line="148" selection-end-column="34" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
+        <state relative-caret-position="458">
+          <caret line="99" column="35" selection-start-line="99" selection-start-column="35" selection-end-line="99" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+        <state relative-caret-position="384">
+          <caret line="145" column="32" lean-forward="true" selection-start-line="145" selection-start-column="32" selection-end-line="145" selection-end-column="32" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="414">
-          <caret line="22" column="46" lean-forward="true" selection-start-line="22" selection-start-column="46" selection-end-line="22" selection-end-column="46" />
-        </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="396">
-          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" column="83" selection-start-line="11" selection-start-column="83" selection-end-line="11" selection-end-column="83" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="26">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
-          <folding>
-            <element signature="method#getPgInPgStatusByPerson#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNumByName#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNum#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPersonListByDay#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPgStatusByPgInPgPerson#0;class#PgInPgStatusManager#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="44">
-          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-12">
-          <caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="87" lean-forward="true" selection-start-line="87" selection-end-line="87" />
-          <folding>
-            <element signature="method#getConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#addConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#deleteConstructionType#0;class#PgConstructionTypeRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
-          <folding>
-            <element signature="method#getConstructionTypeByType#0;class#PgConstructionTypeManager#0" />
-            <element signature="method#getAllConstructionTypeDto#0;class#PgConstructionTypeManager#0" />
-          </folding>
-        </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="145">
-          <caret line="258" column="9" lean-forward="true" selection-start-line="258" selection-start-column="9" selection-end-line="258" selection-end-column="9" />
-          <folding>
-            <element signature="method#getMonthInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayInPgStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgOverViewRs#0" />
-            <element signature="method#getAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getMonthAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayAlarmStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgOverViewRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="103">
-          <caret line="105" column="50" lean-forward="true" selection-start-line="105" selection-start-column="50" selection-end-line="105" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateBasicDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="99">
-          <caret line="125" selection-start-line="125" selection-end-line="125" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="190">
-          <caret line="24" column="35" lean-forward="true" selection-start-line="24" selection-start-column="35" selection-end-line="24" selection-end-column="35" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="436">
-          <caret line="24" lean-forward="true" selection-start-line="24" selection-end-line="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" lean-forward="true" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="300">
-          <caret line="34" column="31" lean-forward="true" selection-start-line="34" selection-start-column="31" selection-end-line="34" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="42" column="13" lean-forward="true" selection-start-line="42" selection-start-column="13" selection-end-line="42" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="120" column="72" lean-forward="true" selection-start-line="120" selection-start-column="72" selection-end-line="120" selection-end-column="72" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="293">
-          <caret line="58" column="73" lean-forward="true" selection-start-line="58" selection-start-column="73" selection-end-line="58" selection-end-column="73" />
-          <folding>
-            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
-            <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
-          </folding>
-        </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="307">
-          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
+        <state relative-caret-position="758">
+          <caret line="130" column="5" lean-forward="true" selection-start-line="130" selection-start-column="5" selection-end-line="130" selection-end-column="5" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1170">
-          <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
+        <state relative-caret-position="494">
+          <caret line="86" column="62" lean-forward="true" selection-start-line="86" selection-start-column="62" selection-end-line="86" selection-end-column="62" />
           <folding>
-            <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-            <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+            <element signature="method#getAllDevice#0;class#PgDeviceManager#0" />
+            <element signature="method#getAllDev#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="195" column="28" lean-forward="true" selection-start-line="195" selection-start-column="28" selection-end-line="195" selection-end-column="28" />
+        <state relative-caret-position="166">
+          <caret line="174" column="13" lean-forward="true" selection-start-line="174" selection-start-column="13" selection-end-line="174" selection-end-column="13" />
           <folding>
-            <element signature="method#getAlarmByTypeAndTime#0;class#PgAlarmManager#0" />
-            <element signature="method#getAlarmNum#0;class#PgAlarmManager#0" />
             <element signature="method#getDayAlarmStatistic#0;class#PgAlarmManager#0" />
+            <element signature="method#getAlarmList#0;class#PgAlarmManager#0" />
             <element signature="method#createDTO#0;class#PgAlarmManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="364">
+          <caret line="46" column="56" lean-forward="true" selection-start-line="46" selection-start-column="56" selection-end-line="46" selection-end-column="56" />
+          <folding>
+            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
+            <element signature="method#getPgDev#0;class#PgDeviceRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
+            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+        <state relative-caret-position="396">
+          <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
           <folding>
             <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
             <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -1365,52 +1331,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="239">
-          <caret line="21" column="33" lean-forward="true" selection-start-line="21" selection-start-column="33" selection-end-line="21" selection-end-column="33" />
-        </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="352">
-          <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-        </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="99">
-          <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-          </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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-          <folding>
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-            <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>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
index c436c93..e913155 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
@@ -132,7 +132,10 @@
             this.setAlarmType("");
         else
             this.setAlarmType(pgAlarm.getAlarmTypeId().getAlarmType());
-        this.setAlarmValue(pgAlarm.getAlarmValue());
+        if(pgAlarm.getAlarmValue()==null)
+            this.setAlarmValue("");
+        else
+            this.setAlarmValue(pgAlarm.getAlarmValue());
         if (pgAlarm.getAlarmDate() != null)
             this.setAlarmDate(sdf.format(pgAlarm.getAlarmDate()));
         else
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
index a43965c..565cb41 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -159,11 +159,21 @@
     }
 
     //获取历史报警消息列表
-    public List<PgAlarmDto> getAllAlarm(String alarmType,String startDay,String endDay,String isNew,int page,int rows) {
-        try {
+    public  Map<String, Object> getAllAlarm(String alarmType,String partition,String startDay,String endDay,String isNew,int page,int rows) {
 
+        Map<String, Object> resultMap = new HashMap<>();
+        String msg="";
+
+        try {
             Criteria criteria = createCriteria(PgAlarm.class);
 
+            if (StringUtils.isNotBlank(partition)) {
+                DetachedCriteria inCriteria = DetachedCriteria.forClass(PgDevice.class);
+                inCriteria.add(Restrictions.eq("partition", partition));
+                inCriteria.setProjection(Property.forName("id"));
+                criteria.add(Property.forName("alarmDevId").in(inCriteria));
+            }
+
             if (StringUtils.isNotBlank(alarmType)&&!alarmType.contains("全部")&&pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
                 criteria.add(Restrictions.eq("alarmTypeId", pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)));
 
@@ -190,8 +200,16 @@
             for (PgAlarm pgAlarm : pgAlarmList) {
                 pgAlarmDtoList.add(new PgAlarmDto(pgAlarm));
             }
-
-            return pgAlarmDtoList;
+            if(pgAlarmDtoList==null||pgAlarmDtoList.size()==0) {
+                resultMap.put("msg", "没有报警信息");
+                resultMap.put("code","0");
+            }else {
+                resultMap.put("code","200");
+                resultMap.put("msg", "报警信息获取成功");
+            }
+            resultMap.put("count",pg.getTotalCount());
+            resultMap.put("result",pgAlarmDtoList);
+            return resultMap;
         }
         catch(Exception ex){
             ex.printStackTrace();
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index 7547560..654f49e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -24,11 +24,11 @@
 
         Criteria criteria = createCriteria(PgDevice.class);
 
-        if(road!=null)
+        if(StringUtils.isNotBlank(road))
             criteria.add(Restrictions.eq("road",road));
-        if(partition!=null)
+        if(StringUtils.isNotBlank(partition))
             criteria.add(Restrictions.eq("partition",partition));
-        if(devType!=null)
+        if(StringUtils.isNotBlank(devType))
             criteria.add(Restrictions.eq("devType",devType));
 
         criteria.add(Restrictions.eq("active", 1));
@@ -43,6 +43,29 @@
         return pgDeviceDtoList;
     }
 
+    public List<PgDeviceDto> getAllDev(String road,String partition,String devType) {
+
+        Criteria criteria = createCriteria(PgDevice.class);
+
+        if(StringUtils.isNotBlank(road))
+            criteria.add(Restrictions.eq("road",road));
+        if(StringUtils.isNotBlank(partition))
+            criteria.add(Restrictions.eq("partition",partition));
+        if(StringUtils.isNotBlank(devType))
+            criteria.add(Restrictions.like("devType","%"+devType+"%"));
+
+        criteria.add(Restrictions.eq("active", 1));
+        criteria.addOrder(Order.desc("id"));
+        List<PgDevice> pgDeviceList = criteria.list();
+
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
+        for (PgDevice pgDevice : pgDeviceList) {
+            pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
+        }
+
+        return pgDeviceDtoList;
+    }
+
     //根据名字获取当前设备
     public PgDevice getDeviceByAssetCode(String assetCode) {
         Criteria criteria=createCriteria(PgDevice.class);
@@ -56,9 +79,9 @@
     }
 
     //根据类型获取设备列表
-    public List<PgDeviceDto> getDeviceByDevTypee(String devType) {
+    public List<PgDeviceDto> getDeviceByDevType(String devType) {
         Criteria criteria=createCriteria(PgDevice.class);
-        criteria.add(Restrictions.eq("devType",devType));
+        criteria.add(Restrictions.like("devType","%"+devType+"%"));
 
         List<PgDevice> pgDeviceList=criteria.list();
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
@@ -106,7 +129,7 @@
         criteria.add(Restrictions.eq("partition",partition));
 
         List<PgDevice> pgDeviceList=criteria.list();
-        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<PgDeviceDto>();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
 
         for (PgDevice pgDevice : pgDeviceList) {
             pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
index 3a3bccd..595730e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
@@ -1,10 +1,13 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.devTable.domain.PgAlarmType;
 import com.casic.PgInterface.devTable.domain.PgPartition;
 import com.casic.PgInterface.devTable.domain.PgRoad;
 import com.casic.PgInterface.devTable.domain.PipeGallery;
 import com.casic.PgInterface.devTable.dto.PgPartitionDto;
+import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
@@ -12,7 +15,9 @@
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Created by yxw on 2017/11/4.
@@ -21,7 +26,8 @@
 public class PgPartitionManager extends HibernateEntityDao<PgPartition> {
 
     @Resource
-    PgRoadManager pgRoadManager;
+    private PgRoadManager pgRoadManager;
+
 
     public PgPartition getPartitionByParName(String parName) {
         Criteria criteria = getSession().createCriteria(PgPartition.class);
@@ -99,4 +105,5 @@
         return pgPartitionDtoList;
     }
 
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
index f216360..a6928f1 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
@@ -5,6 +5,7 @@
 public class PgPlanResultRe {
 
     private String taskKey;
+    private List<String> pileAcuList;
     private List<PgPlanResult> pgPlanResultList;
 
     public String getTaskKey() {
@@ -15,6 +16,14 @@
         this.taskKey = taskKey;
     }
 
+    public List<String> getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(List<String> pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+
     public List<PgPlanResult> getPgPlanResultList() {
         return pgPlanResultList;
     }
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
index 71ea765..47eea07 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
@@ -54,9 +54,7 @@
 
         List<PgLineHole> pgLineHoleList=criteria.list();
         List<PgLineHoleDTO> pgLineHoleDTOList=new ArrayList<>();
-        if(pgLineHoleList==null||pgLineHoleList.size()==0)
-            return null;
-        else
+        if(pgLineHoleList!=null&&pgLineHoleList.size()!=0)
             pgLineHoleDTOList=PgLineHoleDTO.ConvertToDTOList(pgLineHoleList,pgPileAcuManager,pgRoadManager);
         return pgLineHoleDTOList;
     }

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 25ded8a..283d7ab 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,20 +7,56 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" 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/construction/manager/PgCsDocumentManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/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/manager/PgAlarmManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/~$说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/~$说明20191207.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.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$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/接口说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明20191207.docx" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
@@ -51,7 +87,7 @@
         <counts>
           <entry key="class" value="4" />
           <entry key="iml" value="2" />
-          <entry key="java" value="707" />
+          <entry key="java" value="820" />
           <entry key="properties" value="14" />
           <entry key="xml" value="7" />
         </counts>
@@ -60,7 +96,7 @@
         <counts>
           <entry key="CLASS" value="4" />
           <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="707" />
+          <entry key="JAVA" value="820" />
           <entry key="Properties" value="14" />
           <entry key="XML" value="7" />
         </counts>
@@ -68,32 +104,32 @@
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
           <entry key="dummy" value="38" />
-          <entry key="java" value="30161" />
+          <entry key="java" value="40859" />
           <entry key="properties" value="100" />
-          <entry key="txt" value="176" />
+          <entry key="txt" value="186" />
           <entry key="xml" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="30161" />
-          <entry key="PLAIN_TEXT" value="214" />
+          <entry key="JAVA" value="40859" />
+          <entry key="PLAIN_TEXT" value="224" />
           <entry key="Properties" value="100" />
           <entry key="XML" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="48" />
+          <entry key="project.closed" value="51" />
           <entry key="project.open.time.1" value="5" />
           <entry key="project.open.time.12" value="2" />
           <entry key="project.open.time.13" value="1" />
           <entry key="project.open.time.15" value="1" />
           <entry key="project.open.time.16" value="1" />
           <entry key="project.open.time.17" value="1" />
-          <entry key="project.open.time.2" value="1" />
+          <entry key="project.open.time.2" value="2" />
           <entry key="project.open.time.20" value="1" />
-          <entry key="project.open.time.23" value="1" />
+          <entry key="project.open.time.23" value="2" />
           <entry key="project.open.time.24" value="2" />
           <entry key="project.open.time.251" value="1" />
           <entry key="project.open.time.27" value="2" />
@@ -106,8 +142,8 @@
           <entry key="project.open.time.36" value="1" />
           <entry key="project.open.time.37" value="1" />
           <entry key="project.open.time.39" value="2" />
-          <entry key="project.open.time.4" value="2" />
-          <entry key="project.open.time.40" value="1" />
+          <entry key="project.open.time.4" value="3" />
+          <entry key="project.open.time.40" value="2" />
           <entry key="project.open.time.41" value="2" />
           <entry key="project.open.time.42" value="2" />
           <entry key="project.open.time.43" value="2" />
@@ -122,23 +158,25 @@
           <entry key="project.open.time.6" value="3" />
           <entry key="project.open.time.63" value="2" />
           <entry key="project.open.time.64" value="1" />
+          <entry key="project.open.time.66" value="1" />
           <entry key="project.open.time.71" value="2" />
+          <entry key="project.open.time.74" value="1" />
           <entry key="project.open.time.76" value="1" />
           <entry key="project.open.time.8" value="2" />
           <entry key="project.open.time.9" value="1" />
           <entry key="project.open.time.97" value="1" />
-          <entry key="project.opened" value="78" />
+          <entry key="project.opened" value="84" />
         </counts>
       </usages-collector>
     </session>
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+            <state relative-caret-position="396">
+              <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
               <folding>
                 <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
                 <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -147,73 +185,6 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <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="99">
-              <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-              <folding>
-                <element signature="imports" expanded="true" />
-                <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-1170">
-              <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state>
-              <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
-              <folding>
-                <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-                <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="true">
-        <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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-              <folding>
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-                <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>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <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="352">
-              <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -225,18 +196,9 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>inCriteria</find>
-      <find>getPgPlanResulList</find>
-      <find>getPileAcuListByPileAcuStr</find>
-      <find>distinct</find>
-      <find>order</find>
-      <find>canPlanLine</find>
-      <find>isExistLine</find>
-      <find>getPlanResult</find>
       <find>pgPipeLine</find>
       <find>getPipeLineBylineName</find>
       <find>StringU</find>
-      <find>getAllAlarm</find>
       <find>getAlarmList</find>
       <find>getPgInPersonListByDay</find>
       <find>getDayInPgStatistic</find>
@@ -254,7 +216,16 @@
       <find>getPgContructionByNameOrType</find>
       <find>&quot;&quot;,&quot;&quot;,</find>
       <find>getPgContructionDtoByNameOrType</find>
+      <find>addConstruction</find>
+      <find>getPgLineAcuHole</find>
+      <find>getPlanResult</find>
       <find>getConstruction</find>
+      <find>addPipeLine</find>
+      <find>未找到入廊数据</find>
+      <find>getCurrentHoleByAcu</find>
+      <find>getAllAlarm</find>
+      <find>getPgDeviceDtoListByPartition</find>
+      <find>getPgDeviceByDevType</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -263,57 +234,57 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlan.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileHoleManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/planData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/PlanData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
       </list>
     </option>
   </component>
@@ -359,7 +330,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -421,53 +391,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="dto" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="manager" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -479,29 +402,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="rs" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -516,6 +416,7 @@
         </subPane>
       </pane>
       <pane id="Scope" />
+      <pane id="PackagesPane" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -710,7 +611,13 @@
       <workItem from="1574902733573" duration="1829000" />
       <workItem from="1574998240004" duration="7016000" />
       <workItem from="1575247959683" duration="6997000" />
-      <workItem from="1575704345590" duration="40473000" />
+      <workItem from="1575704345590" duration="69381000" />
+      <workItem from="1575869479666" duration="721000" />
+      <workItem from="1575947104878" duration="6101000" />
+      <workItem from="1576128264436" duration="3347000" />
+      <workItem from="1576208571543" duration="22000" />
+      <workItem from="1576227513917" duration="862000" />
+      <workItem from="1576293721220" duration="18246000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -817,11 +724,18 @@
       <option name="project" value="LOCAL" />
       <updated>1575775489149</updated>
     </task>
-    <option name="localTasksCounter" value="16" />
+    <task id="LOCAL-00016" summary="整改施工信息">
+      <created>1575791780774</created>
+      <option name="number" value="00016" />
+      <option name="presentableId" value="LOCAL-00016" />
+      <option name="project" value="LOCAL" />
+      <updated>1575791780774</updated>
+    </task>
+    <option name="localTasksCounter" value="17" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="452131000" />
+    <option name="totallyTimeSpent" value="510338000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -834,9 +748,8 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
-    <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.24205749" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2647504" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -847,7 +760,7 @@
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.3295082" />
       <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.4819672" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.65737706" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.3295082" />
@@ -939,7 +852,8 @@
     <MESSAGE value="重新设计智能规划部分" />
     <MESSAGE value="完成智能规划对接" />
     <MESSAGE value="修改报警统计" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改报警统计" />
+    <MESSAGE value="整改施工信息" />
+    <option name="LAST_COMMIT_MESSAGE" value="整改施工信息" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -951,16 +865,10 @@
           <option name="timeStamp" value="3" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java</url>
-          <line>69</line>
+          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java</url>
+          <line>40</line>
           <properties />
-          <option name="timeStamp" value="21" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java</url>
-          <line>96</line>
-          <properties />
-          <option name="timeStamp" value="38" />
+          <option name="timeStamp" value="122" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
@@ -970,394 +878,452 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <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="2068">
-          <caret line="154" column="35" selection-start-line="154" selection-start-column="35" selection-end-line="154" selection-end-column="35" />
-        </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="3300">
-          <caret line="297" column="22" selection-start-line="297" selection-start-column="22" selection-end-line="297" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/StringUtils.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
-          <caret line="13" column="48" lean-forward="true" selection-start-line="13" selection-start-column="48" selection-end-line="13" selection-end-column="48" />
+          <caret line="11" column="5" selection-start-line="11" selection-start-column="5" selection-end-line="11" selection-end-column="5" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="78" lean-forward="true" selection-start-line="78" selection-end-line="78" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="616">
-          <caret line="41" column="1" selection-start-line="41" selection-start-column="1" selection-end-line="41" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="110">
-          <caret line="12" column="23" selection-start-line="12" selection-start-column="23" selection-end-line="12" selection-end-column="23" />
+        <state relative-caret-position="516">
+          <caret line="114" column="12" selection-start-line="114" selection-start-column="12" selection-end-line="114" selection-end-column="12" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="164">
-          <caret line="56" lean-forward="true" selection-start-line="56" selection-end-line="56" />
+        <state relative-caret-position="418">
+          <caret line="33" column="44" selection-start-line="33" selection-start-column="44" selection-end-line="33" selection-end-column="44" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="258">
-          <caret line="27" column="12" lean-forward="true" selection-start-line="27" selection-start-column="12" selection-end-line="27" selection-end-column="12" />
+        <state relative-caret-position="132">
+          <caret line="11" column="20" lean-forward="true" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="20" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.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="-12">
-          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        <state relative-caret-position="516">
+          <caret line="142" column="54" selection-start-line="142" selection-start-column="54" selection-end-line="142" selection-end-column="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="858">
-          <caret line="55" column="27" lean-forward="true" selection-start-line="55" selection-start-column="27" selection-end-line="55" selection-end-column="27" />
+        <state relative-caret-position="66">
+          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="58">
+          <caret line="18" column="28" selection-start-line="18" selection-start-column="19" selection-end-line="18" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="305">
+          <caret line="24" column="31" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="714">
+          <caret line="58" column="5" lean-forward="true" selection-start-line="58" selection-start-column="5" selection-end-line="58" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="924">
+          <caret line="134" column="92" selection-start-line="134" selection-start-column="92" selection-end-line="134" selection-end-column="92" />
+          <folding>
+            <element signature="method#linkDevice#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkPartitionCamera#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkReservePlan#0;class#PgAlarmLinkRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1066">
+          <caret line="90" lean-forward="true" selection-start-line="90" selection-end-line="90" />
+          <folding>
+            <element signature="method#getTjResultByAlarmType#0;class#PgAlarmTjRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="946">
+          <caret line="148" column="11" lean-forward="true" selection-start-line="148" selection-start-column="11" selection-end-line="148" selection-end-column="11" />
+          <folding>
+            <element signature="method#getAlarmTypeList#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#addAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#editAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#deleteAlarmType#0;class#PgAlarmTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="208">
+          <caret line="46" column="23" lean-forward="true" selection-start-line="46" selection-start-column="23" selection-end-line="46" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="113" column="9" lean-forward="true" selection-start-line="113" selection-start-column="9" selection-end-line="113" selection-end-column="9" />
+          <folding>
+            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
+            <element signature="method#getNewestCh4InfoByDev#0;class#PgCh4Rs#0" />
+            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="145" column="6" lean-forward="true" selection-start-line="145" selection-start-column="6" selection-end-line="145" selection-end-column="6" />
+          <folding>
+            <element signature="method#addAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#editAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#deleteAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#getAuthorityList#0;class#PgAuthorityRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="58" column="1" lean-forward="true" selection-start-line="58" selection-start-column="1" selection-end-line="58" selection-end-column="1" />
+          <folding>
+            <element signature="method#getPgAssetPlanList#0;class#PgAssetPlanRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="370">
+          <caret line="371" column="66" selection-start-line="371" selection-start-column="66" selection-end-line="371" selection-end-column="66" />
+          <folding>
+            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#searchConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionDev#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="139" column="13" lean-forward="true" selection-start-line="139" selection-start-column="13" selection-end-line="139" selection-end-column="13" />
+          <folding>
+            <element signature="method#getCoInfoByDevAndDate#0;class#PgCoRs#0" />
+            <element signature="method#getNewestCoInfoByDev#0;class#PgCoRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="540">
+          <caret line="223" column="5" lean-forward="true" selection-start-line="223" selection-start-column="5" selection-end-line="223" selection-end-column="5" />
+          <folding>
+            <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="682">
+          <caret line="100" lean-forward="true" selection-start-line="100" selection-end-line="100" />
+          <folding>
+            <element signature="method#getDeviceTpeyList#0;class#PgDeviceTypeRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="377">
+          <caret line="225" column="35" selection-start-line="225" selection-start-column="35" selection-end-line="225" selection-end-column="35" />
+          <folding>
+            <element signature="method#addEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#addEquipment#1;class#PgEquipmentRs#0" />
+            <element signature="method#getEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#deleteEquipment#0;class#PgEquipmentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="406">
+          <caret line="109" lean-forward="true" selection-start-line="109" selection-end-line="109" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="154">
+          <caret line="28" column="19" selection-start-line="28" selection-start-column="19" selection-end-line="28" selection-end-column="19" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="748">
-          <caret line="49" column="5" lean-forward="true" selection-start-line="49" selection-start-column="5" selection-end-line="49" selection-end-column="5" />
+        <state relative-caret-position="296">
+          <caret line="161" column="35" selection-start-line="161" selection-start-column="35" selection-end-line="161" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="384">
+          <caret line="99" column="5" lean-forward="true" selection-start-line="99" selection-start-column="5" selection-end-line="99" selection-end-column="5" />
+        </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="362">
+          <caret line="340" column="35" selection-start-line="340" selection-start-column="35" selection-end-line="340" selection-end-column="35" />
+          <folding>
+            <element signature="method#addInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPersonInPg#0;class#PgInPgPersonRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-606">
+          <caret line="76" column="20" lean-forward="true" selection-start-line="76" selection-start-column="20" selection-end-line="76" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="65" column="35" selection-start-line="65" selection-start-column="35" selection-end-line="65" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="101" column="35" selection-start-line="101" selection-start-column="35" selection-end-line="101" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="84" column="35" selection-start-line="84" selection-start-column="35" selection-end-line="84" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="59" lean-forward="true" selection-start-line="59" selection-end-line="59" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="60" column="1" lean-forward="true" selection-start-line="60" selection-start-column="1" selection-end-line="60" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="145" column="35" selection-start-line="145" selection-start-column="35" selection-end-line="145" selection-end-column="35" />
+        </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="274">
+          <caret line="350" column="35" selection-start-line="350" selection-start-column="35" selection-end-line="350" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="121" column="39" selection-start-line="121" selection-start-column="39" selection-end-line="121" selection-end-column="39" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="28" column="8" lean-forward="true" selection-start-line="28" selection-start-column="8" selection-end-line="28" selection-end-column="8" />
+        <state relative-caret-position="340">
+          <caret line="103" selection-start-line="103" selection-end-line="103" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="226" column="35" selection-start-line="226" selection-start-column="35" selection-end-line="226" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="203" column="35" selection-start-line="203" selection-start-column="35" selection-end-line="203" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="241" column="35" selection-start-line="241" selection-start-column="35" selection-end-line="241" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="225" column="1" lean-forward="true" selection-start-line="225" selection-start-column="1" selection-end-line="225" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="176" column="5" lean-forward="true" selection-start-line="176" selection-start-column="5" selection-end-line="176" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="178" column="35" lean-forward="true" selection-start-line="178" selection-start-column="35" selection-end-line="178" selection-end-column="35" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="516">
-          <caret line="94" column="53" selection-start-line="94" selection-start-column="53" selection-end-line="94" selection-end-column="53" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="814">
-          <caret line="52" column="9" lean-forward="true" selection-start-line="52" selection-start-column="9" selection-end-line="52" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="182">
-          <caret line="58" column="12" lean-forward="true" selection-start-line="58" selection-start-column="12" selection-end-line="58" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="34" lean-forward="true" selection-start-line="34" selection-end-line="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="32" lean-forward="true" selection-start-line="32" selection-end-line="32" />
-          <folding>
-            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
-            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="185">
-          <caret line="63" column="13" selection-start-line="63" selection-start-column="13" selection-end-line="63" selection-end-column="13" />
-          <folding>
-            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
-            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
-            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="e#6319#6324#0" />
-            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
-          </folding>
+          <caret line="240" lean-forward="true" selection-start-line="240" selection-end-line="240" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
-          <caret line="58" column="28" lean-forward="true" selection-start-line="58" selection-start-column="28" selection-end-line="58" selection-end-column="28" />
-          <folding>
-            <element signature="method#addTempHumData#0;class#PgTempHumRs#0" />
-          </folding>
+        <state relative-caret-position="340">
+          <caret line="148" column="34" selection-start-line="148" selection-start-column="34" selection-end-line="148" selection-end-column="34" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
+        <state relative-caret-position="458">
+          <caret line="99" column="35" selection-start-line="99" selection-start-column="35" selection-end-line="99" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+        <state relative-caret-position="384">
+          <caret line="145" column="32" lean-forward="true" selection-start-line="145" selection-start-column="32" selection-end-line="145" selection-end-column="32" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="414">
-          <caret line="22" column="46" lean-forward="true" selection-start-line="22" selection-start-column="46" selection-end-line="22" selection-end-column="46" />
-        </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="396">
-          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" column="83" selection-start-line="11" selection-start-column="83" selection-end-line="11" selection-end-column="83" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="26">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
-          <folding>
-            <element signature="method#getPgInPgStatusByPerson#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNumByName#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNum#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPersonListByDay#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPgStatusByPgInPgPerson#0;class#PgInPgStatusManager#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="44">
-          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-12">
-          <caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="87" lean-forward="true" selection-start-line="87" selection-end-line="87" />
-          <folding>
-            <element signature="method#getConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#addConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#deleteConstructionType#0;class#PgConstructionTypeRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
-          <folding>
-            <element signature="method#getConstructionTypeByType#0;class#PgConstructionTypeManager#0" />
-            <element signature="method#getAllConstructionTypeDto#0;class#PgConstructionTypeManager#0" />
-          </folding>
-        </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="145">
-          <caret line="258" column="9" lean-forward="true" selection-start-line="258" selection-start-column="9" selection-end-line="258" selection-end-column="9" />
-          <folding>
-            <element signature="method#getMonthInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayInPgStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgOverViewRs#0" />
-            <element signature="method#getAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getMonthAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayAlarmStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgOverViewRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="103">
-          <caret line="105" column="50" lean-forward="true" selection-start-line="105" selection-start-column="50" selection-end-line="105" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateBasicDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="99">
-          <caret line="125" selection-start-line="125" selection-end-line="125" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="190">
-          <caret line="24" column="35" lean-forward="true" selection-start-line="24" selection-start-column="35" selection-end-line="24" selection-end-column="35" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="436">
-          <caret line="24" lean-forward="true" selection-start-line="24" selection-end-line="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" lean-forward="true" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="300">
-          <caret line="34" column="31" lean-forward="true" selection-start-line="34" selection-start-column="31" selection-end-line="34" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="42" column="13" lean-forward="true" selection-start-line="42" selection-start-column="13" selection-end-line="42" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="120" column="72" lean-forward="true" selection-start-line="120" selection-start-column="72" selection-end-line="120" selection-end-column="72" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="293">
-          <caret line="58" column="73" lean-forward="true" selection-start-line="58" selection-start-column="73" selection-end-line="58" selection-end-column="73" />
-          <folding>
-            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
-            <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
-          </folding>
-        </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="307">
-          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
+        <state relative-caret-position="758">
+          <caret line="130" column="5" lean-forward="true" selection-start-line="130" selection-start-column="5" selection-end-line="130" selection-end-column="5" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1170">
-          <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
+        <state relative-caret-position="494">
+          <caret line="86" column="62" lean-forward="true" selection-start-line="86" selection-start-column="62" selection-end-line="86" selection-end-column="62" />
           <folding>
-            <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-            <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+            <element signature="method#getAllDevice#0;class#PgDeviceManager#0" />
+            <element signature="method#getAllDev#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="195" column="28" lean-forward="true" selection-start-line="195" selection-start-column="28" selection-end-line="195" selection-end-column="28" />
+        <state relative-caret-position="166">
+          <caret line="174" column="13" lean-forward="true" selection-start-line="174" selection-start-column="13" selection-end-line="174" selection-end-column="13" />
           <folding>
-            <element signature="method#getAlarmByTypeAndTime#0;class#PgAlarmManager#0" />
-            <element signature="method#getAlarmNum#0;class#PgAlarmManager#0" />
             <element signature="method#getDayAlarmStatistic#0;class#PgAlarmManager#0" />
+            <element signature="method#getAlarmList#0;class#PgAlarmManager#0" />
             <element signature="method#createDTO#0;class#PgAlarmManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="364">
+          <caret line="46" column="56" lean-forward="true" selection-start-line="46" selection-start-column="56" selection-end-line="46" selection-end-column="56" />
+          <folding>
+            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
+            <element signature="method#getPgDev#0;class#PgDeviceRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
+            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+        <state relative-caret-position="396">
+          <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
           <folding>
             <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
             <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -1365,52 +1331,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="239">
-          <caret line="21" column="33" lean-forward="true" selection-start-line="21" selection-start-column="33" selection-end-line="21" selection-end-column="33" />
-        </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="352">
-          <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-        </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="99">
-          <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-          </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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-          <folding>
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-            <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>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
index c436c93..e913155 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
@@ -132,7 +132,10 @@
             this.setAlarmType("");
         else
             this.setAlarmType(pgAlarm.getAlarmTypeId().getAlarmType());
-        this.setAlarmValue(pgAlarm.getAlarmValue());
+        if(pgAlarm.getAlarmValue()==null)
+            this.setAlarmValue("");
+        else
+            this.setAlarmValue(pgAlarm.getAlarmValue());
         if (pgAlarm.getAlarmDate() != null)
             this.setAlarmDate(sdf.format(pgAlarm.getAlarmDate()));
         else
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
index a43965c..565cb41 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -159,11 +159,21 @@
     }
 
     //获取历史报警消息列表
-    public List<PgAlarmDto> getAllAlarm(String alarmType,String startDay,String endDay,String isNew,int page,int rows) {
-        try {
+    public  Map<String, Object> getAllAlarm(String alarmType,String partition,String startDay,String endDay,String isNew,int page,int rows) {
 
+        Map<String, Object> resultMap = new HashMap<>();
+        String msg="";
+
+        try {
             Criteria criteria = createCriteria(PgAlarm.class);
 
+            if (StringUtils.isNotBlank(partition)) {
+                DetachedCriteria inCriteria = DetachedCriteria.forClass(PgDevice.class);
+                inCriteria.add(Restrictions.eq("partition", partition));
+                inCriteria.setProjection(Property.forName("id"));
+                criteria.add(Property.forName("alarmDevId").in(inCriteria));
+            }
+
             if (StringUtils.isNotBlank(alarmType)&&!alarmType.contains("全部")&&pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
                 criteria.add(Restrictions.eq("alarmTypeId", pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)));
 
@@ -190,8 +200,16 @@
             for (PgAlarm pgAlarm : pgAlarmList) {
                 pgAlarmDtoList.add(new PgAlarmDto(pgAlarm));
             }
-
-            return pgAlarmDtoList;
+            if(pgAlarmDtoList==null||pgAlarmDtoList.size()==0) {
+                resultMap.put("msg", "没有报警信息");
+                resultMap.put("code","0");
+            }else {
+                resultMap.put("code","200");
+                resultMap.put("msg", "报警信息获取成功");
+            }
+            resultMap.put("count",pg.getTotalCount());
+            resultMap.put("result",pgAlarmDtoList);
+            return resultMap;
         }
         catch(Exception ex){
             ex.printStackTrace();
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index 7547560..654f49e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -24,11 +24,11 @@
 
         Criteria criteria = createCriteria(PgDevice.class);
 
-        if(road!=null)
+        if(StringUtils.isNotBlank(road))
             criteria.add(Restrictions.eq("road",road));
-        if(partition!=null)
+        if(StringUtils.isNotBlank(partition))
             criteria.add(Restrictions.eq("partition",partition));
-        if(devType!=null)
+        if(StringUtils.isNotBlank(devType))
             criteria.add(Restrictions.eq("devType",devType));
 
         criteria.add(Restrictions.eq("active", 1));
@@ -43,6 +43,29 @@
         return pgDeviceDtoList;
     }
 
+    public List<PgDeviceDto> getAllDev(String road,String partition,String devType) {
+
+        Criteria criteria = createCriteria(PgDevice.class);
+
+        if(StringUtils.isNotBlank(road))
+            criteria.add(Restrictions.eq("road",road));
+        if(StringUtils.isNotBlank(partition))
+            criteria.add(Restrictions.eq("partition",partition));
+        if(StringUtils.isNotBlank(devType))
+            criteria.add(Restrictions.like("devType","%"+devType+"%"));
+
+        criteria.add(Restrictions.eq("active", 1));
+        criteria.addOrder(Order.desc("id"));
+        List<PgDevice> pgDeviceList = criteria.list();
+
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
+        for (PgDevice pgDevice : pgDeviceList) {
+            pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
+        }
+
+        return pgDeviceDtoList;
+    }
+
     //根据名字获取当前设备
     public PgDevice getDeviceByAssetCode(String assetCode) {
         Criteria criteria=createCriteria(PgDevice.class);
@@ -56,9 +79,9 @@
     }
 
     //根据类型获取设备列表
-    public List<PgDeviceDto> getDeviceByDevTypee(String devType) {
+    public List<PgDeviceDto> getDeviceByDevType(String devType) {
         Criteria criteria=createCriteria(PgDevice.class);
-        criteria.add(Restrictions.eq("devType",devType));
+        criteria.add(Restrictions.like("devType","%"+devType+"%"));
 
         List<PgDevice> pgDeviceList=criteria.list();
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
@@ -106,7 +129,7 @@
         criteria.add(Restrictions.eq("partition",partition));
 
         List<PgDevice> pgDeviceList=criteria.list();
-        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<PgDeviceDto>();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
 
         for (PgDevice pgDevice : pgDeviceList) {
             pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
index 3a3bccd..595730e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
@@ -1,10 +1,13 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.devTable.domain.PgAlarmType;
 import com.casic.PgInterface.devTable.domain.PgPartition;
 import com.casic.PgInterface.devTable.domain.PgRoad;
 import com.casic.PgInterface.devTable.domain.PipeGallery;
 import com.casic.PgInterface.devTable.dto.PgPartitionDto;
+import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
@@ -12,7 +15,9 @@
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Created by yxw on 2017/11/4.
@@ -21,7 +26,8 @@
 public class PgPartitionManager extends HibernateEntityDao<PgPartition> {
 
     @Resource
-    PgRoadManager pgRoadManager;
+    private PgRoadManager pgRoadManager;
+
 
     public PgPartition getPartitionByParName(String parName) {
         Criteria criteria = getSession().createCriteria(PgPartition.class);
@@ -99,4 +105,5 @@
         return pgPartitionDtoList;
     }
 
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
index f216360..a6928f1 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
@@ -5,6 +5,7 @@
 public class PgPlanResultRe {
 
     private String taskKey;
+    private List<String> pileAcuList;
     private List<PgPlanResult> pgPlanResultList;
 
     public String getTaskKey() {
@@ -15,6 +16,14 @@
         this.taskKey = taskKey;
     }
 
+    public List<String> getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(List<String> pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+
     public List<PgPlanResult> getPgPlanResultList() {
         return pgPlanResultList;
     }
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
index 71ea765..47eea07 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
@@ -54,9 +54,7 @@
 
         List<PgLineHole> pgLineHoleList=criteria.list();
         List<PgLineHoleDTO> pgLineHoleDTOList=new ArrayList<>();
-        if(pgLineHoleList==null||pgLineHoleList.size()==0)
-            return null;
-        else
+        if(pgLineHoleList!=null&&pgLineHoleList.size()!=0)
             pgLineHoleDTOList=PgLineHoleDTO.ConvertToDTOList(pgLineHoleList,pgPileAcuManager,pgRoadManager);
         return pgLineHoleDTOList;
     }
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
index 0fd9e1f..841a386 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
@@ -1,12 +1,15 @@
 package com.casic.PgInterface.intelPlan.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.devTable.domain.PgPartition;
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
 import com.casic.PgInterface.intelPlan.domain.PgLineHole;
 import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
 import com.casic.PgInterface.intelPlan.domain.PgSection;
 import com.casic.PgInterface.intelPlan.dto.PgPlanResult;
 import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
 import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -22,6 +25,9 @@
     @Resource
     private PgLineHoleManager pgLineHoleManager;
 
+    @Resource
+    private PgRoadManager pgRoadManager;
+
     public PgPileAcu getPgPileAcuByCode(String acuCode){
         List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
 
@@ -58,7 +64,9 @@
         for(PgPlanTask pgPlanTask:pgPlanTaskList){
             List<PgPlanResult> pgPlanResultList=getPgPlanResultByPlantask(pgPlanTask);
             PgPlanResultRe pgPlanResultRe=new PgPlanResultRe();
+
             pgPlanResultRe.setTaskKey(pgPlanTask.getTaskKey());
+            pgPlanResultRe.setPileAcuList(pgPlanTask.getPileAcuList());
             pgPlanResultRe.setPgPlanResultList(pgPlanResultList);
 
             pgPlanResultReList.add(pgPlanResultRe);
@@ -142,4 +150,57 @@
         return length;
     }
 
+    private PgPileAcu getPgPileAcuByAcuCode(String acuCode){
+        List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
+
+        if(pgPileAcuList==null||pgPileAcuList.size()==0)
+            return null;
+        else
+            return pgPileAcuList.get(0);
+    }
+
+    public List<PgAcuTask> getACUTask(String pileAcuList){
+        String[] acuArray=pileAcuList.split(",");
+        List<PgAcuTask> pgAcuTaskList=new ArrayList<>();
+
+        for(String acu:acuArray){
+            PgPileAcu pgPileAcu=this.getPgPileAcuByCode(acu);
+            String roadName=pgRoadManager.get(pgPileAcu.getRoadId()).getRoadName();
+
+            if(!containRoad(roadName,pgAcuTaskList))
+            {
+                PgAcuTask pgAcuTask=new PgAcuTask();
+                pgAcuTask.setRoadName(roadName);
+                pgAcuTask.setPileAcuList(acu);
+                pgAcuTaskList.add(pgAcuTask);
+            }
+            else{
+                PgAcuTask pgAcuTask=getIndexRoad(roadName,pgAcuTaskList);
+                if(pgAcuTask!=null)
+                    pgAcuTask.setPileAcuList(pgAcuTask.getPileAcuList()+","+acu);
+            }
+        }
+
+        return pgAcuTaskList;
+    }
+
+    private boolean containRoad(String roadName,List<PgAcuTask> pgAcuTaskList){
+        if(pgAcuTaskList==null||pgAcuTaskList.size()==0) return false;
+        for(PgAcuTask pgAcuTask:pgAcuTaskList){
+            if(pgAcuTask.getRoadName().equals(roadName))
+                return true;
+        }
+
+        return false;
+    }
+
+    private PgAcuTask getIndexRoad(String roadName, List<PgAcuTask> pgAcuTaskList){
+        for(PgAcuTask pgAcuTask:pgAcuTaskList){
+            if(pgAcuTask.getRoadName().equals(roadName))
+                return pgAcuTask;
+        }
+
+        return null;
+    }
+
 }
\ No newline at end of file

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 25ded8a..283d7ab 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,20 +7,56 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" 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/construction/manager/PgCsDocumentManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/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/manager/PgAlarmManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/~$说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/~$说明20191207.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.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$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/接口说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明20191207.docx" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
@@ -51,7 +87,7 @@
         <counts>
           <entry key="class" value="4" />
           <entry key="iml" value="2" />
-          <entry key="java" value="707" />
+          <entry key="java" value="820" />
           <entry key="properties" value="14" />
           <entry key="xml" value="7" />
         </counts>
@@ -60,7 +96,7 @@
         <counts>
           <entry key="CLASS" value="4" />
           <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="707" />
+          <entry key="JAVA" value="820" />
           <entry key="Properties" value="14" />
           <entry key="XML" value="7" />
         </counts>
@@ -68,32 +104,32 @@
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
           <entry key="dummy" value="38" />
-          <entry key="java" value="30161" />
+          <entry key="java" value="40859" />
           <entry key="properties" value="100" />
-          <entry key="txt" value="176" />
+          <entry key="txt" value="186" />
           <entry key="xml" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="30161" />
-          <entry key="PLAIN_TEXT" value="214" />
+          <entry key="JAVA" value="40859" />
+          <entry key="PLAIN_TEXT" value="224" />
           <entry key="Properties" value="100" />
           <entry key="XML" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="48" />
+          <entry key="project.closed" value="51" />
           <entry key="project.open.time.1" value="5" />
           <entry key="project.open.time.12" value="2" />
           <entry key="project.open.time.13" value="1" />
           <entry key="project.open.time.15" value="1" />
           <entry key="project.open.time.16" value="1" />
           <entry key="project.open.time.17" value="1" />
-          <entry key="project.open.time.2" value="1" />
+          <entry key="project.open.time.2" value="2" />
           <entry key="project.open.time.20" value="1" />
-          <entry key="project.open.time.23" value="1" />
+          <entry key="project.open.time.23" value="2" />
           <entry key="project.open.time.24" value="2" />
           <entry key="project.open.time.251" value="1" />
           <entry key="project.open.time.27" value="2" />
@@ -106,8 +142,8 @@
           <entry key="project.open.time.36" value="1" />
           <entry key="project.open.time.37" value="1" />
           <entry key="project.open.time.39" value="2" />
-          <entry key="project.open.time.4" value="2" />
-          <entry key="project.open.time.40" value="1" />
+          <entry key="project.open.time.4" value="3" />
+          <entry key="project.open.time.40" value="2" />
           <entry key="project.open.time.41" value="2" />
           <entry key="project.open.time.42" value="2" />
           <entry key="project.open.time.43" value="2" />
@@ -122,23 +158,25 @@
           <entry key="project.open.time.6" value="3" />
           <entry key="project.open.time.63" value="2" />
           <entry key="project.open.time.64" value="1" />
+          <entry key="project.open.time.66" value="1" />
           <entry key="project.open.time.71" value="2" />
+          <entry key="project.open.time.74" value="1" />
           <entry key="project.open.time.76" value="1" />
           <entry key="project.open.time.8" value="2" />
           <entry key="project.open.time.9" value="1" />
           <entry key="project.open.time.97" value="1" />
-          <entry key="project.opened" value="78" />
+          <entry key="project.opened" value="84" />
         </counts>
       </usages-collector>
     </session>
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+            <state relative-caret-position="396">
+              <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
               <folding>
                 <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
                 <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -147,73 +185,6 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <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="99">
-              <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-              <folding>
-                <element signature="imports" expanded="true" />
-                <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-1170">
-              <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state>
-              <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
-              <folding>
-                <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-                <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="true">
-        <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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-              <folding>
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-                <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>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <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="352">
-              <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -225,18 +196,9 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>inCriteria</find>
-      <find>getPgPlanResulList</find>
-      <find>getPileAcuListByPileAcuStr</find>
-      <find>distinct</find>
-      <find>order</find>
-      <find>canPlanLine</find>
-      <find>isExistLine</find>
-      <find>getPlanResult</find>
       <find>pgPipeLine</find>
       <find>getPipeLineBylineName</find>
       <find>StringU</find>
-      <find>getAllAlarm</find>
       <find>getAlarmList</find>
       <find>getPgInPersonListByDay</find>
       <find>getDayInPgStatistic</find>
@@ -254,7 +216,16 @@
       <find>getPgContructionByNameOrType</find>
       <find>&quot;&quot;,&quot;&quot;,</find>
       <find>getPgContructionDtoByNameOrType</find>
+      <find>addConstruction</find>
+      <find>getPgLineAcuHole</find>
+      <find>getPlanResult</find>
       <find>getConstruction</find>
+      <find>addPipeLine</find>
+      <find>未找到入廊数据</find>
+      <find>getCurrentHoleByAcu</find>
+      <find>getAllAlarm</find>
+      <find>getPgDeviceDtoListByPartition</find>
+      <find>getPgDeviceByDevType</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -263,57 +234,57 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlan.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileHoleManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/planData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/PlanData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
       </list>
     </option>
   </component>
@@ -359,7 +330,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -421,53 +391,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="dto" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="manager" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -479,29 +402,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="rs" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -516,6 +416,7 @@
         </subPane>
       </pane>
       <pane id="Scope" />
+      <pane id="PackagesPane" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -710,7 +611,13 @@
       <workItem from="1574902733573" duration="1829000" />
       <workItem from="1574998240004" duration="7016000" />
       <workItem from="1575247959683" duration="6997000" />
-      <workItem from="1575704345590" duration="40473000" />
+      <workItem from="1575704345590" duration="69381000" />
+      <workItem from="1575869479666" duration="721000" />
+      <workItem from="1575947104878" duration="6101000" />
+      <workItem from="1576128264436" duration="3347000" />
+      <workItem from="1576208571543" duration="22000" />
+      <workItem from="1576227513917" duration="862000" />
+      <workItem from="1576293721220" duration="18246000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -817,11 +724,18 @@
       <option name="project" value="LOCAL" />
       <updated>1575775489149</updated>
     </task>
-    <option name="localTasksCounter" value="16" />
+    <task id="LOCAL-00016" summary="整改施工信息">
+      <created>1575791780774</created>
+      <option name="number" value="00016" />
+      <option name="presentableId" value="LOCAL-00016" />
+      <option name="project" value="LOCAL" />
+      <updated>1575791780774</updated>
+    </task>
+    <option name="localTasksCounter" value="17" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="452131000" />
+    <option name="totallyTimeSpent" value="510338000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -834,9 +748,8 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
-    <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.24205749" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2647504" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -847,7 +760,7 @@
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.3295082" />
       <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.4819672" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.65737706" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.3295082" />
@@ -939,7 +852,8 @@
     <MESSAGE value="重新设计智能规划部分" />
     <MESSAGE value="完成智能规划对接" />
     <MESSAGE value="修改报警统计" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改报警统计" />
+    <MESSAGE value="整改施工信息" />
+    <option name="LAST_COMMIT_MESSAGE" value="整改施工信息" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -951,16 +865,10 @@
           <option name="timeStamp" value="3" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java</url>
-          <line>69</line>
+          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java</url>
+          <line>40</line>
           <properties />
-          <option name="timeStamp" value="21" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java</url>
-          <line>96</line>
-          <properties />
-          <option name="timeStamp" value="38" />
+          <option name="timeStamp" value="122" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
@@ -970,394 +878,452 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <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="2068">
-          <caret line="154" column="35" selection-start-line="154" selection-start-column="35" selection-end-line="154" selection-end-column="35" />
-        </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="3300">
-          <caret line="297" column="22" selection-start-line="297" selection-start-column="22" selection-end-line="297" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/StringUtils.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
-          <caret line="13" column="48" lean-forward="true" selection-start-line="13" selection-start-column="48" selection-end-line="13" selection-end-column="48" />
+          <caret line="11" column="5" selection-start-line="11" selection-start-column="5" selection-end-line="11" selection-end-column="5" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="78" lean-forward="true" selection-start-line="78" selection-end-line="78" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="616">
-          <caret line="41" column="1" selection-start-line="41" selection-start-column="1" selection-end-line="41" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="110">
-          <caret line="12" column="23" selection-start-line="12" selection-start-column="23" selection-end-line="12" selection-end-column="23" />
+        <state relative-caret-position="516">
+          <caret line="114" column="12" selection-start-line="114" selection-start-column="12" selection-end-line="114" selection-end-column="12" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="164">
-          <caret line="56" lean-forward="true" selection-start-line="56" selection-end-line="56" />
+        <state relative-caret-position="418">
+          <caret line="33" column="44" selection-start-line="33" selection-start-column="44" selection-end-line="33" selection-end-column="44" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="258">
-          <caret line="27" column="12" lean-forward="true" selection-start-line="27" selection-start-column="12" selection-end-line="27" selection-end-column="12" />
+        <state relative-caret-position="132">
+          <caret line="11" column="20" lean-forward="true" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="20" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.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="-12">
-          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        <state relative-caret-position="516">
+          <caret line="142" column="54" selection-start-line="142" selection-start-column="54" selection-end-line="142" selection-end-column="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="858">
-          <caret line="55" column="27" lean-forward="true" selection-start-line="55" selection-start-column="27" selection-end-line="55" selection-end-column="27" />
+        <state relative-caret-position="66">
+          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="58">
+          <caret line="18" column="28" selection-start-line="18" selection-start-column="19" selection-end-line="18" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="305">
+          <caret line="24" column="31" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="714">
+          <caret line="58" column="5" lean-forward="true" selection-start-line="58" selection-start-column="5" selection-end-line="58" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="924">
+          <caret line="134" column="92" selection-start-line="134" selection-start-column="92" selection-end-line="134" selection-end-column="92" />
+          <folding>
+            <element signature="method#linkDevice#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkPartitionCamera#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkReservePlan#0;class#PgAlarmLinkRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1066">
+          <caret line="90" lean-forward="true" selection-start-line="90" selection-end-line="90" />
+          <folding>
+            <element signature="method#getTjResultByAlarmType#0;class#PgAlarmTjRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="946">
+          <caret line="148" column="11" lean-forward="true" selection-start-line="148" selection-start-column="11" selection-end-line="148" selection-end-column="11" />
+          <folding>
+            <element signature="method#getAlarmTypeList#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#addAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#editAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#deleteAlarmType#0;class#PgAlarmTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="208">
+          <caret line="46" column="23" lean-forward="true" selection-start-line="46" selection-start-column="23" selection-end-line="46" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="113" column="9" lean-forward="true" selection-start-line="113" selection-start-column="9" selection-end-line="113" selection-end-column="9" />
+          <folding>
+            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
+            <element signature="method#getNewestCh4InfoByDev#0;class#PgCh4Rs#0" />
+            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="145" column="6" lean-forward="true" selection-start-line="145" selection-start-column="6" selection-end-line="145" selection-end-column="6" />
+          <folding>
+            <element signature="method#addAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#editAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#deleteAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#getAuthorityList#0;class#PgAuthorityRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="58" column="1" lean-forward="true" selection-start-line="58" selection-start-column="1" selection-end-line="58" selection-end-column="1" />
+          <folding>
+            <element signature="method#getPgAssetPlanList#0;class#PgAssetPlanRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="370">
+          <caret line="371" column="66" selection-start-line="371" selection-start-column="66" selection-end-line="371" selection-end-column="66" />
+          <folding>
+            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#searchConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionDev#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="139" column="13" lean-forward="true" selection-start-line="139" selection-start-column="13" selection-end-line="139" selection-end-column="13" />
+          <folding>
+            <element signature="method#getCoInfoByDevAndDate#0;class#PgCoRs#0" />
+            <element signature="method#getNewestCoInfoByDev#0;class#PgCoRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="540">
+          <caret line="223" column="5" lean-forward="true" selection-start-line="223" selection-start-column="5" selection-end-line="223" selection-end-column="5" />
+          <folding>
+            <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="682">
+          <caret line="100" lean-forward="true" selection-start-line="100" selection-end-line="100" />
+          <folding>
+            <element signature="method#getDeviceTpeyList#0;class#PgDeviceTypeRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="377">
+          <caret line="225" column="35" selection-start-line="225" selection-start-column="35" selection-end-line="225" selection-end-column="35" />
+          <folding>
+            <element signature="method#addEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#addEquipment#1;class#PgEquipmentRs#0" />
+            <element signature="method#getEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#deleteEquipment#0;class#PgEquipmentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="406">
+          <caret line="109" lean-forward="true" selection-start-line="109" selection-end-line="109" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="154">
+          <caret line="28" column="19" selection-start-line="28" selection-start-column="19" selection-end-line="28" selection-end-column="19" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="748">
-          <caret line="49" column="5" lean-forward="true" selection-start-line="49" selection-start-column="5" selection-end-line="49" selection-end-column="5" />
+        <state relative-caret-position="296">
+          <caret line="161" column="35" selection-start-line="161" selection-start-column="35" selection-end-line="161" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="384">
+          <caret line="99" column="5" lean-forward="true" selection-start-line="99" selection-start-column="5" selection-end-line="99" selection-end-column="5" />
+        </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="362">
+          <caret line="340" column="35" selection-start-line="340" selection-start-column="35" selection-end-line="340" selection-end-column="35" />
+          <folding>
+            <element signature="method#addInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPersonInPg#0;class#PgInPgPersonRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-606">
+          <caret line="76" column="20" lean-forward="true" selection-start-line="76" selection-start-column="20" selection-end-line="76" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="65" column="35" selection-start-line="65" selection-start-column="35" selection-end-line="65" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="101" column="35" selection-start-line="101" selection-start-column="35" selection-end-line="101" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="84" column="35" selection-start-line="84" selection-start-column="35" selection-end-line="84" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="59" lean-forward="true" selection-start-line="59" selection-end-line="59" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="60" column="1" lean-forward="true" selection-start-line="60" selection-start-column="1" selection-end-line="60" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="145" column="35" selection-start-line="145" selection-start-column="35" selection-end-line="145" selection-end-column="35" />
+        </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="274">
+          <caret line="350" column="35" selection-start-line="350" selection-start-column="35" selection-end-line="350" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="121" column="39" selection-start-line="121" selection-start-column="39" selection-end-line="121" selection-end-column="39" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="28" column="8" lean-forward="true" selection-start-line="28" selection-start-column="8" selection-end-line="28" selection-end-column="8" />
+        <state relative-caret-position="340">
+          <caret line="103" selection-start-line="103" selection-end-line="103" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="226" column="35" selection-start-line="226" selection-start-column="35" selection-end-line="226" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="203" column="35" selection-start-line="203" selection-start-column="35" selection-end-line="203" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="241" column="35" selection-start-line="241" selection-start-column="35" selection-end-line="241" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="225" column="1" lean-forward="true" selection-start-line="225" selection-start-column="1" selection-end-line="225" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="176" column="5" lean-forward="true" selection-start-line="176" selection-start-column="5" selection-end-line="176" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="178" column="35" lean-forward="true" selection-start-line="178" selection-start-column="35" selection-end-line="178" selection-end-column="35" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="516">
-          <caret line="94" column="53" selection-start-line="94" selection-start-column="53" selection-end-line="94" selection-end-column="53" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="814">
-          <caret line="52" column="9" lean-forward="true" selection-start-line="52" selection-start-column="9" selection-end-line="52" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="182">
-          <caret line="58" column="12" lean-forward="true" selection-start-line="58" selection-start-column="12" selection-end-line="58" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="34" lean-forward="true" selection-start-line="34" selection-end-line="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="32" lean-forward="true" selection-start-line="32" selection-end-line="32" />
-          <folding>
-            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
-            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="185">
-          <caret line="63" column="13" selection-start-line="63" selection-start-column="13" selection-end-line="63" selection-end-column="13" />
-          <folding>
-            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
-            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
-            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="e#6319#6324#0" />
-            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
-          </folding>
+          <caret line="240" lean-forward="true" selection-start-line="240" selection-end-line="240" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
-          <caret line="58" column="28" lean-forward="true" selection-start-line="58" selection-start-column="28" selection-end-line="58" selection-end-column="28" />
-          <folding>
-            <element signature="method#addTempHumData#0;class#PgTempHumRs#0" />
-          </folding>
+        <state relative-caret-position="340">
+          <caret line="148" column="34" selection-start-line="148" selection-start-column="34" selection-end-line="148" selection-end-column="34" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
+        <state relative-caret-position="458">
+          <caret line="99" column="35" selection-start-line="99" selection-start-column="35" selection-end-line="99" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+        <state relative-caret-position="384">
+          <caret line="145" column="32" lean-forward="true" selection-start-line="145" selection-start-column="32" selection-end-line="145" selection-end-column="32" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="414">
-          <caret line="22" column="46" lean-forward="true" selection-start-line="22" selection-start-column="46" selection-end-line="22" selection-end-column="46" />
-        </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="396">
-          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" column="83" selection-start-line="11" selection-start-column="83" selection-end-line="11" selection-end-column="83" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="26">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
-          <folding>
-            <element signature="method#getPgInPgStatusByPerson#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNumByName#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNum#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPersonListByDay#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPgStatusByPgInPgPerson#0;class#PgInPgStatusManager#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="44">
-          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-12">
-          <caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="87" lean-forward="true" selection-start-line="87" selection-end-line="87" />
-          <folding>
-            <element signature="method#getConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#addConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#deleteConstructionType#0;class#PgConstructionTypeRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
-          <folding>
-            <element signature="method#getConstructionTypeByType#0;class#PgConstructionTypeManager#0" />
-            <element signature="method#getAllConstructionTypeDto#0;class#PgConstructionTypeManager#0" />
-          </folding>
-        </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="145">
-          <caret line="258" column="9" lean-forward="true" selection-start-line="258" selection-start-column="9" selection-end-line="258" selection-end-column="9" />
-          <folding>
-            <element signature="method#getMonthInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayInPgStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgOverViewRs#0" />
-            <element signature="method#getAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getMonthAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayAlarmStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgOverViewRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="103">
-          <caret line="105" column="50" lean-forward="true" selection-start-line="105" selection-start-column="50" selection-end-line="105" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateBasicDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="99">
-          <caret line="125" selection-start-line="125" selection-end-line="125" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="190">
-          <caret line="24" column="35" lean-forward="true" selection-start-line="24" selection-start-column="35" selection-end-line="24" selection-end-column="35" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="436">
-          <caret line="24" lean-forward="true" selection-start-line="24" selection-end-line="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" lean-forward="true" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="300">
-          <caret line="34" column="31" lean-forward="true" selection-start-line="34" selection-start-column="31" selection-end-line="34" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="42" column="13" lean-forward="true" selection-start-line="42" selection-start-column="13" selection-end-line="42" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="120" column="72" lean-forward="true" selection-start-line="120" selection-start-column="72" selection-end-line="120" selection-end-column="72" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="293">
-          <caret line="58" column="73" lean-forward="true" selection-start-line="58" selection-start-column="73" selection-end-line="58" selection-end-column="73" />
-          <folding>
-            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
-            <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
-          </folding>
-        </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="307">
-          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
+        <state relative-caret-position="758">
+          <caret line="130" column="5" lean-forward="true" selection-start-line="130" selection-start-column="5" selection-end-line="130" selection-end-column="5" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1170">
-          <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
+        <state relative-caret-position="494">
+          <caret line="86" column="62" lean-forward="true" selection-start-line="86" selection-start-column="62" selection-end-line="86" selection-end-column="62" />
           <folding>
-            <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-            <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+            <element signature="method#getAllDevice#0;class#PgDeviceManager#0" />
+            <element signature="method#getAllDev#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="195" column="28" lean-forward="true" selection-start-line="195" selection-start-column="28" selection-end-line="195" selection-end-column="28" />
+        <state relative-caret-position="166">
+          <caret line="174" column="13" lean-forward="true" selection-start-line="174" selection-start-column="13" selection-end-line="174" selection-end-column="13" />
           <folding>
-            <element signature="method#getAlarmByTypeAndTime#0;class#PgAlarmManager#0" />
-            <element signature="method#getAlarmNum#0;class#PgAlarmManager#0" />
             <element signature="method#getDayAlarmStatistic#0;class#PgAlarmManager#0" />
+            <element signature="method#getAlarmList#0;class#PgAlarmManager#0" />
             <element signature="method#createDTO#0;class#PgAlarmManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="364">
+          <caret line="46" column="56" lean-forward="true" selection-start-line="46" selection-start-column="56" selection-end-line="46" selection-end-column="56" />
+          <folding>
+            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
+            <element signature="method#getPgDev#0;class#PgDeviceRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
+            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+        <state relative-caret-position="396">
+          <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
           <folding>
             <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
             <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -1365,52 +1331,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="239">
-          <caret line="21" column="33" lean-forward="true" selection-start-line="21" selection-start-column="33" selection-end-line="21" selection-end-column="33" />
-        </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="352">
-          <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-        </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="99">
-          <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-          </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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-          <folding>
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-            <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>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
index c436c93..e913155 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
@@ -132,7 +132,10 @@
             this.setAlarmType("");
         else
             this.setAlarmType(pgAlarm.getAlarmTypeId().getAlarmType());
-        this.setAlarmValue(pgAlarm.getAlarmValue());
+        if(pgAlarm.getAlarmValue()==null)
+            this.setAlarmValue("");
+        else
+            this.setAlarmValue(pgAlarm.getAlarmValue());
         if (pgAlarm.getAlarmDate() != null)
             this.setAlarmDate(sdf.format(pgAlarm.getAlarmDate()));
         else
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
index a43965c..565cb41 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -159,11 +159,21 @@
     }
 
     //获取历史报警消息列表
-    public List<PgAlarmDto> getAllAlarm(String alarmType,String startDay,String endDay,String isNew,int page,int rows) {
-        try {
+    public  Map<String, Object> getAllAlarm(String alarmType,String partition,String startDay,String endDay,String isNew,int page,int rows) {
 
+        Map<String, Object> resultMap = new HashMap<>();
+        String msg="";
+
+        try {
             Criteria criteria = createCriteria(PgAlarm.class);
 
+            if (StringUtils.isNotBlank(partition)) {
+                DetachedCriteria inCriteria = DetachedCriteria.forClass(PgDevice.class);
+                inCriteria.add(Restrictions.eq("partition", partition));
+                inCriteria.setProjection(Property.forName("id"));
+                criteria.add(Property.forName("alarmDevId").in(inCriteria));
+            }
+
             if (StringUtils.isNotBlank(alarmType)&&!alarmType.contains("全部")&&pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
                 criteria.add(Restrictions.eq("alarmTypeId", pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)));
 
@@ -190,8 +200,16 @@
             for (PgAlarm pgAlarm : pgAlarmList) {
                 pgAlarmDtoList.add(new PgAlarmDto(pgAlarm));
             }
-
-            return pgAlarmDtoList;
+            if(pgAlarmDtoList==null||pgAlarmDtoList.size()==0) {
+                resultMap.put("msg", "没有报警信息");
+                resultMap.put("code","0");
+            }else {
+                resultMap.put("code","200");
+                resultMap.put("msg", "报警信息获取成功");
+            }
+            resultMap.put("count",pg.getTotalCount());
+            resultMap.put("result",pgAlarmDtoList);
+            return resultMap;
         }
         catch(Exception ex){
             ex.printStackTrace();
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index 7547560..654f49e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -24,11 +24,11 @@
 
         Criteria criteria = createCriteria(PgDevice.class);
 
-        if(road!=null)
+        if(StringUtils.isNotBlank(road))
             criteria.add(Restrictions.eq("road",road));
-        if(partition!=null)
+        if(StringUtils.isNotBlank(partition))
             criteria.add(Restrictions.eq("partition",partition));
-        if(devType!=null)
+        if(StringUtils.isNotBlank(devType))
             criteria.add(Restrictions.eq("devType",devType));
 
         criteria.add(Restrictions.eq("active", 1));
@@ -43,6 +43,29 @@
         return pgDeviceDtoList;
     }
 
+    public List<PgDeviceDto> getAllDev(String road,String partition,String devType) {
+
+        Criteria criteria = createCriteria(PgDevice.class);
+
+        if(StringUtils.isNotBlank(road))
+            criteria.add(Restrictions.eq("road",road));
+        if(StringUtils.isNotBlank(partition))
+            criteria.add(Restrictions.eq("partition",partition));
+        if(StringUtils.isNotBlank(devType))
+            criteria.add(Restrictions.like("devType","%"+devType+"%"));
+
+        criteria.add(Restrictions.eq("active", 1));
+        criteria.addOrder(Order.desc("id"));
+        List<PgDevice> pgDeviceList = criteria.list();
+
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
+        for (PgDevice pgDevice : pgDeviceList) {
+            pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
+        }
+
+        return pgDeviceDtoList;
+    }
+
     //根据名字获取当前设备
     public PgDevice getDeviceByAssetCode(String assetCode) {
         Criteria criteria=createCriteria(PgDevice.class);
@@ -56,9 +79,9 @@
     }
 
     //根据类型获取设备列表
-    public List<PgDeviceDto> getDeviceByDevTypee(String devType) {
+    public List<PgDeviceDto> getDeviceByDevType(String devType) {
         Criteria criteria=createCriteria(PgDevice.class);
-        criteria.add(Restrictions.eq("devType",devType));
+        criteria.add(Restrictions.like("devType","%"+devType+"%"));
 
         List<PgDevice> pgDeviceList=criteria.list();
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
@@ -106,7 +129,7 @@
         criteria.add(Restrictions.eq("partition",partition));
 
         List<PgDevice> pgDeviceList=criteria.list();
-        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<PgDeviceDto>();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
 
         for (PgDevice pgDevice : pgDeviceList) {
             pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
index 3a3bccd..595730e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
@@ -1,10 +1,13 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.devTable.domain.PgAlarmType;
 import com.casic.PgInterface.devTable.domain.PgPartition;
 import com.casic.PgInterface.devTable.domain.PgRoad;
 import com.casic.PgInterface.devTable.domain.PipeGallery;
 import com.casic.PgInterface.devTable.dto.PgPartitionDto;
+import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
@@ -12,7 +15,9 @@
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Created by yxw on 2017/11/4.
@@ -21,7 +26,8 @@
 public class PgPartitionManager extends HibernateEntityDao<PgPartition> {
 
     @Resource
-    PgRoadManager pgRoadManager;
+    private PgRoadManager pgRoadManager;
+
 
     public PgPartition getPartitionByParName(String parName) {
         Criteria criteria = getSession().createCriteria(PgPartition.class);
@@ -99,4 +105,5 @@
         return pgPartitionDtoList;
     }
 
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
index f216360..a6928f1 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
@@ -5,6 +5,7 @@
 public class PgPlanResultRe {
 
     private String taskKey;
+    private List<String> pileAcuList;
     private List<PgPlanResult> pgPlanResultList;
 
     public String getTaskKey() {
@@ -15,6 +16,14 @@
         this.taskKey = taskKey;
     }
 
+    public List<String> getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(List<String> pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+
     public List<PgPlanResult> getPgPlanResultList() {
         return pgPlanResultList;
     }
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
index 71ea765..47eea07 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
@@ -54,9 +54,7 @@
 
         List<PgLineHole> pgLineHoleList=criteria.list();
         List<PgLineHoleDTO> pgLineHoleDTOList=new ArrayList<>();
-        if(pgLineHoleList==null||pgLineHoleList.size()==0)
-            return null;
-        else
+        if(pgLineHoleList!=null&&pgLineHoleList.size()!=0)
             pgLineHoleDTOList=PgLineHoleDTO.ConvertToDTOList(pgLineHoleList,pgPileAcuManager,pgRoadManager);
         return pgLineHoleDTOList;
     }
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
index 0fd9e1f..841a386 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
@@ -1,12 +1,15 @@
 package com.casic.PgInterface.intelPlan.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.devTable.domain.PgPartition;
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
 import com.casic.PgInterface.intelPlan.domain.PgLineHole;
 import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
 import com.casic.PgInterface.intelPlan.domain.PgSection;
 import com.casic.PgInterface.intelPlan.dto.PgPlanResult;
 import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
 import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -22,6 +25,9 @@
     @Resource
     private PgLineHoleManager pgLineHoleManager;
 
+    @Resource
+    private PgRoadManager pgRoadManager;
+
     public PgPileAcu getPgPileAcuByCode(String acuCode){
         List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
 
@@ -58,7 +64,9 @@
         for(PgPlanTask pgPlanTask:pgPlanTaskList){
             List<PgPlanResult> pgPlanResultList=getPgPlanResultByPlantask(pgPlanTask);
             PgPlanResultRe pgPlanResultRe=new PgPlanResultRe();
+
             pgPlanResultRe.setTaskKey(pgPlanTask.getTaskKey());
+            pgPlanResultRe.setPileAcuList(pgPlanTask.getPileAcuList());
             pgPlanResultRe.setPgPlanResultList(pgPlanResultList);
 
             pgPlanResultReList.add(pgPlanResultRe);
@@ -142,4 +150,57 @@
         return length;
     }
 
+    private PgPileAcu getPgPileAcuByAcuCode(String acuCode){
+        List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
+
+        if(pgPileAcuList==null||pgPileAcuList.size()==0)
+            return null;
+        else
+            return pgPileAcuList.get(0);
+    }
+
+    public List<PgAcuTask> getACUTask(String pileAcuList){
+        String[] acuArray=pileAcuList.split(",");
+        List<PgAcuTask> pgAcuTaskList=new ArrayList<>();
+
+        for(String acu:acuArray){
+            PgPileAcu pgPileAcu=this.getPgPileAcuByCode(acu);
+            String roadName=pgRoadManager.get(pgPileAcu.getRoadId()).getRoadName();
+
+            if(!containRoad(roadName,pgAcuTaskList))
+            {
+                PgAcuTask pgAcuTask=new PgAcuTask();
+                pgAcuTask.setRoadName(roadName);
+                pgAcuTask.setPileAcuList(acu);
+                pgAcuTaskList.add(pgAcuTask);
+            }
+            else{
+                PgAcuTask pgAcuTask=getIndexRoad(roadName,pgAcuTaskList);
+                if(pgAcuTask!=null)
+                    pgAcuTask.setPileAcuList(pgAcuTask.getPileAcuList()+","+acu);
+            }
+        }
+
+        return pgAcuTaskList;
+    }
+
+    private boolean containRoad(String roadName,List<PgAcuTask> pgAcuTaskList){
+        if(pgAcuTaskList==null||pgAcuTaskList.size()==0) return false;
+        for(PgAcuTask pgAcuTask:pgAcuTaskList){
+            if(pgAcuTask.getRoadName().equals(roadName))
+                return true;
+        }
+
+        return false;
+    }
+
+    private PgAcuTask getIndexRoad(String roadName, List<PgAcuTask> pgAcuTaskList){
+        for(PgAcuTask pgAcuTask:pgAcuTaskList){
+            if(pgAcuTask.getRoadName().equals(roadName))
+                return pgAcuTask;
+        }
+
+        return null;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java
new file mode 100644
index 0000000..323f7ef
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java
@@ -0,0 +1,25 @@
+package com.casic.PgInterface.reservePlan.dto;
+
+import java.util.List;
+
+public class PgAcuTask {
+
+    private String roadName;//道路
+    private String pileAcuList;//acu分区
+
+    public String getRoadName() {
+        return roadName;
+    }
+
+    public void setRoadName(String roadName) {
+        this.roadName = roadName;
+    }
+
+    public String getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(String pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+}

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 25ded8a..283d7ab 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,20 +7,56 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" 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/construction/manager/PgCsDocumentManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/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/manager/PgAlarmManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/~$说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/~$说明20191207.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.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$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/接口说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明20191207.docx" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
@@ -51,7 +87,7 @@
         <counts>
           <entry key="class" value="4" />
           <entry key="iml" value="2" />
-          <entry key="java" value="707" />
+          <entry key="java" value="820" />
           <entry key="properties" value="14" />
           <entry key="xml" value="7" />
         </counts>
@@ -60,7 +96,7 @@
         <counts>
           <entry key="CLASS" value="4" />
           <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="707" />
+          <entry key="JAVA" value="820" />
           <entry key="Properties" value="14" />
           <entry key="XML" value="7" />
         </counts>
@@ -68,32 +104,32 @@
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
           <entry key="dummy" value="38" />
-          <entry key="java" value="30161" />
+          <entry key="java" value="40859" />
           <entry key="properties" value="100" />
-          <entry key="txt" value="176" />
+          <entry key="txt" value="186" />
           <entry key="xml" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="30161" />
-          <entry key="PLAIN_TEXT" value="214" />
+          <entry key="JAVA" value="40859" />
+          <entry key="PLAIN_TEXT" value="224" />
           <entry key="Properties" value="100" />
           <entry key="XML" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="48" />
+          <entry key="project.closed" value="51" />
           <entry key="project.open.time.1" value="5" />
           <entry key="project.open.time.12" value="2" />
           <entry key="project.open.time.13" value="1" />
           <entry key="project.open.time.15" value="1" />
           <entry key="project.open.time.16" value="1" />
           <entry key="project.open.time.17" value="1" />
-          <entry key="project.open.time.2" value="1" />
+          <entry key="project.open.time.2" value="2" />
           <entry key="project.open.time.20" value="1" />
-          <entry key="project.open.time.23" value="1" />
+          <entry key="project.open.time.23" value="2" />
           <entry key="project.open.time.24" value="2" />
           <entry key="project.open.time.251" value="1" />
           <entry key="project.open.time.27" value="2" />
@@ -106,8 +142,8 @@
           <entry key="project.open.time.36" value="1" />
           <entry key="project.open.time.37" value="1" />
           <entry key="project.open.time.39" value="2" />
-          <entry key="project.open.time.4" value="2" />
-          <entry key="project.open.time.40" value="1" />
+          <entry key="project.open.time.4" value="3" />
+          <entry key="project.open.time.40" value="2" />
           <entry key="project.open.time.41" value="2" />
           <entry key="project.open.time.42" value="2" />
           <entry key="project.open.time.43" value="2" />
@@ -122,23 +158,25 @@
           <entry key="project.open.time.6" value="3" />
           <entry key="project.open.time.63" value="2" />
           <entry key="project.open.time.64" value="1" />
+          <entry key="project.open.time.66" value="1" />
           <entry key="project.open.time.71" value="2" />
+          <entry key="project.open.time.74" value="1" />
           <entry key="project.open.time.76" value="1" />
           <entry key="project.open.time.8" value="2" />
           <entry key="project.open.time.9" value="1" />
           <entry key="project.open.time.97" value="1" />
-          <entry key="project.opened" value="78" />
+          <entry key="project.opened" value="84" />
         </counts>
       </usages-collector>
     </session>
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+            <state relative-caret-position="396">
+              <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
               <folding>
                 <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
                 <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -147,73 +185,6 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <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="99">
-              <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-              <folding>
-                <element signature="imports" expanded="true" />
-                <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-1170">
-              <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state>
-              <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
-              <folding>
-                <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-                <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="true">
-        <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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-              <folding>
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-                <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>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <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="352">
-              <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -225,18 +196,9 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>inCriteria</find>
-      <find>getPgPlanResulList</find>
-      <find>getPileAcuListByPileAcuStr</find>
-      <find>distinct</find>
-      <find>order</find>
-      <find>canPlanLine</find>
-      <find>isExistLine</find>
-      <find>getPlanResult</find>
       <find>pgPipeLine</find>
       <find>getPipeLineBylineName</find>
       <find>StringU</find>
-      <find>getAllAlarm</find>
       <find>getAlarmList</find>
       <find>getPgInPersonListByDay</find>
       <find>getDayInPgStatistic</find>
@@ -254,7 +216,16 @@
       <find>getPgContructionByNameOrType</find>
       <find>&quot;&quot;,&quot;&quot;,</find>
       <find>getPgContructionDtoByNameOrType</find>
+      <find>addConstruction</find>
+      <find>getPgLineAcuHole</find>
+      <find>getPlanResult</find>
       <find>getConstruction</find>
+      <find>addPipeLine</find>
+      <find>未找到入廊数据</find>
+      <find>getCurrentHoleByAcu</find>
+      <find>getAllAlarm</find>
+      <find>getPgDeviceDtoListByPartition</find>
+      <find>getPgDeviceByDevType</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -263,57 +234,57 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlan.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileHoleManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/planData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/PlanData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
       </list>
     </option>
   </component>
@@ -359,7 +330,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -421,53 +391,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="dto" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="manager" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -479,29 +402,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="rs" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -516,6 +416,7 @@
         </subPane>
       </pane>
       <pane id="Scope" />
+      <pane id="PackagesPane" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -710,7 +611,13 @@
       <workItem from="1574902733573" duration="1829000" />
       <workItem from="1574998240004" duration="7016000" />
       <workItem from="1575247959683" duration="6997000" />
-      <workItem from="1575704345590" duration="40473000" />
+      <workItem from="1575704345590" duration="69381000" />
+      <workItem from="1575869479666" duration="721000" />
+      <workItem from="1575947104878" duration="6101000" />
+      <workItem from="1576128264436" duration="3347000" />
+      <workItem from="1576208571543" duration="22000" />
+      <workItem from="1576227513917" duration="862000" />
+      <workItem from="1576293721220" duration="18246000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -817,11 +724,18 @@
       <option name="project" value="LOCAL" />
       <updated>1575775489149</updated>
     </task>
-    <option name="localTasksCounter" value="16" />
+    <task id="LOCAL-00016" summary="整改施工信息">
+      <created>1575791780774</created>
+      <option name="number" value="00016" />
+      <option name="presentableId" value="LOCAL-00016" />
+      <option name="project" value="LOCAL" />
+      <updated>1575791780774</updated>
+    </task>
+    <option name="localTasksCounter" value="17" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="452131000" />
+    <option name="totallyTimeSpent" value="510338000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -834,9 +748,8 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
-    <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.24205749" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2647504" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -847,7 +760,7 @@
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.3295082" />
       <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.4819672" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.65737706" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.3295082" />
@@ -939,7 +852,8 @@
     <MESSAGE value="重新设计智能规划部分" />
     <MESSAGE value="完成智能规划对接" />
     <MESSAGE value="修改报警统计" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改报警统计" />
+    <MESSAGE value="整改施工信息" />
+    <option name="LAST_COMMIT_MESSAGE" value="整改施工信息" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -951,16 +865,10 @@
           <option name="timeStamp" value="3" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java</url>
-          <line>69</line>
+          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java</url>
+          <line>40</line>
           <properties />
-          <option name="timeStamp" value="21" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java</url>
-          <line>96</line>
-          <properties />
-          <option name="timeStamp" value="38" />
+          <option name="timeStamp" value="122" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
@@ -970,394 +878,452 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <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="2068">
-          <caret line="154" column="35" selection-start-line="154" selection-start-column="35" selection-end-line="154" selection-end-column="35" />
-        </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="3300">
-          <caret line="297" column="22" selection-start-line="297" selection-start-column="22" selection-end-line="297" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/StringUtils.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
-          <caret line="13" column="48" lean-forward="true" selection-start-line="13" selection-start-column="48" selection-end-line="13" selection-end-column="48" />
+          <caret line="11" column="5" selection-start-line="11" selection-start-column="5" selection-end-line="11" selection-end-column="5" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="78" lean-forward="true" selection-start-line="78" selection-end-line="78" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="616">
-          <caret line="41" column="1" selection-start-line="41" selection-start-column="1" selection-end-line="41" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="110">
-          <caret line="12" column="23" selection-start-line="12" selection-start-column="23" selection-end-line="12" selection-end-column="23" />
+        <state relative-caret-position="516">
+          <caret line="114" column="12" selection-start-line="114" selection-start-column="12" selection-end-line="114" selection-end-column="12" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="164">
-          <caret line="56" lean-forward="true" selection-start-line="56" selection-end-line="56" />
+        <state relative-caret-position="418">
+          <caret line="33" column="44" selection-start-line="33" selection-start-column="44" selection-end-line="33" selection-end-column="44" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="258">
-          <caret line="27" column="12" lean-forward="true" selection-start-line="27" selection-start-column="12" selection-end-line="27" selection-end-column="12" />
+        <state relative-caret-position="132">
+          <caret line="11" column="20" lean-forward="true" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="20" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.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="-12">
-          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        <state relative-caret-position="516">
+          <caret line="142" column="54" selection-start-line="142" selection-start-column="54" selection-end-line="142" selection-end-column="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="858">
-          <caret line="55" column="27" lean-forward="true" selection-start-line="55" selection-start-column="27" selection-end-line="55" selection-end-column="27" />
+        <state relative-caret-position="66">
+          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="58">
+          <caret line="18" column="28" selection-start-line="18" selection-start-column="19" selection-end-line="18" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="305">
+          <caret line="24" column="31" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="714">
+          <caret line="58" column="5" lean-forward="true" selection-start-line="58" selection-start-column="5" selection-end-line="58" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="924">
+          <caret line="134" column="92" selection-start-line="134" selection-start-column="92" selection-end-line="134" selection-end-column="92" />
+          <folding>
+            <element signature="method#linkDevice#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkPartitionCamera#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkReservePlan#0;class#PgAlarmLinkRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1066">
+          <caret line="90" lean-forward="true" selection-start-line="90" selection-end-line="90" />
+          <folding>
+            <element signature="method#getTjResultByAlarmType#0;class#PgAlarmTjRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="946">
+          <caret line="148" column="11" lean-forward="true" selection-start-line="148" selection-start-column="11" selection-end-line="148" selection-end-column="11" />
+          <folding>
+            <element signature="method#getAlarmTypeList#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#addAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#editAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#deleteAlarmType#0;class#PgAlarmTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="208">
+          <caret line="46" column="23" lean-forward="true" selection-start-line="46" selection-start-column="23" selection-end-line="46" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="113" column="9" lean-forward="true" selection-start-line="113" selection-start-column="9" selection-end-line="113" selection-end-column="9" />
+          <folding>
+            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
+            <element signature="method#getNewestCh4InfoByDev#0;class#PgCh4Rs#0" />
+            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="145" column="6" lean-forward="true" selection-start-line="145" selection-start-column="6" selection-end-line="145" selection-end-column="6" />
+          <folding>
+            <element signature="method#addAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#editAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#deleteAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#getAuthorityList#0;class#PgAuthorityRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="58" column="1" lean-forward="true" selection-start-line="58" selection-start-column="1" selection-end-line="58" selection-end-column="1" />
+          <folding>
+            <element signature="method#getPgAssetPlanList#0;class#PgAssetPlanRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="370">
+          <caret line="371" column="66" selection-start-line="371" selection-start-column="66" selection-end-line="371" selection-end-column="66" />
+          <folding>
+            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#searchConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionDev#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="139" column="13" lean-forward="true" selection-start-line="139" selection-start-column="13" selection-end-line="139" selection-end-column="13" />
+          <folding>
+            <element signature="method#getCoInfoByDevAndDate#0;class#PgCoRs#0" />
+            <element signature="method#getNewestCoInfoByDev#0;class#PgCoRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="540">
+          <caret line="223" column="5" lean-forward="true" selection-start-line="223" selection-start-column="5" selection-end-line="223" selection-end-column="5" />
+          <folding>
+            <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="682">
+          <caret line="100" lean-forward="true" selection-start-line="100" selection-end-line="100" />
+          <folding>
+            <element signature="method#getDeviceTpeyList#0;class#PgDeviceTypeRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="377">
+          <caret line="225" column="35" selection-start-line="225" selection-start-column="35" selection-end-line="225" selection-end-column="35" />
+          <folding>
+            <element signature="method#addEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#addEquipment#1;class#PgEquipmentRs#0" />
+            <element signature="method#getEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#deleteEquipment#0;class#PgEquipmentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="406">
+          <caret line="109" lean-forward="true" selection-start-line="109" selection-end-line="109" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="154">
+          <caret line="28" column="19" selection-start-line="28" selection-start-column="19" selection-end-line="28" selection-end-column="19" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="748">
-          <caret line="49" column="5" lean-forward="true" selection-start-line="49" selection-start-column="5" selection-end-line="49" selection-end-column="5" />
+        <state relative-caret-position="296">
+          <caret line="161" column="35" selection-start-line="161" selection-start-column="35" selection-end-line="161" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="384">
+          <caret line="99" column="5" lean-forward="true" selection-start-line="99" selection-start-column="5" selection-end-line="99" selection-end-column="5" />
+        </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="362">
+          <caret line="340" column="35" selection-start-line="340" selection-start-column="35" selection-end-line="340" selection-end-column="35" />
+          <folding>
+            <element signature="method#addInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPersonInPg#0;class#PgInPgPersonRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-606">
+          <caret line="76" column="20" lean-forward="true" selection-start-line="76" selection-start-column="20" selection-end-line="76" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="65" column="35" selection-start-line="65" selection-start-column="35" selection-end-line="65" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="101" column="35" selection-start-line="101" selection-start-column="35" selection-end-line="101" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="84" column="35" selection-start-line="84" selection-start-column="35" selection-end-line="84" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="59" lean-forward="true" selection-start-line="59" selection-end-line="59" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="60" column="1" lean-forward="true" selection-start-line="60" selection-start-column="1" selection-end-line="60" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="145" column="35" selection-start-line="145" selection-start-column="35" selection-end-line="145" selection-end-column="35" />
+        </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="274">
+          <caret line="350" column="35" selection-start-line="350" selection-start-column="35" selection-end-line="350" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="121" column="39" selection-start-line="121" selection-start-column="39" selection-end-line="121" selection-end-column="39" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="28" column="8" lean-forward="true" selection-start-line="28" selection-start-column="8" selection-end-line="28" selection-end-column="8" />
+        <state relative-caret-position="340">
+          <caret line="103" selection-start-line="103" selection-end-line="103" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="226" column="35" selection-start-line="226" selection-start-column="35" selection-end-line="226" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="203" column="35" selection-start-line="203" selection-start-column="35" selection-end-line="203" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="241" column="35" selection-start-line="241" selection-start-column="35" selection-end-line="241" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="225" column="1" lean-forward="true" selection-start-line="225" selection-start-column="1" selection-end-line="225" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="176" column="5" lean-forward="true" selection-start-line="176" selection-start-column="5" selection-end-line="176" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="178" column="35" lean-forward="true" selection-start-line="178" selection-start-column="35" selection-end-line="178" selection-end-column="35" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="516">
-          <caret line="94" column="53" selection-start-line="94" selection-start-column="53" selection-end-line="94" selection-end-column="53" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="814">
-          <caret line="52" column="9" lean-forward="true" selection-start-line="52" selection-start-column="9" selection-end-line="52" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="182">
-          <caret line="58" column="12" lean-forward="true" selection-start-line="58" selection-start-column="12" selection-end-line="58" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="34" lean-forward="true" selection-start-line="34" selection-end-line="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="32" lean-forward="true" selection-start-line="32" selection-end-line="32" />
-          <folding>
-            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
-            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="185">
-          <caret line="63" column="13" selection-start-line="63" selection-start-column="13" selection-end-line="63" selection-end-column="13" />
-          <folding>
-            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
-            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
-            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="e#6319#6324#0" />
-            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
-          </folding>
+          <caret line="240" lean-forward="true" selection-start-line="240" selection-end-line="240" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
-          <caret line="58" column="28" lean-forward="true" selection-start-line="58" selection-start-column="28" selection-end-line="58" selection-end-column="28" />
-          <folding>
-            <element signature="method#addTempHumData#0;class#PgTempHumRs#0" />
-          </folding>
+        <state relative-caret-position="340">
+          <caret line="148" column="34" selection-start-line="148" selection-start-column="34" selection-end-line="148" selection-end-column="34" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
+        <state relative-caret-position="458">
+          <caret line="99" column="35" selection-start-line="99" selection-start-column="35" selection-end-line="99" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+        <state relative-caret-position="384">
+          <caret line="145" column="32" lean-forward="true" selection-start-line="145" selection-start-column="32" selection-end-line="145" selection-end-column="32" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="414">
-          <caret line="22" column="46" lean-forward="true" selection-start-line="22" selection-start-column="46" selection-end-line="22" selection-end-column="46" />
-        </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="396">
-          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" column="83" selection-start-line="11" selection-start-column="83" selection-end-line="11" selection-end-column="83" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="26">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
-          <folding>
-            <element signature="method#getPgInPgStatusByPerson#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNumByName#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNum#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPersonListByDay#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPgStatusByPgInPgPerson#0;class#PgInPgStatusManager#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="44">
-          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-12">
-          <caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="87" lean-forward="true" selection-start-line="87" selection-end-line="87" />
-          <folding>
-            <element signature="method#getConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#addConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#deleteConstructionType#0;class#PgConstructionTypeRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
-          <folding>
-            <element signature="method#getConstructionTypeByType#0;class#PgConstructionTypeManager#0" />
-            <element signature="method#getAllConstructionTypeDto#0;class#PgConstructionTypeManager#0" />
-          </folding>
-        </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="145">
-          <caret line="258" column="9" lean-forward="true" selection-start-line="258" selection-start-column="9" selection-end-line="258" selection-end-column="9" />
-          <folding>
-            <element signature="method#getMonthInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayInPgStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgOverViewRs#0" />
-            <element signature="method#getAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getMonthAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayAlarmStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgOverViewRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="103">
-          <caret line="105" column="50" lean-forward="true" selection-start-line="105" selection-start-column="50" selection-end-line="105" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateBasicDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="99">
-          <caret line="125" selection-start-line="125" selection-end-line="125" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="190">
-          <caret line="24" column="35" lean-forward="true" selection-start-line="24" selection-start-column="35" selection-end-line="24" selection-end-column="35" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="436">
-          <caret line="24" lean-forward="true" selection-start-line="24" selection-end-line="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" lean-forward="true" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="300">
-          <caret line="34" column="31" lean-forward="true" selection-start-line="34" selection-start-column="31" selection-end-line="34" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="42" column="13" lean-forward="true" selection-start-line="42" selection-start-column="13" selection-end-line="42" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="120" column="72" lean-forward="true" selection-start-line="120" selection-start-column="72" selection-end-line="120" selection-end-column="72" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="293">
-          <caret line="58" column="73" lean-forward="true" selection-start-line="58" selection-start-column="73" selection-end-line="58" selection-end-column="73" />
-          <folding>
-            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
-            <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
-          </folding>
-        </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="307">
-          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
+        <state relative-caret-position="758">
+          <caret line="130" column="5" lean-forward="true" selection-start-line="130" selection-start-column="5" selection-end-line="130" selection-end-column="5" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1170">
-          <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
+        <state relative-caret-position="494">
+          <caret line="86" column="62" lean-forward="true" selection-start-line="86" selection-start-column="62" selection-end-line="86" selection-end-column="62" />
           <folding>
-            <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-            <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+            <element signature="method#getAllDevice#0;class#PgDeviceManager#0" />
+            <element signature="method#getAllDev#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="195" column="28" lean-forward="true" selection-start-line="195" selection-start-column="28" selection-end-line="195" selection-end-column="28" />
+        <state relative-caret-position="166">
+          <caret line="174" column="13" lean-forward="true" selection-start-line="174" selection-start-column="13" selection-end-line="174" selection-end-column="13" />
           <folding>
-            <element signature="method#getAlarmByTypeAndTime#0;class#PgAlarmManager#0" />
-            <element signature="method#getAlarmNum#0;class#PgAlarmManager#0" />
             <element signature="method#getDayAlarmStatistic#0;class#PgAlarmManager#0" />
+            <element signature="method#getAlarmList#0;class#PgAlarmManager#0" />
             <element signature="method#createDTO#0;class#PgAlarmManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="364">
+          <caret line="46" column="56" lean-forward="true" selection-start-line="46" selection-start-column="56" selection-end-line="46" selection-end-column="56" />
+          <folding>
+            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
+            <element signature="method#getPgDev#0;class#PgDeviceRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
+            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+        <state relative-caret-position="396">
+          <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
           <folding>
             <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
             <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -1365,52 +1331,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="239">
-          <caret line="21" column="33" lean-forward="true" selection-start-line="21" selection-start-column="33" selection-end-line="21" selection-end-column="33" />
-        </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="352">
-          <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-        </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="99">
-          <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-          </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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-          <folding>
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-            <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>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
index c436c93..e913155 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
@@ -132,7 +132,10 @@
             this.setAlarmType("");
         else
             this.setAlarmType(pgAlarm.getAlarmTypeId().getAlarmType());
-        this.setAlarmValue(pgAlarm.getAlarmValue());
+        if(pgAlarm.getAlarmValue()==null)
+            this.setAlarmValue("");
+        else
+            this.setAlarmValue(pgAlarm.getAlarmValue());
         if (pgAlarm.getAlarmDate() != null)
             this.setAlarmDate(sdf.format(pgAlarm.getAlarmDate()));
         else
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
index a43965c..565cb41 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -159,11 +159,21 @@
     }
 
     //获取历史报警消息列表
-    public List<PgAlarmDto> getAllAlarm(String alarmType,String startDay,String endDay,String isNew,int page,int rows) {
-        try {
+    public  Map<String, Object> getAllAlarm(String alarmType,String partition,String startDay,String endDay,String isNew,int page,int rows) {
 
+        Map<String, Object> resultMap = new HashMap<>();
+        String msg="";
+
+        try {
             Criteria criteria = createCriteria(PgAlarm.class);
 
+            if (StringUtils.isNotBlank(partition)) {
+                DetachedCriteria inCriteria = DetachedCriteria.forClass(PgDevice.class);
+                inCriteria.add(Restrictions.eq("partition", partition));
+                inCriteria.setProjection(Property.forName("id"));
+                criteria.add(Property.forName("alarmDevId").in(inCriteria));
+            }
+
             if (StringUtils.isNotBlank(alarmType)&&!alarmType.contains("全部")&&pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
                 criteria.add(Restrictions.eq("alarmTypeId", pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)));
 
@@ -190,8 +200,16 @@
             for (PgAlarm pgAlarm : pgAlarmList) {
                 pgAlarmDtoList.add(new PgAlarmDto(pgAlarm));
             }
-
-            return pgAlarmDtoList;
+            if(pgAlarmDtoList==null||pgAlarmDtoList.size()==0) {
+                resultMap.put("msg", "没有报警信息");
+                resultMap.put("code","0");
+            }else {
+                resultMap.put("code","200");
+                resultMap.put("msg", "报警信息获取成功");
+            }
+            resultMap.put("count",pg.getTotalCount());
+            resultMap.put("result",pgAlarmDtoList);
+            return resultMap;
         }
         catch(Exception ex){
             ex.printStackTrace();
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index 7547560..654f49e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -24,11 +24,11 @@
 
         Criteria criteria = createCriteria(PgDevice.class);
 
-        if(road!=null)
+        if(StringUtils.isNotBlank(road))
             criteria.add(Restrictions.eq("road",road));
-        if(partition!=null)
+        if(StringUtils.isNotBlank(partition))
             criteria.add(Restrictions.eq("partition",partition));
-        if(devType!=null)
+        if(StringUtils.isNotBlank(devType))
             criteria.add(Restrictions.eq("devType",devType));
 
         criteria.add(Restrictions.eq("active", 1));
@@ -43,6 +43,29 @@
         return pgDeviceDtoList;
     }
 
+    public List<PgDeviceDto> getAllDev(String road,String partition,String devType) {
+
+        Criteria criteria = createCriteria(PgDevice.class);
+
+        if(StringUtils.isNotBlank(road))
+            criteria.add(Restrictions.eq("road",road));
+        if(StringUtils.isNotBlank(partition))
+            criteria.add(Restrictions.eq("partition",partition));
+        if(StringUtils.isNotBlank(devType))
+            criteria.add(Restrictions.like("devType","%"+devType+"%"));
+
+        criteria.add(Restrictions.eq("active", 1));
+        criteria.addOrder(Order.desc("id"));
+        List<PgDevice> pgDeviceList = criteria.list();
+
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
+        for (PgDevice pgDevice : pgDeviceList) {
+            pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
+        }
+
+        return pgDeviceDtoList;
+    }
+
     //根据名字获取当前设备
     public PgDevice getDeviceByAssetCode(String assetCode) {
         Criteria criteria=createCriteria(PgDevice.class);
@@ -56,9 +79,9 @@
     }
 
     //根据类型获取设备列表
-    public List<PgDeviceDto> getDeviceByDevTypee(String devType) {
+    public List<PgDeviceDto> getDeviceByDevType(String devType) {
         Criteria criteria=createCriteria(PgDevice.class);
-        criteria.add(Restrictions.eq("devType",devType));
+        criteria.add(Restrictions.like("devType","%"+devType+"%"));
 
         List<PgDevice> pgDeviceList=criteria.list();
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
@@ -106,7 +129,7 @@
         criteria.add(Restrictions.eq("partition",partition));
 
         List<PgDevice> pgDeviceList=criteria.list();
-        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<PgDeviceDto>();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
 
         for (PgDevice pgDevice : pgDeviceList) {
             pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
index 3a3bccd..595730e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
@@ -1,10 +1,13 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.devTable.domain.PgAlarmType;
 import com.casic.PgInterface.devTable.domain.PgPartition;
 import com.casic.PgInterface.devTable.domain.PgRoad;
 import com.casic.PgInterface.devTable.domain.PipeGallery;
 import com.casic.PgInterface.devTable.dto.PgPartitionDto;
+import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
@@ -12,7 +15,9 @@
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Created by yxw on 2017/11/4.
@@ -21,7 +26,8 @@
 public class PgPartitionManager extends HibernateEntityDao<PgPartition> {
 
     @Resource
-    PgRoadManager pgRoadManager;
+    private PgRoadManager pgRoadManager;
+
 
     public PgPartition getPartitionByParName(String parName) {
         Criteria criteria = getSession().createCriteria(PgPartition.class);
@@ -99,4 +105,5 @@
         return pgPartitionDtoList;
     }
 
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
index f216360..a6928f1 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
@@ -5,6 +5,7 @@
 public class PgPlanResultRe {
 
     private String taskKey;
+    private List<String> pileAcuList;
     private List<PgPlanResult> pgPlanResultList;
 
     public String getTaskKey() {
@@ -15,6 +16,14 @@
         this.taskKey = taskKey;
     }
 
+    public List<String> getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(List<String> pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+
     public List<PgPlanResult> getPgPlanResultList() {
         return pgPlanResultList;
     }
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
index 71ea765..47eea07 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
@@ -54,9 +54,7 @@
 
         List<PgLineHole> pgLineHoleList=criteria.list();
         List<PgLineHoleDTO> pgLineHoleDTOList=new ArrayList<>();
-        if(pgLineHoleList==null||pgLineHoleList.size()==0)
-            return null;
-        else
+        if(pgLineHoleList!=null&&pgLineHoleList.size()!=0)
             pgLineHoleDTOList=PgLineHoleDTO.ConvertToDTOList(pgLineHoleList,pgPileAcuManager,pgRoadManager);
         return pgLineHoleDTOList;
     }
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
index 0fd9e1f..841a386 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
@@ -1,12 +1,15 @@
 package com.casic.PgInterface.intelPlan.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.devTable.domain.PgPartition;
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
 import com.casic.PgInterface.intelPlan.domain.PgLineHole;
 import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
 import com.casic.PgInterface.intelPlan.domain.PgSection;
 import com.casic.PgInterface.intelPlan.dto.PgPlanResult;
 import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
 import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -22,6 +25,9 @@
     @Resource
     private PgLineHoleManager pgLineHoleManager;
 
+    @Resource
+    private PgRoadManager pgRoadManager;
+
     public PgPileAcu getPgPileAcuByCode(String acuCode){
         List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
 
@@ -58,7 +64,9 @@
         for(PgPlanTask pgPlanTask:pgPlanTaskList){
             List<PgPlanResult> pgPlanResultList=getPgPlanResultByPlantask(pgPlanTask);
             PgPlanResultRe pgPlanResultRe=new PgPlanResultRe();
+
             pgPlanResultRe.setTaskKey(pgPlanTask.getTaskKey());
+            pgPlanResultRe.setPileAcuList(pgPlanTask.getPileAcuList());
             pgPlanResultRe.setPgPlanResultList(pgPlanResultList);
 
             pgPlanResultReList.add(pgPlanResultRe);
@@ -142,4 +150,57 @@
         return length;
     }
 
+    private PgPileAcu getPgPileAcuByAcuCode(String acuCode){
+        List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
+
+        if(pgPileAcuList==null||pgPileAcuList.size()==0)
+            return null;
+        else
+            return pgPileAcuList.get(0);
+    }
+
+    public List<PgAcuTask> getACUTask(String pileAcuList){
+        String[] acuArray=pileAcuList.split(",");
+        List<PgAcuTask> pgAcuTaskList=new ArrayList<>();
+
+        for(String acu:acuArray){
+            PgPileAcu pgPileAcu=this.getPgPileAcuByCode(acu);
+            String roadName=pgRoadManager.get(pgPileAcu.getRoadId()).getRoadName();
+
+            if(!containRoad(roadName,pgAcuTaskList))
+            {
+                PgAcuTask pgAcuTask=new PgAcuTask();
+                pgAcuTask.setRoadName(roadName);
+                pgAcuTask.setPileAcuList(acu);
+                pgAcuTaskList.add(pgAcuTask);
+            }
+            else{
+                PgAcuTask pgAcuTask=getIndexRoad(roadName,pgAcuTaskList);
+                if(pgAcuTask!=null)
+                    pgAcuTask.setPileAcuList(pgAcuTask.getPileAcuList()+","+acu);
+            }
+        }
+
+        return pgAcuTaskList;
+    }
+
+    private boolean containRoad(String roadName,List<PgAcuTask> pgAcuTaskList){
+        if(pgAcuTaskList==null||pgAcuTaskList.size()==0) return false;
+        for(PgAcuTask pgAcuTask:pgAcuTaskList){
+            if(pgAcuTask.getRoadName().equals(roadName))
+                return true;
+        }
+
+        return false;
+    }
+
+    private PgAcuTask getIndexRoad(String roadName, List<PgAcuTask> pgAcuTaskList){
+        for(PgAcuTask pgAcuTask:pgAcuTaskList){
+            if(pgAcuTask.getRoadName().equals(roadName))
+                return pgAcuTask;
+        }
+
+        return null;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java
new file mode 100644
index 0000000..323f7ef
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java
@@ -0,0 +1,25 @@
+package com.casic.PgInterface.reservePlan.dto;
+
+import java.util.List;
+
+public class PgAcuTask {
+
+    private String roadName;//道路
+    private String pileAcuList;//acu分区
+
+    public String getRoadName() {
+        return roadName;
+    }
+
+    public void setRoadName(String roadName) {
+        this.roadName = roadName;
+    }
+
+    public String getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(String pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
index c25e926..c7d7693 100644
--- a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
@@ -70,9 +70,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(Long.valueOf(inPgPersonId));
         PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("hostName",pgInPgPerson.getAssetCode());
-//        PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode());
-//        long maxId = pgTagPositionManager.getMaxId(pgTagMac.getTagMac());
-//        PGTagPosition pgTagPosition = pgTagPositionManager.get(maxId);
+
         PGTagPosition pgTagPosition = tagmacRun.GetTagStatus(pgTagMac);
         boolean bExist = false;
         bExist = pgTagPositionManager.findTagPosition(pgTagPosition.getPositionUpdatetime(),pgTagPosition.getHostId());
@@ -104,8 +102,7 @@
         PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(Long.valueOf(inPgPersonId));
         PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pgInPgPersonId",pgInPgPerson);
         System.out.println("time:"+pgInPgStatus.getInTime());
-//        PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pgInPgPersonId",inPgPersonId);
-//        PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode());
+
         PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("hostName",pgInPgPerson.getAssetCode());
 
         Map<Object,Object> mapPosition = new HashMap<>();

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 25ded8a..283d7ab 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,20 +7,56 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" 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/construction/manager/PgCsDocumentManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/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/manager/PgAlarmManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/~$说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/~$说明20191207.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.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$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/接口说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明20191207.docx" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
@@ -51,7 +87,7 @@
         <counts>
           <entry key="class" value="4" />
           <entry key="iml" value="2" />
-          <entry key="java" value="707" />
+          <entry key="java" value="820" />
           <entry key="properties" value="14" />
           <entry key="xml" value="7" />
         </counts>
@@ -60,7 +96,7 @@
         <counts>
           <entry key="CLASS" value="4" />
           <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="707" />
+          <entry key="JAVA" value="820" />
           <entry key="Properties" value="14" />
           <entry key="XML" value="7" />
         </counts>
@@ -68,32 +104,32 @@
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
           <entry key="dummy" value="38" />
-          <entry key="java" value="30161" />
+          <entry key="java" value="40859" />
           <entry key="properties" value="100" />
-          <entry key="txt" value="176" />
+          <entry key="txt" value="186" />
           <entry key="xml" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="30161" />
-          <entry key="PLAIN_TEXT" value="214" />
+          <entry key="JAVA" value="40859" />
+          <entry key="PLAIN_TEXT" value="224" />
           <entry key="Properties" value="100" />
           <entry key="XML" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="48" />
+          <entry key="project.closed" value="51" />
           <entry key="project.open.time.1" value="5" />
           <entry key="project.open.time.12" value="2" />
           <entry key="project.open.time.13" value="1" />
           <entry key="project.open.time.15" value="1" />
           <entry key="project.open.time.16" value="1" />
           <entry key="project.open.time.17" value="1" />
-          <entry key="project.open.time.2" value="1" />
+          <entry key="project.open.time.2" value="2" />
           <entry key="project.open.time.20" value="1" />
-          <entry key="project.open.time.23" value="1" />
+          <entry key="project.open.time.23" value="2" />
           <entry key="project.open.time.24" value="2" />
           <entry key="project.open.time.251" value="1" />
           <entry key="project.open.time.27" value="2" />
@@ -106,8 +142,8 @@
           <entry key="project.open.time.36" value="1" />
           <entry key="project.open.time.37" value="1" />
           <entry key="project.open.time.39" value="2" />
-          <entry key="project.open.time.4" value="2" />
-          <entry key="project.open.time.40" value="1" />
+          <entry key="project.open.time.4" value="3" />
+          <entry key="project.open.time.40" value="2" />
           <entry key="project.open.time.41" value="2" />
           <entry key="project.open.time.42" value="2" />
           <entry key="project.open.time.43" value="2" />
@@ -122,23 +158,25 @@
           <entry key="project.open.time.6" value="3" />
           <entry key="project.open.time.63" value="2" />
           <entry key="project.open.time.64" value="1" />
+          <entry key="project.open.time.66" value="1" />
           <entry key="project.open.time.71" value="2" />
+          <entry key="project.open.time.74" value="1" />
           <entry key="project.open.time.76" value="1" />
           <entry key="project.open.time.8" value="2" />
           <entry key="project.open.time.9" value="1" />
           <entry key="project.open.time.97" value="1" />
-          <entry key="project.opened" value="78" />
+          <entry key="project.opened" value="84" />
         </counts>
       </usages-collector>
     </session>
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+            <state relative-caret-position="396">
+              <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
               <folding>
                 <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
                 <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -147,73 +185,6 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <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="99">
-              <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-              <folding>
-                <element signature="imports" expanded="true" />
-                <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-1170">
-              <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state>
-              <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
-              <folding>
-                <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-                <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="true">
-        <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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-              <folding>
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-                <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>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <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="352">
-              <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -225,18 +196,9 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>inCriteria</find>
-      <find>getPgPlanResulList</find>
-      <find>getPileAcuListByPileAcuStr</find>
-      <find>distinct</find>
-      <find>order</find>
-      <find>canPlanLine</find>
-      <find>isExistLine</find>
-      <find>getPlanResult</find>
       <find>pgPipeLine</find>
       <find>getPipeLineBylineName</find>
       <find>StringU</find>
-      <find>getAllAlarm</find>
       <find>getAlarmList</find>
       <find>getPgInPersonListByDay</find>
       <find>getDayInPgStatistic</find>
@@ -254,7 +216,16 @@
       <find>getPgContructionByNameOrType</find>
       <find>&quot;&quot;,&quot;&quot;,</find>
       <find>getPgContructionDtoByNameOrType</find>
+      <find>addConstruction</find>
+      <find>getPgLineAcuHole</find>
+      <find>getPlanResult</find>
       <find>getConstruction</find>
+      <find>addPipeLine</find>
+      <find>未找到入廊数据</find>
+      <find>getCurrentHoleByAcu</find>
+      <find>getAllAlarm</find>
+      <find>getPgDeviceDtoListByPartition</find>
+      <find>getPgDeviceByDevType</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -263,57 +234,57 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlan.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileHoleManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/planData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/PlanData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
       </list>
     </option>
   </component>
@@ -359,7 +330,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -421,53 +391,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="dto" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="manager" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -479,29 +402,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="rs" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -516,6 +416,7 @@
         </subPane>
       </pane>
       <pane id="Scope" />
+      <pane id="PackagesPane" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -710,7 +611,13 @@
       <workItem from="1574902733573" duration="1829000" />
       <workItem from="1574998240004" duration="7016000" />
       <workItem from="1575247959683" duration="6997000" />
-      <workItem from="1575704345590" duration="40473000" />
+      <workItem from="1575704345590" duration="69381000" />
+      <workItem from="1575869479666" duration="721000" />
+      <workItem from="1575947104878" duration="6101000" />
+      <workItem from="1576128264436" duration="3347000" />
+      <workItem from="1576208571543" duration="22000" />
+      <workItem from="1576227513917" duration="862000" />
+      <workItem from="1576293721220" duration="18246000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -817,11 +724,18 @@
       <option name="project" value="LOCAL" />
       <updated>1575775489149</updated>
     </task>
-    <option name="localTasksCounter" value="16" />
+    <task id="LOCAL-00016" summary="整改施工信息">
+      <created>1575791780774</created>
+      <option name="number" value="00016" />
+      <option name="presentableId" value="LOCAL-00016" />
+      <option name="project" value="LOCAL" />
+      <updated>1575791780774</updated>
+    </task>
+    <option name="localTasksCounter" value="17" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="452131000" />
+    <option name="totallyTimeSpent" value="510338000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -834,9 +748,8 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
-    <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.24205749" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2647504" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -847,7 +760,7 @@
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.3295082" />
       <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.4819672" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.65737706" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.3295082" />
@@ -939,7 +852,8 @@
     <MESSAGE value="重新设计智能规划部分" />
     <MESSAGE value="完成智能规划对接" />
     <MESSAGE value="修改报警统计" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改报警统计" />
+    <MESSAGE value="整改施工信息" />
+    <option name="LAST_COMMIT_MESSAGE" value="整改施工信息" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -951,16 +865,10 @@
           <option name="timeStamp" value="3" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java</url>
-          <line>69</line>
+          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java</url>
+          <line>40</line>
           <properties />
-          <option name="timeStamp" value="21" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java</url>
-          <line>96</line>
-          <properties />
-          <option name="timeStamp" value="38" />
+          <option name="timeStamp" value="122" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
@@ -970,394 +878,452 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <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="2068">
-          <caret line="154" column="35" selection-start-line="154" selection-start-column="35" selection-end-line="154" selection-end-column="35" />
-        </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="3300">
-          <caret line="297" column="22" selection-start-line="297" selection-start-column="22" selection-end-line="297" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/StringUtils.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
-          <caret line="13" column="48" lean-forward="true" selection-start-line="13" selection-start-column="48" selection-end-line="13" selection-end-column="48" />
+          <caret line="11" column="5" selection-start-line="11" selection-start-column="5" selection-end-line="11" selection-end-column="5" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="78" lean-forward="true" selection-start-line="78" selection-end-line="78" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="616">
-          <caret line="41" column="1" selection-start-line="41" selection-start-column="1" selection-end-line="41" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="110">
-          <caret line="12" column="23" selection-start-line="12" selection-start-column="23" selection-end-line="12" selection-end-column="23" />
+        <state relative-caret-position="516">
+          <caret line="114" column="12" selection-start-line="114" selection-start-column="12" selection-end-line="114" selection-end-column="12" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="164">
-          <caret line="56" lean-forward="true" selection-start-line="56" selection-end-line="56" />
+        <state relative-caret-position="418">
+          <caret line="33" column="44" selection-start-line="33" selection-start-column="44" selection-end-line="33" selection-end-column="44" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="258">
-          <caret line="27" column="12" lean-forward="true" selection-start-line="27" selection-start-column="12" selection-end-line="27" selection-end-column="12" />
+        <state relative-caret-position="132">
+          <caret line="11" column="20" lean-forward="true" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="20" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.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="-12">
-          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        <state relative-caret-position="516">
+          <caret line="142" column="54" selection-start-line="142" selection-start-column="54" selection-end-line="142" selection-end-column="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="858">
-          <caret line="55" column="27" lean-forward="true" selection-start-line="55" selection-start-column="27" selection-end-line="55" selection-end-column="27" />
+        <state relative-caret-position="66">
+          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="58">
+          <caret line="18" column="28" selection-start-line="18" selection-start-column="19" selection-end-line="18" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="305">
+          <caret line="24" column="31" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="714">
+          <caret line="58" column="5" lean-forward="true" selection-start-line="58" selection-start-column="5" selection-end-line="58" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="924">
+          <caret line="134" column="92" selection-start-line="134" selection-start-column="92" selection-end-line="134" selection-end-column="92" />
+          <folding>
+            <element signature="method#linkDevice#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkPartitionCamera#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkReservePlan#0;class#PgAlarmLinkRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1066">
+          <caret line="90" lean-forward="true" selection-start-line="90" selection-end-line="90" />
+          <folding>
+            <element signature="method#getTjResultByAlarmType#0;class#PgAlarmTjRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="946">
+          <caret line="148" column="11" lean-forward="true" selection-start-line="148" selection-start-column="11" selection-end-line="148" selection-end-column="11" />
+          <folding>
+            <element signature="method#getAlarmTypeList#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#addAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#editAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#deleteAlarmType#0;class#PgAlarmTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="208">
+          <caret line="46" column="23" lean-forward="true" selection-start-line="46" selection-start-column="23" selection-end-line="46" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="113" column="9" lean-forward="true" selection-start-line="113" selection-start-column="9" selection-end-line="113" selection-end-column="9" />
+          <folding>
+            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
+            <element signature="method#getNewestCh4InfoByDev#0;class#PgCh4Rs#0" />
+            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="145" column="6" lean-forward="true" selection-start-line="145" selection-start-column="6" selection-end-line="145" selection-end-column="6" />
+          <folding>
+            <element signature="method#addAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#editAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#deleteAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#getAuthorityList#0;class#PgAuthorityRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="58" column="1" lean-forward="true" selection-start-line="58" selection-start-column="1" selection-end-line="58" selection-end-column="1" />
+          <folding>
+            <element signature="method#getPgAssetPlanList#0;class#PgAssetPlanRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="370">
+          <caret line="371" column="66" selection-start-line="371" selection-start-column="66" selection-end-line="371" selection-end-column="66" />
+          <folding>
+            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#searchConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionDev#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="139" column="13" lean-forward="true" selection-start-line="139" selection-start-column="13" selection-end-line="139" selection-end-column="13" />
+          <folding>
+            <element signature="method#getCoInfoByDevAndDate#0;class#PgCoRs#0" />
+            <element signature="method#getNewestCoInfoByDev#0;class#PgCoRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="540">
+          <caret line="223" column="5" lean-forward="true" selection-start-line="223" selection-start-column="5" selection-end-line="223" selection-end-column="5" />
+          <folding>
+            <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="682">
+          <caret line="100" lean-forward="true" selection-start-line="100" selection-end-line="100" />
+          <folding>
+            <element signature="method#getDeviceTpeyList#0;class#PgDeviceTypeRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="377">
+          <caret line="225" column="35" selection-start-line="225" selection-start-column="35" selection-end-line="225" selection-end-column="35" />
+          <folding>
+            <element signature="method#addEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#addEquipment#1;class#PgEquipmentRs#0" />
+            <element signature="method#getEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#deleteEquipment#0;class#PgEquipmentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="406">
+          <caret line="109" lean-forward="true" selection-start-line="109" selection-end-line="109" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="154">
+          <caret line="28" column="19" selection-start-line="28" selection-start-column="19" selection-end-line="28" selection-end-column="19" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="748">
-          <caret line="49" column="5" lean-forward="true" selection-start-line="49" selection-start-column="5" selection-end-line="49" selection-end-column="5" />
+        <state relative-caret-position="296">
+          <caret line="161" column="35" selection-start-line="161" selection-start-column="35" selection-end-line="161" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="384">
+          <caret line="99" column="5" lean-forward="true" selection-start-line="99" selection-start-column="5" selection-end-line="99" selection-end-column="5" />
+        </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="362">
+          <caret line="340" column="35" selection-start-line="340" selection-start-column="35" selection-end-line="340" selection-end-column="35" />
+          <folding>
+            <element signature="method#addInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPersonInPg#0;class#PgInPgPersonRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-606">
+          <caret line="76" column="20" lean-forward="true" selection-start-line="76" selection-start-column="20" selection-end-line="76" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="65" column="35" selection-start-line="65" selection-start-column="35" selection-end-line="65" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="101" column="35" selection-start-line="101" selection-start-column="35" selection-end-line="101" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="84" column="35" selection-start-line="84" selection-start-column="35" selection-end-line="84" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="59" lean-forward="true" selection-start-line="59" selection-end-line="59" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="60" column="1" lean-forward="true" selection-start-line="60" selection-start-column="1" selection-end-line="60" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="145" column="35" selection-start-line="145" selection-start-column="35" selection-end-line="145" selection-end-column="35" />
+        </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="274">
+          <caret line="350" column="35" selection-start-line="350" selection-start-column="35" selection-end-line="350" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="121" column="39" selection-start-line="121" selection-start-column="39" selection-end-line="121" selection-end-column="39" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="28" column="8" lean-forward="true" selection-start-line="28" selection-start-column="8" selection-end-line="28" selection-end-column="8" />
+        <state relative-caret-position="340">
+          <caret line="103" selection-start-line="103" selection-end-line="103" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="226" column="35" selection-start-line="226" selection-start-column="35" selection-end-line="226" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="203" column="35" selection-start-line="203" selection-start-column="35" selection-end-line="203" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="241" column="35" selection-start-line="241" selection-start-column="35" selection-end-line="241" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="225" column="1" lean-forward="true" selection-start-line="225" selection-start-column="1" selection-end-line="225" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="176" column="5" lean-forward="true" selection-start-line="176" selection-start-column="5" selection-end-line="176" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="178" column="35" lean-forward="true" selection-start-line="178" selection-start-column="35" selection-end-line="178" selection-end-column="35" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="516">
-          <caret line="94" column="53" selection-start-line="94" selection-start-column="53" selection-end-line="94" selection-end-column="53" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="814">
-          <caret line="52" column="9" lean-forward="true" selection-start-line="52" selection-start-column="9" selection-end-line="52" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="182">
-          <caret line="58" column="12" lean-forward="true" selection-start-line="58" selection-start-column="12" selection-end-line="58" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="34" lean-forward="true" selection-start-line="34" selection-end-line="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="32" lean-forward="true" selection-start-line="32" selection-end-line="32" />
-          <folding>
-            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
-            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="185">
-          <caret line="63" column="13" selection-start-line="63" selection-start-column="13" selection-end-line="63" selection-end-column="13" />
-          <folding>
-            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
-            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
-            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="e#6319#6324#0" />
-            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
-          </folding>
+          <caret line="240" lean-forward="true" selection-start-line="240" selection-end-line="240" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
-          <caret line="58" column="28" lean-forward="true" selection-start-line="58" selection-start-column="28" selection-end-line="58" selection-end-column="28" />
-          <folding>
-            <element signature="method#addTempHumData#0;class#PgTempHumRs#0" />
-          </folding>
+        <state relative-caret-position="340">
+          <caret line="148" column="34" selection-start-line="148" selection-start-column="34" selection-end-line="148" selection-end-column="34" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
+        <state relative-caret-position="458">
+          <caret line="99" column="35" selection-start-line="99" selection-start-column="35" selection-end-line="99" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+        <state relative-caret-position="384">
+          <caret line="145" column="32" lean-forward="true" selection-start-line="145" selection-start-column="32" selection-end-line="145" selection-end-column="32" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="414">
-          <caret line="22" column="46" lean-forward="true" selection-start-line="22" selection-start-column="46" selection-end-line="22" selection-end-column="46" />
-        </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="396">
-          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" column="83" selection-start-line="11" selection-start-column="83" selection-end-line="11" selection-end-column="83" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="26">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
-          <folding>
-            <element signature="method#getPgInPgStatusByPerson#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNumByName#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNum#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPersonListByDay#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPgStatusByPgInPgPerson#0;class#PgInPgStatusManager#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="44">
-          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-12">
-          <caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="87" lean-forward="true" selection-start-line="87" selection-end-line="87" />
-          <folding>
-            <element signature="method#getConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#addConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#deleteConstructionType#0;class#PgConstructionTypeRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
-          <folding>
-            <element signature="method#getConstructionTypeByType#0;class#PgConstructionTypeManager#0" />
-            <element signature="method#getAllConstructionTypeDto#0;class#PgConstructionTypeManager#0" />
-          </folding>
-        </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="145">
-          <caret line="258" column="9" lean-forward="true" selection-start-line="258" selection-start-column="9" selection-end-line="258" selection-end-column="9" />
-          <folding>
-            <element signature="method#getMonthInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayInPgStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgOverViewRs#0" />
-            <element signature="method#getAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getMonthAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayAlarmStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgOverViewRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="103">
-          <caret line="105" column="50" lean-forward="true" selection-start-line="105" selection-start-column="50" selection-end-line="105" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateBasicDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="99">
-          <caret line="125" selection-start-line="125" selection-end-line="125" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="190">
-          <caret line="24" column="35" lean-forward="true" selection-start-line="24" selection-start-column="35" selection-end-line="24" selection-end-column="35" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="436">
-          <caret line="24" lean-forward="true" selection-start-line="24" selection-end-line="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" lean-forward="true" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="300">
-          <caret line="34" column="31" lean-forward="true" selection-start-line="34" selection-start-column="31" selection-end-line="34" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="42" column="13" lean-forward="true" selection-start-line="42" selection-start-column="13" selection-end-line="42" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="120" column="72" lean-forward="true" selection-start-line="120" selection-start-column="72" selection-end-line="120" selection-end-column="72" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="293">
-          <caret line="58" column="73" lean-forward="true" selection-start-line="58" selection-start-column="73" selection-end-line="58" selection-end-column="73" />
-          <folding>
-            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
-            <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
-          </folding>
-        </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="307">
-          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
+        <state relative-caret-position="758">
+          <caret line="130" column="5" lean-forward="true" selection-start-line="130" selection-start-column="5" selection-end-line="130" selection-end-column="5" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1170">
-          <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
+        <state relative-caret-position="494">
+          <caret line="86" column="62" lean-forward="true" selection-start-line="86" selection-start-column="62" selection-end-line="86" selection-end-column="62" />
           <folding>
-            <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-            <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+            <element signature="method#getAllDevice#0;class#PgDeviceManager#0" />
+            <element signature="method#getAllDev#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="195" column="28" lean-forward="true" selection-start-line="195" selection-start-column="28" selection-end-line="195" selection-end-column="28" />
+        <state relative-caret-position="166">
+          <caret line="174" column="13" lean-forward="true" selection-start-line="174" selection-start-column="13" selection-end-line="174" selection-end-column="13" />
           <folding>
-            <element signature="method#getAlarmByTypeAndTime#0;class#PgAlarmManager#0" />
-            <element signature="method#getAlarmNum#0;class#PgAlarmManager#0" />
             <element signature="method#getDayAlarmStatistic#0;class#PgAlarmManager#0" />
+            <element signature="method#getAlarmList#0;class#PgAlarmManager#0" />
             <element signature="method#createDTO#0;class#PgAlarmManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="364">
+          <caret line="46" column="56" lean-forward="true" selection-start-line="46" selection-start-column="56" selection-end-line="46" selection-end-column="56" />
+          <folding>
+            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
+            <element signature="method#getPgDev#0;class#PgDeviceRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
+            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+        <state relative-caret-position="396">
+          <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
           <folding>
             <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
             <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -1365,52 +1331,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="239">
-          <caret line="21" column="33" lean-forward="true" selection-start-line="21" selection-start-column="33" selection-end-line="21" selection-end-column="33" />
-        </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="352">
-          <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-        </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="99">
-          <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-          </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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-          <folding>
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-            <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>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
index c436c93..e913155 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
@@ -132,7 +132,10 @@
             this.setAlarmType("");
         else
             this.setAlarmType(pgAlarm.getAlarmTypeId().getAlarmType());
-        this.setAlarmValue(pgAlarm.getAlarmValue());
+        if(pgAlarm.getAlarmValue()==null)
+            this.setAlarmValue("");
+        else
+            this.setAlarmValue(pgAlarm.getAlarmValue());
         if (pgAlarm.getAlarmDate() != null)
             this.setAlarmDate(sdf.format(pgAlarm.getAlarmDate()));
         else
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
index a43965c..565cb41 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -159,11 +159,21 @@
     }
 
     //获取历史报警消息列表
-    public List<PgAlarmDto> getAllAlarm(String alarmType,String startDay,String endDay,String isNew,int page,int rows) {
-        try {
+    public  Map<String, Object> getAllAlarm(String alarmType,String partition,String startDay,String endDay,String isNew,int page,int rows) {
 
+        Map<String, Object> resultMap = new HashMap<>();
+        String msg="";
+
+        try {
             Criteria criteria = createCriteria(PgAlarm.class);
 
+            if (StringUtils.isNotBlank(partition)) {
+                DetachedCriteria inCriteria = DetachedCriteria.forClass(PgDevice.class);
+                inCriteria.add(Restrictions.eq("partition", partition));
+                inCriteria.setProjection(Property.forName("id"));
+                criteria.add(Property.forName("alarmDevId").in(inCriteria));
+            }
+
             if (StringUtils.isNotBlank(alarmType)&&!alarmType.contains("全部")&&pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
                 criteria.add(Restrictions.eq("alarmTypeId", pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)));
 
@@ -190,8 +200,16 @@
             for (PgAlarm pgAlarm : pgAlarmList) {
                 pgAlarmDtoList.add(new PgAlarmDto(pgAlarm));
             }
-
-            return pgAlarmDtoList;
+            if(pgAlarmDtoList==null||pgAlarmDtoList.size()==0) {
+                resultMap.put("msg", "没有报警信息");
+                resultMap.put("code","0");
+            }else {
+                resultMap.put("code","200");
+                resultMap.put("msg", "报警信息获取成功");
+            }
+            resultMap.put("count",pg.getTotalCount());
+            resultMap.put("result",pgAlarmDtoList);
+            return resultMap;
         }
         catch(Exception ex){
             ex.printStackTrace();
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index 7547560..654f49e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -24,11 +24,11 @@
 
         Criteria criteria = createCriteria(PgDevice.class);
 
-        if(road!=null)
+        if(StringUtils.isNotBlank(road))
             criteria.add(Restrictions.eq("road",road));
-        if(partition!=null)
+        if(StringUtils.isNotBlank(partition))
             criteria.add(Restrictions.eq("partition",partition));
-        if(devType!=null)
+        if(StringUtils.isNotBlank(devType))
             criteria.add(Restrictions.eq("devType",devType));
 
         criteria.add(Restrictions.eq("active", 1));
@@ -43,6 +43,29 @@
         return pgDeviceDtoList;
     }
 
+    public List<PgDeviceDto> getAllDev(String road,String partition,String devType) {
+
+        Criteria criteria = createCriteria(PgDevice.class);
+
+        if(StringUtils.isNotBlank(road))
+            criteria.add(Restrictions.eq("road",road));
+        if(StringUtils.isNotBlank(partition))
+            criteria.add(Restrictions.eq("partition",partition));
+        if(StringUtils.isNotBlank(devType))
+            criteria.add(Restrictions.like("devType","%"+devType+"%"));
+
+        criteria.add(Restrictions.eq("active", 1));
+        criteria.addOrder(Order.desc("id"));
+        List<PgDevice> pgDeviceList = criteria.list();
+
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
+        for (PgDevice pgDevice : pgDeviceList) {
+            pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
+        }
+
+        return pgDeviceDtoList;
+    }
+
     //根据名字获取当前设备
     public PgDevice getDeviceByAssetCode(String assetCode) {
         Criteria criteria=createCriteria(PgDevice.class);
@@ -56,9 +79,9 @@
     }
 
     //根据类型获取设备列表
-    public List<PgDeviceDto> getDeviceByDevTypee(String devType) {
+    public List<PgDeviceDto> getDeviceByDevType(String devType) {
         Criteria criteria=createCriteria(PgDevice.class);
-        criteria.add(Restrictions.eq("devType",devType));
+        criteria.add(Restrictions.like("devType","%"+devType+"%"));
 
         List<PgDevice> pgDeviceList=criteria.list();
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
@@ -106,7 +129,7 @@
         criteria.add(Restrictions.eq("partition",partition));
 
         List<PgDevice> pgDeviceList=criteria.list();
-        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<PgDeviceDto>();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
 
         for (PgDevice pgDevice : pgDeviceList) {
             pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
index 3a3bccd..595730e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
@@ -1,10 +1,13 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.devTable.domain.PgAlarmType;
 import com.casic.PgInterface.devTable.domain.PgPartition;
 import com.casic.PgInterface.devTable.domain.PgRoad;
 import com.casic.PgInterface.devTable.domain.PipeGallery;
 import com.casic.PgInterface.devTable.dto.PgPartitionDto;
+import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
@@ -12,7 +15,9 @@
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Created by yxw on 2017/11/4.
@@ -21,7 +26,8 @@
 public class PgPartitionManager extends HibernateEntityDao<PgPartition> {
 
     @Resource
-    PgRoadManager pgRoadManager;
+    private PgRoadManager pgRoadManager;
+
 
     public PgPartition getPartitionByParName(String parName) {
         Criteria criteria = getSession().createCriteria(PgPartition.class);
@@ -99,4 +105,5 @@
         return pgPartitionDtoList;
     }
 
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
index f216360..a6928f1 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
@@ -5,6 +5,7 @@
 public class PgPlanResultRe {
 
     private String taskKey;
+    private List<String> pileAcuList;
     private List<PgPlanResult> pgPlanResultList;
 
     public String getTaskKey() {
@@ -15,6 +16,14 @@
         this.taskKey = taskKey;
     }
 
+    public List<String> getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(List<String> pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+
     public List<PgPlanResult> getPgPlanResultList() {
         return pgPlanResultList;
     }
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
index 71ea765..47eea07 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
@@ -54,9 +54,7 @@
 
         List<PgLineHole> pgLineHoleList=criteria.list();
         List<PgLineHoleDTO> pgLineHoleDTOList=new ArrayList<>();
-        if(pgLineHoleList==null||pgLineHoleList.size()==0)
-            return null;
-        else
+        if(pgLineHoleList!=null&&pgLineHoleList.size()!=0)
             pgLineHoleDTOList=PgLineHoleDTO.ConvertToDTOList(pgLineHoleList,pgPileAcuManager,pgRoadManager);
         return pgLineHoleDTOList;
     }
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
index 0fd9e1f..841a386 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
@@ -1,12 +1,15 @@
 package com.casic.PgInterface.intelPlan.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.devTable.domain.PgPartition;
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
 import com.casic.PgInterface.intelPlan.domain.PgLineHole;
 import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
 import com.casic.PgInterface.intelPlan.domain.PgSection;
 import com.casic.PgInterface.intelPlan.dto.PgPlanResult;
 import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
 import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -22,6 +25,9 @@
     @Resource
     private PgLineHoleManager pgLineHoleManager;
 
+    @Resource
+    private PgRoadManager pgRoadManager;
+
     public PgPileAcu getPgPileAcuByCode(String acuCode){
         List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
 
@@ -58,7 +64,9 @@
         for(PgPlanTask pgPlanTask:pgPlanTaskList){
             List<PgPlanResult> pgPlanResultList=getPgPlanResultByPlantask(pgPlanTask);
             PgPlanResultRe pgPlanResultRe=new PgPlanResultRe();
+
             pgPlanResultRe.setTaskKey(pgPlanTask.getTaskKey());
+            pgPlanResultRe.setPileAcuList(pgPlanTask.getPileAcuList());
             pgPlanResultRe.setPgPlanResultList(pgPlanResultList);
 
             pgPlanResultReList.add(pgPlanResultRe);
@@ -142,4 +150,57 @@
         return length;
     }
 
+    private PgPileAcu getPgPileAcuByAcuCode(String acuCode){
+        List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
+
+        if(pgPileAcuList==null||pgPileAcuList.size()==0)
+            return null;
+        else
+            return pgPileAcuList.get(0);
+    }
+
+    public List<PgAcuTask> getACUTask(String pileAcuList){
+        String[] acuArray=pileAcuList.split(",");
+        List<PgAcuTask> pgAcuTaskList=new ArrayList<>();
+
+        for(String acu:acuArray){
+            PgPileAcu pgPileAcu=this.getPgPileAcuByCode(acu);
+            String roadName=pgRoadManager.get(pgPileAcu.getRoadId()).getRoadName();
+
+            if(!containRoad(roadName,pgAcuTaskList))
+            {
+                PgAcuTask pgAcuTask=new PgAcuTask();
+                pgAcuTask.setRoadName(roadName);
+                pgAcuTask.setPileAcuList(acu);
+                pgAcuTaskList.add(pgAcuTask);
+            }
+            else{
+                PgAcuTask pgAcuTask=getIndexRoad(roadName,pgAcuTaskList);
+                if(pgAcuTask!=null)
+                    pgAcuTask.setPileAcuList(pgAcuTask.getPileAcuList()+","+acu);
+            }
+        }
+
+        return pgAcuTaskList;
+    }
+
+    private boolean containRoad(String roadName,List<PgAcuTask> pgAcuTaskList){
+        if(pgAcuTaskList==null||pgAcuTaskList.size()==0) return false;
+        for(PgAcuTask pgAcuTask:pgAcuTaskList){
+            if(pgAcuTask.getRoadName().equals(roadName))
+                return true;
+        }
+
+        return false;
+    }
+
+    private PgAcuTask getIndexRoad(String roadName, List<PgAcuTask> pgAcuTaskList){
+        for(PgAcuTask pgAcuTask:pgAcuTaskList){
+            if(pgAcuTask.getRoadName().equals(roadName))
+                return pgAcuTask;
+        }
+
+        return null;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java
new file mode 100644
index 0000000..323f7ef
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java
@@ -0,0 +1,25 @@
+package com.casic.PgInterface.reservePlan.dto;
+
+import java.util.List;
+
+public class PgAcuTask {
+
+    private String roadName;//道路
+    private String pileAcuList;//acu分区
+
+    public String getRoadName() {
+        return roadName;
+    }
+
+    public void setRoadName(String roadName) {
+        this.roadName = roadName;
+    }
+
+    public String getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(String pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
index c25e926..c7d7693 100644
--- a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
@@ -70,9 +70,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(Long.valueOf(inPgPersonId));
         PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("hostName",pgInPgPerson.getAssetCode());
-//        PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode());
-//        long maxId = pgTagPositionManager.getMaxId(pgTagMac.getTagMac());
-//        PGTagPosition pgTagPosition = pgTagPositionManager.get(maxId);
+
         PGTagPosition pgTagPosition = tagmacRun.GetTagStatus(pgTagMac);
         boolean bExist = false;
         bExist = pgTagPositionManager.findTagPosition(pgTagPosition.getPositionUpdatetime(),pgTagPosition.getHostId());
@@ -104,8 +102,7 @@
         PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(Long.valueOf(inPgPersonId));
         PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pgInPgPersonId",pgInPgPerson);
         System.out.println("time:"+pgInPgStatus.getInTime());
-//        PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pgInPgPersonId",inPgPersonId);
-//        PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode());
+
         PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("hostName",pgInPgPerson.getAssetCode());
 
         Map<Object,Object> mapPosition = new HashMap<>();
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
index 082ba5d..3eed00a 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
@@ -48,6 +48,7 @@
     public Map<String, Object> linkDevice(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         PgDeviceDto pgDeviceDto = null;
         try {
@@ -62,6 +63,7 @@
                     else {
                         pgDeviceDto = new PgDeviceDto(pgDevice);
                         msg = "报警关联设备获取成功";
+                        code="200";
                     }
                 }
             }
@@ -71,6 +73,7 @@
             e.printStackTrace();
             msg = "获取关联设备失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceDto);
 
@@ -86,6 +89,7 @@
     public Map<String, Object> linkPartitionCamera(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
         try {
@@ -106,6 +110,7 @@
 
                         pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(partition,position);
                         msg = "关联设备获取成功";
+                        code="200";
                     }
                 }
             }
@@ -115,6 +120,7 @@
             e.printStackTrace();
             msg = "分区设备关联失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceDtoList);
         return resultMap;
@@ -129,6 +135,7 @@
     public Map<String, Object> linkReservePlan(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgReservePlanDto> pgReservePlanDtoList=new ArrayList<>();
         try{
@@ -139,10 +146,12 @@
                 else {
                     pgReservePlanDtoList = pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
 
-                    if(pgReservePlanDtoList==null||pgReservePlanDtoList.size()==0)
-                        msg="不存在关联的报警预案";
-                    else
+                    if (pgReservePlanDtoList == null || pgReservePlanDtoList.size() == 0)
+                        msg = "不存在关联的报警预案";
+                    else {
                         msg = "关联预案获取成功";
+                        code="200";
+                    }
                 }
             }
             else
@@ -153,6 +162,7 @@
             e.printStackTrace();
             msg="预案关联失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgReservePlanDtoList);
 

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 25ded8a..283d7ab 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,20 +7,56 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" 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/construction/manager/PgCsDocumentManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/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/manager/PgAlarmManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/~$说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/~$说明20191207.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.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$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/接口说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明20191207.docx" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
@@ -51,7 +87,7 @@
         <counts>
           <entry key="class" value="4" />
           <entry key="iml" value="2" />
-          <entry key="java" value="707" />
+          <entry key="java" value="820" />
           <entry key="properties" value="14" />
           <entry key="xml" value="7" />
         </counts>
@@ -60,7 +96,7 @@
         <counts>
           <entry key="CLASS" value="4" />
           <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="707" />
+          <entry key="JAVA" value="820" />
           <entry key="Properties" value="14" />
           <entry key="XML" value="7" />
         </counts>
@@ -68,32 +104,32 @@
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
           <entry key="dummy" value="38" />
-          <entry key="java" value="30161" />
+          <entry key="java" value="40859" />
           <entry key="properties" value="100" />
-          <entry key="txt" value="176" />
+          <entry key="txt" value="186" />
           <entry key="xml" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="30161" />
-          <entry key="PLAIN_TEXT" value="214" />
+          <entry key="JAVA" value="40859" />
+          <entry key="PLAIN_TEXT" value="224" />
           <entry key="Properties" value="100" />
           <entry key="XML" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="48" />
+          <entry key="project.closed" value="51" />
           <entry key="project.open.time.1" value="5" />
           <entry key="project.open.time.12" value="2" />
           <entry key="project.open.time.13" value="1" />
           <entry key="project.open.time.15" value="1" />
           <entry key="project.open.time.16" value="1" />
           <entry key="project.open.time.17" value="1" />
-          <entry key="project.open.time.2" value="1" />
+          <entry key="project.open.time.2" value="2" />
           <entry key="project.open.time.20" value="1" />
-          <entry key="project.open.time.23" value="1" />
+          <entry key="project.open.time.23" value="2" />
           <entry key="project.open.time.24" value="2" />
           <entry key="project.open.time.251" value="1" />
           <entry key="project.open.time.27" value="2" />
@@ -106,8 +142,8 @@
           <entry key="project.open.time.36" value="1" />
           <entry key="project.open.time.37" value="1" />
           <entry key="project.open.time.39" value="2" />
-          <entry key="project.open.time.4" value="2" />
-          <entry key="project.open.time.40" value="1" />
+          <entry key="project.open.time.4" value="3" />
+          <entry key="project.open.time.40" value="2" />
           <entry key="project.open.time.41" value="2" />
           <entry key="project.open.time.42" value="2" />
           <entry key="project.open.time.43" value="2" />
@@ -122,23 +158,25 @@
           <entry key="project.open.time.6" value="3" />
           <entry key="project.open.time.63" value="2" />
           <entry key="project.open.time.64" value="1" />
+          <entry key="project.open.time.66" value="1" />
           <entry key="project.open.time.71" value="2" />
+          <entry key="project.open.time.74" value="1" />
           <entry key="project.open.time.76" value="1" />
           <entry key="project.open.time.8" value="2" />
           <entry key="project.open.time.9" value="1" />
           <entry key="project.open.time.97" value="1" />
-          <entry key="project.opened" value="78" />
+          <entry key="project.opened" value="84" />
         </counts>
       </usages-collector>
     </session>
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+            <state relative-caret-position="396">
+              <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
               <folding>
                 <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
                 <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -147,73 +185,6 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <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="99">
-              <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-              <folding>
-                <element signature="imports" expanded="true" />
-                <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-1170">
-              <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state>
-              <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
-              <folding>
-                <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-                <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="true">
-        <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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-              <folding>
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-                <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>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <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="352">
-              <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -225,18 +196,9 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>inCriteria</find>
-      <find>getPgPlanResulList</find>
-      <find>getPileAcuListByPileAcuStr</find>
-      <find>distinct</find>
-      <find>order</find>
-      <find>canPlanLine</find>
-      <find>isExistLine</find>
-      <find>getPlanResult</find>
       <find>pgPipeLine</find>
       <find>getPipeLineBylineName</find>
       <find>StringU</find>
-      <find>getAllAlarm</find>
       <find>getAlarmList</find>
       <find>getPgInPersonListByDay</find>
       <find>getDayInPgStatistic</find>
@@ -254,7 +216,16 @@
       <find>getPgContructionByNameOrType</find>
       <find>&quot;&quot;,&quot;&quot;,</find>
       <find>getPgContructionDtoByNameOrType</find>
+      <find>addConstruction</find>
+      <find>getPgLineAcuHole</find>
+      <find>getPlanResult</find>
       <find>getConstruction</find>
+      <find>addPipeLine</find>
+      <find>未找到入廊数据</find>
+      <find>getCurrentHoleByAcu</find>
+      <find>getAllAlarm</find>
+      <find>getPgDeviceDtoListByPartition</find>
+      <find>getPgDeviceByDevType</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -263,57 +234,57 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlan.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileHoleManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/planData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/PlanData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
       </list>
     </option>
   </component>
@@ -359,7 +330,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -421,53 +391,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="dto" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="manager" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -479,29 +402,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="rs" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -516,6 +416,7 @@
         </subPane>
       </pane>
       <pane id="Scope" />
+      <pane id="PackagesPane" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -710,7 +611,13 @@
       <workItem from="1574902733573" duration="1829000" />
       <workItem from="1574998240004" duration="7016000" />
       <workItem from="1575247959683" duration="6997000" />
-      <workItem from="1575704345590" duration="40473000" />
+      <workItem from="1575704345590" duration="69381000" />
+      <workItem from="1575869479666" duration="721000" />
+      <workItem from="1575947104878" duration="6101000" />
+      <workItem from="1576128264436" duration="3347000" />
+      <workItem from="1576208571543" duration="22000" />
+      <workItem from="1576227513917" duration="862000" />
+      <workItem from="1576293721220" duration="18246000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -817,11 +724,18 @@
       <option name="project" value="LOCAL" />
       <updated>1575775489149</updated>
     </task>
-    <option name="localTasksCounter" value="16" />
+    <task id="LOCAL-00016" summary="整改施工信息">
+      <created>1575791780774</created>
+      <option name="number" value="00016" />
+      <option name="presentableId" value="LOCAL-00016" />
+      <option name="project" value="LOCAL" />
+      <updated>1575791780774</updated>
+    </task>
+    <option name="localTasksCounter" value="17" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="452131000" />
+    <option name="totallyTimeSpent" value="510338000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -834,9 +748,8 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
-    <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.24205749" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2647504" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -847,7 +760,7 @@
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.3295082" />
       <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.4819672" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.65737706" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.3295082" />
@@ -939,7 +852,8 @@
     <MESSAGE value="重新设计智能规划部分" />
     <MESSAGE value="完成智能规划对接" />
     <MESSAGE value="修改报警统计" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改报警统计" />
+    <MESSAGE value="整改施工信息" />
+    <option name="LAST_COMMIT_MESSAGE" value="整改施工信息" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -951,16 +865,10 @@
           <option name="timeStamp" value="3" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java</url>
-          <line>69</line>
+          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java</url>
+          <line>40</line>
           <properties />
-          <option name="timeStamp" value="21" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java</url>
-          <line>96</line>
-          <properties />
-          <option name="timeStamp" value="38" />
+          <option name="timeStamp" value="122" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
@@ -970,394 +878,452 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <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="2068">
-          <caret line="154" column="35" selection-start-line="154" selection-start-column="35" selection-end-line="154" selection-end-column="35" />
-        </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="3300">
-          <caret line="297" column="22" selection-start-line="297" selection-start-column="22" selection-end-line="297" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/StringUtils.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
-          <caret line="13" column="48" lean-forward="true" selection-start-line="13" selection-start-column="48" selection-end-line="13" selection-end-column="48" />
+          <caret line="11" column="5" selection-start-line="11" selection-start-column="5" selection-end-line="11" selection-end-column="5" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="78" lean-forward="true" selection-start-line="78" selection-end-line="78" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="616">
-          <caret line="41" column="1" selection-start-line="41" selection-start-column="1" selection-end-line="41" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="110">
-          <caret line="12" column="23" selection-start-line="12" selection-start-column="23" selection-end-line="12" selection-end-column="23" />
+        <state relative-caret-position="516">
+          <caret line="114" column="12" selection-start-line="114" selection-start-column="12" selection-end-line="114" selection-end-column="12" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="164">
-          <caret line="56" lean-forward="true" selection-start-line="56" selection-end-line="56" />
+        <state relative-caret-position="418">
+          <caret line="33" column="44" selection-start-line="33" selection-start-column="44" selection-end-line="33" selection-end-column="44" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="258">
-          <caret line="27" column="12" lean-forward="true" selection-start-line="27" selection-start-column="12" selection-end-line="27" selection-end-column="12" />
+        <state relative-caret-position="132">
+          <caret line="11" column="20" lean-forward="true" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="20" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.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="-12">
-          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        <state relative-caret-position="516">
+          <caret line="142" column="54" selection-start-line="142" selection-start-column="54" selection-end-line="142" selection-end-column="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="858">
-          <caret line="55" column="27" lean-forward="true" selection-start-line="55" selection-start-column="27" selection-end-line="55" selection-end-column="27" />
+        <state relative-caret-position="66">
+          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="58">
+          <caret line="18" column="28" selection-start-line="18" selection-start-column="19" selection-end-line="18" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="305">
+          <caret line="24" column="31" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="714">
+          <caret line="58" column="5" lean-forward="true" selection-start-line="58" selection-start-column="5" selection-end-line="58" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="924">
+          <caret line="134" column="92" selection-start-line="134" selection-start-column="92" selection-end-line="134" selection-end-column="92" />
+          <folding>
+            <element signature="method#linkDevice#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkPartitionCamera#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkReservePlan#0;class#PgAlarmLinkRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1066">
+          <caret line="90" lean-forward="true" selection-start-line="90" selection-end-line="90" />
+          <folding>
+            <element signature="method#getTjResultByAlarmType#0;class#PgAlarmTjRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="946">
+          <caret line="148" column="11" lean-forward="true" selection-start-line="148" selection-start-column="11" selection-end-line="148" selection-end-column="11" />
+          <folding>
+            <element signature="method#getAlarmTypeList#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#addAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#editAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#deleteAlarmType#0;class#PgAlarmTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="208">
+          <caret line="46" column="23" lean-forward="true" selection-start-line="46" selection-start-column="23" selection-end-line="46" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="113" column="9" lean-forward="true" selection-start-line="113" selection-start-column="9" selection-end-line="113" selection-end-column="9" />
+          <folding>
+            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
+            <element signature="method#getNewestCh4InfoByDev#0;class#PgCh4Rs#0" />
+            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="145" column="6" lean-forward="true" selection-start-line="145" selection-start-column="6" selection-end-line="145" selection-end-column="6" />
+          <folding>
+            <element signature="method#addAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#editAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#deleteAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#getAuthorityList#0;class#PgAuthorityRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="58" column="1" lean-forward="true" selection-start-line="58" selection-start-column="1" selection-end-line="58" selection-end-column="1" />
+          <folding>
+            <element signature="method#getPgAssetPlanList#0;class#PgAssetPlanRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="370">
+          <caret line="371" column="66" selection-start-line="371" selection-start-column="66" selection-end-line="371" selection-end-column="66" />
+          <folding>
+            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#searchConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionDev#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="139" column="13" lean-forward="true" selection-start-line="139" selection-start-column="13" selection-end-line="139" selection-end-column="13" />
+          <folding>
+            <element signature="method#getCoInfoByDevAndDate#0;class#PgCoRs#0" />
+            <element signature="method#getNewestCoInfoByDev#0;class#PgCoRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="540">
+          <caret line="223" column="5" lean-forward="true" selection-start-line="223" selection-start-column="5" selection-end-line="223" selection-end-column="5" />
+          <folding>
+            <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="682">
+          <caret line="100" lean-forward="true" selection-start-line="100" selection-end-line="100" />
+          <folding>
+            <element signature="method#getDeviceTpeyList#0;class#PgDeviceTypeRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="377">
+          <caret line="225" column="35" selection-start-line="225" selection-start-column="35" selection-end-line="225" selection-end-column="35" />
+          <folding>
+            <element signature="method#addEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#addEquipment#1;class#PgEquipmentRs#0" />
+            <element signature="method#getEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#deleteEquipment#0;class#PgEquipmentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="406">
+          <caret line="109" lean-forward="true" selection-start-line="109" selection-end-line="109" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="154">
+          <caret line="28" column="19" selection-start-line="28" selection-start-column="19" selection-end-line="28" selection-end-column="19" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="748">
-          <caret line="49" column="5" lean-forward="true" selection-start-line="49" selection-start-column="5" selection-end-line="49" selection-end-column="5" />
+        <state relative-caret-position="296">
+          <caret line="161" column="35" selection-start-line="161" selection-start-column="35" selection-end-line="161" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="384">
+          <caret line="99" column="5" lean-forward="true" selection-start-line="99" selection-start-column="5" selection-end-line="99" selection-end-column="5" />
+        </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="362">
+          <caret line="340" column="35" selection-start-line="340" selection-start-column="35" selection-end-line="340" selection-end-column="35" />
+          <folding>
+            <element signature="method#addInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPersonInPg#0;class#PgInPgPersonRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-606">
+          <caret line="76" column="20" lean-forward="true" selection-start-line="76" selection-start-column="20" selection-end-line="76" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="65" column="35" selection-start-line="65" selection-start-column="35" selection-end-line="65" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="101" column="35" selection-start-line="101" selection-start-column="35" selection-end-line="101" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="84" column="35" selection-start-line="84" selection-start-column="35" selection-end-line="84" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="59" lean-forward="true" selection-start-line="59" selection-end-line="59" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="60" column="1" lean-forward="true" selection-start-line="60" selection-start-column="1" selection-end-line="60" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="145" column="35" selection-start-line="145" selection-start-column="35" selection-end-line="145" selection-end-column="35" />
+        </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="274">
+          <caret line="350" column="35" selection-start-line="350" selection-start-column="35" selection-end-line="350" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="121" column="39" selection-start-line="121" selection-start-column="39" selection-end-line="121" selection-end-column="39" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="28" column="8" lean-forward="true" selection-start-line="28" selection-start-column="8" selection-end-line="28" selection-end-column="8" />
+        <state relative-caret-position="340">
+          <caret line="103" selection-start-line="103" selection-end-line="103" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="226" column="35" selection-start-line="226" selection-start-column="35" selection-end-line="226" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="203" column="35" selection-start-line="203" selection-start-column="35" selection-end-line="203" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="241" column="35" selection-start-line="241" selection-start-column="35" selection-end-line="241" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="225" column="1" lean-forward="true" selection-start-line="225" selection-start-column="1" selection-end-line="225" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="176" column="5" lean-forward="true" selection-start-line="176" selection-start-column="5" selection-end-line="176" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="178" column="35" lean-forward="true" selection-start-line="178" selection-start-column="35" selection-end-line="178" selection-end-column="35" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="516">
-          <caret line="94" column="53" selection-start-line="94" selection-start-column="53" selection-end-line="94" selection-end-column="53" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="814">
-          <caret line="52" column="9" lean-forward="true" selection-start-line="52" selection-start-column="9" selection-end-line="52" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="182">
-          <caret line="58" column="12" lean-forward="true" selection-start-line="58" selection-start-column="12" selection-end-line="58" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="34" lean-forward="true" selection-start-line="34" selection-end-line="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="32" lean-forward="true" selection-start-line="32" selection-end-line="32" />
-          <folding>
-            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
-            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="185">
-          <caret line="63" column="13" selection-start-line="63" selection-start-column="13" selection-end-line="63" selection-end-column="13" />
-          <folding>
-            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
-            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
-            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="e#6319#6324#0" />
-            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
-          </folding>
+          <caret line="240" lean-forward="true" selection-start-line="240" selection-end-line="240" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
-          <caret line="58" column="28" lean-forward="true" selection-start-line="58" selection-start-column="28" selection-end-line="58" selection-end-column="28" />
-          <folding>
-            <element signature="method#addTempHumData#0;class#PgTempHumRs#0" />
-          </folding>
+        <state relative-caret-position="340">
+          <caret line="148" column="34" selection-start-line="148" selection-start-column="34" selection-end-line="148" selection-end-column="34" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
+        <state relative-caret-position="458">
+          <caret line="99" column="35" selection-start-line="99" selection-start-column="35" selection-end-line="99" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+        <state relative-caret-position="384">
+          <caret line="145" column="32" lean-forward="true" selection-start-line="145" selection-start-column="32" selection-end-line="145" selection-end-column="32" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="414">
-          <caret line="22" column="46" lean-forward="true" selection-start-line="22" selection-start-column="46" selection-end-line="22" selection-end-column="46" />
-        </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="396">
-          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" column="83" selection-start-line="11" selection-start-column="83" selection-end-line="11" selection-end-column="83" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="26">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
-          <folding>
-            <element signature="method#getPgInPgStatusByPerson#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNumByName#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNum#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPersonListByDay#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPgStatusByPgInPgPerson#0;class#PgInPgStatusManager#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="44">
-          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-12">
-          <caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="87" lean-forward="true" selection-start-line="87" selection-end-line="87" />
-          <folding>
-            <element signature="method#getConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#addConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#deleteConstructionType#0;class#PgConstructionTypeRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
-          <folding>
-            <element signature="method#getConstructionTypeByType#0;class#PgConstructionTypeManager#0" />
-            <element signature="method#getAllConstructionTypeDto#0;class#PgConstructionTypeManager#0" />
-          </folding>
-        </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="145">
-          <caret line="258" column="9" lean-forward="true" selection-start-line="258" selection-start-column="9" selection-end-line="258" selection-end-column="9" />
-          <folding>
-            <element signature="method#getMonthInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayInPgStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgOverViewRs#0" />
-            <element signature="method#getAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getMonthAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayAlarmStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgOverViewRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="103">
-          <caret line="105" column="50" lean-forward="true" selection-start-line="105" selection-start-column="50" selection-end-line="105" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateBasicDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="99">
-          <caret line="125" selection-start-line="125" selection-end-line="125" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="190">
-          <caret line="24" column="35" lean-forward="true" selection-start-line="24" selection-start-column="35" selection-end-line="24" selection-end-column="35" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="436">
-          <caret line="24" lean-forward="true" selection-start-line="24" selection-end-line="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" lean-forward="true" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="300">
-          <caret line="34" column="31" lean-forward="true" selection-start-line="34" selection-start-column="31" selection-end-line="34" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="42" column="13" lean-forward="true" selection-start-line="42" selection-start-column="13" selection-end-line="42" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="120" column="72" lean-forward="true" selection-start-line="120" selection-start-column="72" selection-end-line="120" selection-end-column="72" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="293">
-          <caret line="58" column="73" lean-forward="true" selection-start-line="58" selection-start-column="73" selection-end-line="58" selection-end-column="73" />
-          <folding>
-            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
-            <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
-          </folding>
-        </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="307">
-          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
+        <state relative-caret-position="758">
+          <caret line="130" column="5" lean-forward="true" selection-start-line="130" selection-start-column="5" selection-end-line="130" selection-end-column="5" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1170">
-          <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
+        <state relative-caret-position="494">
+          <caret line="86" column="62" lean-forward="true" selection-start-line="86" selection-start-column="62" selection-end-line="86" selection-end-column="62" />
           <folding>
-            <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-            <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+            <element signature="method#getAllDevice#0;class#PgDeviceManager#0" />
+            <element signature="method#getAllDev#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="195" column="28" lean-forward="true" selection-start-line="195" selection-start-column="28" selection-end-line="195" selection-end-column="28" />
+        <state relative-caret-position="166">
+          <caret line="174" column="13" lean-forward="true" selection-start-line="174" selection-start-column="13" selection-end-line="174" selection-end-column="13" />
           <folding>
-            <element signature="method#getAlarmByTypeAndTime#0;class#PgAlarmManager#0" />
-            <element signature="method#getAlarmNum#0;class#PgAlarmManager#0" />
             <element signature="method#getDayAlarmStatistic#0;class#PgAlarmManager#0" />
+            <element signature="method#getAlarmList#0;class#PgAlarmManager#0" />
             <element signature="method#createDTO#0;class#PgAlarmManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="364">
+          <caret line="46" column="56" lean-forward="true" selection-start-line="46" selection-start-column="56" selection-end-line="46" selection-end-column="56" />
+          <folding>
+            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
+            <element signature="method#getPgDev#0;class#PgDeviceRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
+            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+        <state relative-caret-position="396">
+          <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
           <folding>
             <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
             <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -1365,52 +1331,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="239">
-          <caret line="21" column="33" lean-forward="true" selection-start-line="21" selection-start-column="33" selection-end-line="21" selection-end-column="33" />
-        </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="352">
-          <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-        </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="99">
-          <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-          </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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-          <folding>
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-            <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>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
index c436c93..e913155 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
@@ -132,7 +132,10 @@
             this.setAlarmType("");
         else
             this.setAlarmType(pgAlarm.getAlarmTypeId().getAlarmType());
-        this.setAlarmValue(pgAlarm.getAlarmValue());
+        if(pgAlarm.getAlarmValue()==null)
+            this.setAlarmValue("");
+        else
+            this.setAlarmValue(pgAlarm.getAlarmValue());
         if (pgAlarm.getAlarmDate() != null)
             this.setAlarmDate(sdf.format(pgAlarm.getAlarmDate()));
         else
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
index a43965c..565cb41 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -159,11 +159,21 @@
     }
 
     //获取历史报警消息列表
-    public List<PgAlarmDto> getAllAlarm(String alarmType,String startDay,String endDay,String isNew,int page,int rows) {
-        try {
+    public  Map<String, Object> getAllAlarm(String alarmType,String partition,String startDay,String endDay,String isNew,int page,int rows) {
 
+        Map<String, Object> resultMap = new HashMap<>();
+        String msg="";
+
+        try {
             Criteria criteria = createCriteria(PgAlarm.class);
 
+            if (StringUtils.isNotBlank(partition)) {
+                DetachedCriteria inCriteria = DetachedCriteria.forClass(PgDevice.class);
+                inCriteria.add(Restrictions.eq("partition", partition));
+                inCriteria.setProjection(Property.forName("id"));
+                criteria.add(Property.forName("alarmDevId").in(inCriteria));
+            }
+
             if (StringUtils.isNotBlank(alarmType)&&!alarmType.contains("全部")&&pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
                 criteria.add(Restrictions.eq("alarmTypeId", pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)));
 
@@ -190,8 +200,16 @@
             for (PgAlarm pgAlarm : pgAlarmList) {
                 pgAlarmDtoList.add(new PgAlarmDto(pgAlarm));
             }
-
-            return pgAlarmDtoList;
+            if(pgAlarmDtoList==null||pgAlarmDtoList.size()==0) {
+                resultMap.put("msg", "没有报警信息");
+                resultMap.put("code","0");
+            }else {
+                resultMap.put("code","200");
+                resultMap.put("msg", "报警信息获取成功");
+            }
+            resultMap.put("count",pg.getTotalCount());
+            resultMap.put("result",pgAlarmDtoList);
+            return resultMap;
         }
         catch(Exception ex){
             ex.printStackTrace();
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index 7547560..654f49e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -24,11 +24,11 @@
 
         Criteria criteria = createCriteria(PgDevice.class);
 
-        if(road!=null)
+        if(StringUtils.isNotBlank(road))
             criteria.add(Restrictions.eq("road",road));
-        if(partition!=null)
+        if(StringUtils.isNotBlank(partition))
             criteria.add(Restrictions.eq("partition",partition));
-        if(devType!=null)
+        if(StringUtils.isNotBlank(devType))
             criteria.add(Restrictions.eq("devType",devType));
 
         criteria.add(Restrictions.eq("active", 1));
@@ -43,6 +43,29 @@
         return pgDeviceDtoList;
     }
 
+    public List<PgDeviceDto> getAllDev(String road,String partition,String devType) {
+
+        Criteria criteria = createCriteria(PgDevice.class);
+
+        if(StringUtils.isNotBlank(road))
+            criteria.add(Restrictions.eq("road",road));
+        if(StringUtils.isNotBlank(partition))
+            criteria.add(Restrictions.eq("partition",partition));
+        if(StringUtils.isNotBlank(devType))
+            criteria.add(Restrictions.like("devType","%"+devType+"%"));
+
+        criteria.add(Restrictions.eq("active", 1));
+        criteria.addOrder(Order.desc("id"));
+        List<PgDevice> pgDeviceList = criteria.list();
+
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
+        for (PgDevice pgDevice : pgDeviceList) {
+            pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
+        }
+
+        return pgDeviceDtoList;
+    }
+
     //根据名字获取当前设备
     public PgDevice getDeviceByAssetCode(String assetCode) {
         Criteria criteria=createCriteria(PgDevice.class);
@@ -56,9 +79,9 @@
     }
 
     //根据类型获取设备列表
-    public List<PgDeviceDto> getDeviceByDevTypee(String devType) {
+    public List<PgDeviceDto> getDeviceByDevType(String devType) {
         Criteria criteria=createCriteria(PgDevice.class);
-        criteria.add(Restrictions.eq("devType",devType));
+        criteria.add(Restrictions.like("devType","%"+devType+"%"));
 
         List<PgDevice> pgDeviceList=criteria.list();
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
@@ -106,7 +129,7 @@
         criteria.add(Restrictions.eq("partition",partition));
 
         List<PgDevice> pgDeviceList=criteria.list();
-        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<PgDeviceDto>();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
 
         for (PgDevice pgDevice : pgDeviceList) {
             pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
index 3a3bccd..595730e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
@@ -1,10 +1,13 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.devTable.domain.PgAlarmType;
 import com.casic.PgInterface.devTable.domain.PgPartition;
 import com.casic.PgInterface.devTable.domain.PgRoad;
 import com.casic.PgInterface.devTable.domain.PipeGallery;
 import com.casic.PgInterface.devTable.dto.PgPartitionDto;
+import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
@@ -12,7 +15,9 @@
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Created by yxw on 2017/11/4.
@@ -21,7 +26,8 @@
 public class PgPartitionManager extends HibernateEntityDao<PgPartition> {
 
     @Resource
-    PgRoadManager pgRoadManager;
+    private PgRoadManager pgRoadManager;
+
 
     public PgPartition getPartitionByParName(String parName) {
         Criteria criteria = getSession().createCriteria(PgPartition.class);
@@ -99,4 +105,5 @@
         return pgPartitionDtoList;
     }
 
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
index f216360..a6928f1 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
@@ -5,6 +5,7 @@
 public class PgPlanResultRe {
 
     private String taskKey;
+    private List<String> pileAcuList;
     private List<PgPlanResult> pgPlanResultList;
 
     public String getTaskKey() {
@@ -15,6 +16,14 @@
         this.taskKey = taskKey;
     }
 
+    public List<String> getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(List<String> pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+
     public List<PgPlanResult> getPgPlanResultList() {
         return pgPlanResultList;
     }
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
index 71ea765..47eea07 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
@@ -54,9 +54,7 @@
 
         List<PgLineHole> pgLineHoleList=criteria.list();
         List<PgLineHoleDTO> pgLineHoleDTOList=new ArrayList<>();
-        if(pgLineHoleList==null||pgLineHoleList.size()==0)
-            return null;
-        else
+        if(pgLineHoleList!=null&&pgLineHoleList.size()!=0)
             pgLineHoleDTOList=PgLineHoleDTO.ConvertToDTOList(pgLineHoleList,pgPileAcuManager,pgRoadManager);
         return pgLineHoleDTOList;
     }
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
index 0fd9e1f..841a386 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
@@ -1,12 +1,15 @@
 package com.casic.PgInterface.intelPlan.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.devTable.domain.PgPartition;
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
 import com.casic.PgInterface.intelPlan.domain.PgLineHole;
 import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
 import com.casic.PgInterface.intelPlan.domain.PgSection;
 import com.casic.PgInterface.intelPlan.dto.PgPlanResult;
 import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
 import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -22,6 +25,9 @@
     @Resource
     private PgLineHoleManager pgLineHoleManager;
 
+    @Resource
+    private PgRoadManager pgRoadManager;
+
     public PgPileAcu getPgPileAcuByCode(String acuCode){
         List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
 
@@ -58,7 +64,9 @@
         for(PgPlanTask pgPlanTask:pgPlanTaskList){
             List<PgPlanResult> pgPlanResultList=getPgPlanResultByPlantask(pgPlanTask);
             PgPlanResultRe pgPlanResultRe=new PgPlanResultRe();
+
             pgPlanResultRe.setTaskKey(pgPlanTask.getTaskKey());
+            pgPlanResultRe.setPileAcuList(pgPlanTask.getPileAcuList());
             pgPlanResultRe.setPgPlanResultList(pgPlanResultList);
 
             pgPlanResultReList.add(pgPlanResultRe);
@@ -142,4 +150,57 @@
         return length;
     }
 
+    private PgPileAcu getPgPileAcuByAcuCode(String acuCode){
+        List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
+
+        if(pgPileAcuList==null||pgPileAcuList.size()==0)
+            return null;
+        else
+            return pgPileAcuList.get(0);
+    }
+
+    public List<PgAcuTask> getACUTask(String pileAcuList){
+        String[] acuArray=pileAcuList.split(",");
+        List<PgAcuTask> pgAcuTaskList=new ArrayList<>();
+
+        for(String acu:acuArray){
+            PgPileAcu pgPileAcu=this.getPgPileAcuByCode(acu);
+            String roadName=pgRoadManager.get(pgPileAcu.getRoadId()).getRoadName();
+
+            if(!containRoad(roadName,pgAcuTaskList))
+            {
+                PgAcuTask pgAcuTask=new PgAcuTask();
+                pgAcuTask.setRoadName(roadName);
+                pgAcuTask.setPileAcuList(acu);
+                pgAcuTaskList.add(pgAcuTask);
+            }
+            else{
+                PgAcuTask pgAcuTask=getIndexRoad(roadName,pgAcuTaskList);
+                if(pgAcuTask!=null)
+                    pgAcuTask.setPileAcuList(pgAcuTask.getPileAcuList()+","+acu);
+            }
+        }
+
+        return pgAcuTaskList;
+    }
+
+    private boolean containRoad(String roadName,List<PgAcuTask> pgAcuTaskList){
+        if(pgAcuTaskList==null||pgAcuTaskList.size()==0) return false;
+        for(PgAcuTask pgAcuTask:pgAcuTaskList){
+            if(pgAcuTask.getRoadName().equals(roadName))
+                return true;
+        }
+
+        return false;
+    }
+
+    private PgAcuTask getIndexRoad(String roadName, List<PgAcuTask> pgAcuTaskList){
+        for(PgAcuTask pgAcuTask:pgAcuTaskList){
+            if(pgAcuTask.getRoadName().equals(roadName))
+                return pgAcuTask;
+        }
+
+        return null;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java
new file mode 100644
index 0000000..323f7ef
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java
@@ -0,0 +1,25 @@
+package com.casic.PgInterface.reservePlan.dto;
+
+import java.util.List;
+
+public class PgAcuTask {
+
+    private String roadName;//道路
+    private String pileAcuList;//acu分区
+
+    public String getRoadName() {
+        return roadName;
+    }
+
+    public void setRoadName(String roadName) {
+        this.roadName = roadName;
+    }
+
+    public String getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(String pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
index c25e926..c7d7693 100644
--- a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
@@ -70,9 +70,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(Long.valueOf(inPgPersonId));
         PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("hostName",pgInPgPerson.getAssetCode());
-//        PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode());
-//        long maxId = pgTagPositionManager.getMaxId(pgTagMac.getTagMac());
-//        PGTagPosition pgTagPosition = pgTagPositionManager.get(maxId);
+
         PGTagPosition pgTagPosition = tagmacRun.GetTagStatus(pgTagMac);
         boolean bExist = false;
         bExist = pgTagPositionManager.findTagPosition(pgTagPosition.getPositionUpdatetime(),pgTagPosition.getHostId());
@@ -104,8 +102,7 @@
         PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(Long.valueOf(inPgPersonId));
         PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pgInPgPersonId",pgInPgPerson);
         System.out.println("time:"+pgInPgStatus.getInTime());
-//        PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pgInPgPersonId",inPgPersonId);
-//        PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode());
+
         PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("hostName",pgInPgPerson.getAssetCode());
 
         Map<Object,Object> mapPosition = new HashMap<>();
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
index 082ba5d..3eed00a 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
@@ -48,6 +48,7 @@
     public Map<String, Object> linkDevice(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         PgDeviceDto pgDeviceDto = null;
         try {
@@ -62,6 +63,7 @@
                     else {
                         pgDeviceDto = new PgDeviceDto(pgDevice);
                         msg = "报警关联设备获取成功";
+                        code="200";
                     }
                 }
             }
@@ -71,6 +73,7 @@
             e.printStackTrace();
             msg = "获取关联设备失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceDto);
 
@@ -86,6 +89,7 @@
     public Map<String, Object> linkPartitionCamera(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
         try {
@@ -106,6 +110,7 @@
 
                         pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(partition,position);
                         msg = "关联设备获取成功";
+                        code="200";
                     }
                 }
             }
@@ -115,6 +120,7 @@
             e.printStackTrace();
             msg = "分区设备关联失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceDtoList);
         return resultMap;
@@ -129,6 +135,7 @@
     public Map<String, Object> linkReservePlan(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgReservePlanDto> pgReservePlanDtoList=new ArrayList<>();
         try{
@@ -139,10 +146,12 @@
                 else {
                     pgReservePlanDtoList = pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
 
-                    if(pgReservePlanDtoList==null||pgReservePlanDtoList.size()==0)
-                        msg="不存在关联的报警预案";
-                    else
+                    if (pgReservePlanDtoList == null || pgReservePlanDtoList.size() == 0)
+                        msg = "不存在关联的报警预案";
+                    else {
                         msg = "关联预案获取成功";
+                        code="200";
+                    }
                 }
             }
             else
@@ -153,6 +162,7 @@
             e.printStackTrace();
             msg="预案关联失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgReservePlanDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
index 0ddbc4d..0ce886b 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
@@ -41,25 +41,19 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getAlarmList(@FormParam("alarmType") String alarmType,
                                             @FormParam("startDay") String startDay,
+                                            @FormParam("partition") String partition,
                                             @FormParam("endDay") String endDay,
                                             @FormParam("isNew") String isNew,
                                             @FormParam("page") int page,
                                             @FormParam("rows") int rows) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
         try {
-            pgAlarmDtoList = pgAlarmManager.getAllAlarm(alarmType,startDay,endDay,isNew,page,rows);
-            if (pgAlarmDtoList==null||pgAlarmDtoList.size() == 0)
-                msg = "没有报警信息";
-            else
-                msg = "报警信息获取成功";
+            resultMap = pgAlarmManager.getAllAlarm(alarmType,partition,startDay,endDay,isNew,page,rows);
+
         } catch (Exception e) {
             e.printStackTrace();
-            msg = "报警信息获取失败";
         }
-        resultMap.put("msg", msg);
-        resultMap.put("result", pgAlarmDtoList);
         return resultMap;
     }
 
@@ -71,9 +65,10 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> clearAlarmList(@FormParam("id") String id) throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        String result = "false";
+        String result = "";
+        String code="0";
 
         try {
             PgAlarm pgAlarm = new PgAlarm();
@@ -86,12 +81,14 @@
                 pgAlarmManager.save(pgAlarm);
                 msg = "报警信息清除成功";
                 result = "true";
+                code = "200";
             }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警信息清除失败";
             result = "false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
@@ -106,21 +103,26 @@
     public Map<String, Object> getAlarmByTypeOrTime(@FormParam("alarmType") String alarmType,
                                                     @FormParam("startTime") String startTime,
                                                     @FormParam("endTime") String endTime) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
-        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<PgAlarmDto>();
+        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
         try {
             pgAlarmDtoList = pgAlarmManager.getAlarmByTypeAndTime(alarmType, startTime, endTime);
             if (pgAlarmDtoList == null || pgAlarmDtoList.size() == 0)
                 msg = "报警信息不存在";
             else
+            {
                 msg = "报警信息获取成功";
+                code="200";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警信息获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmDtoList);
 

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 25ded8a..283d7ab 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,20 +7,56 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" 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/construction/manager/PgCsDocumentManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/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/manager/PgAlarmManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/~$说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/~$说明20191207.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.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$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/接口说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明20191207.docx" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
@@ -51,7 +87,7 @@
         <counts>
           <entry key="class" value="4" />
           <entry key="iml" value="2" />
-          <entry key="java" value="707" />
+          <entry key="java" value="820" />
           <entry key="properties" value="14" />
           <entry key="xml" value="7" />
         </counts>
@@ -60,7 +96,7 @@
         <counts>
           <entry key="CLASS" value="4" />
           <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="707" />
+          <entry key="JAVA" value="820" />
           <entry key="Properties" value="14" />
           <entry key="XML" value="7" />
         </counts>
@@ -68,32 +104,32 @@
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
           <entry key="dummy" value="38" />
-          <entry key="java" value="30161" />
+          <entry key="java" value="40859" />
           <entry key="properties" value="100" />
-          <entry key="txt" value="176" />
+          <entry key="txt" value="186" />
           <entry key="xml" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="30161" />
-          <entry key="PLAIN_TEXT" value="214" />
+          <entry key="JAVA" value="40859" />
+          <entry key="PLAIN_TEXT" value="224" />
           <entry key="Properties" value="100" />
           <entry key="XML" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="48" />
+          <entry key="project.closed" value="51" />
           <entry key="project.open.time.1" value="5" />
           <entry key="project.open.time.12" value="2" />
           <entry key="project.open.time.13" value="1" />
           <entry key="project.open.time.15" value="1" />
           <entry key="project.open.time.16" value="1" />
           <entry key="project.open.time.17" value="1" />
-          <entry key="project.open.time.2" value="1" />
+          <entry key="project.open.time.2" value="2" />
           <entry key="project.open.time.20" value="1" />
-          <entry key="project.open.time.23" value="1" />
+          <entry key="project.open.time.23" value="2" />
           <entry key="project.open.time.24" value="2" />
           <entry key="project.open.time.251" value="1" />
           <entry key="project.open.time.27" value="2" />
@@ -106,8 +142,8 @@
           <entry key="project.open.time.36" value="1" />
           <entry key="project.open.time.37" value="1" />
           <entry key="project.open.time.39" value="2" />
-          <entry key="project.open.time.4" value="2" />
-          <entry key="project.open.time.40" value="1" />
+          <entry key="project.open.time.4" value="3" />
+          <entry key="project.open.time.40" value="2" />
           <entry key="project.open.time.41" value="2" />
           <entry key="project.open.time.42" value="2" />
           <entry key="project.open.time.43" value="2" />
@@ -122,23 +158,25 @@
           <entry key="project.open.time.6" value="3" />
           <entry key="project.open.time.63" value="2" />
           <entry key="project.open.time.64" value="1" />
+          <entry key="project.open.time.66" value="1" />
           <entry key="project.open.time.71" value="2" />
+          <entry key="project.open.time.74" value="1" />
           <entry key="project.open.time.76" value="1" />
           <entry key="project.open.time.8" value="2" />
           <entry key="project.open.time.9" value="1" />
           <entry key="project.open.time.97" value="1" />
-          <entry key="project.opened" value="78" />
+          <entry key="project.opened" value="84" />
         </counts>
       </usages-collector>
     </session>
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+            <state relative-caret-position="396">
+              <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
               <folding>
                 <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
                 <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -147,73 +185,6 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <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="99">
-              <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-              <folding>
-                <element signature="imports" expanded="true" />
-                <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-1170">
-              <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state>
-              <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
-              <folding>
-                <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-                <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="true">
-        <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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-              <folding>
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-                <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>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <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="352">
-              <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -225,18 +196,9 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>inCriteria</find>
-      <find>getPgPlanResulList</find>
-      <find>getPileAcuListByPileAcuStr</find>
-      <find>distinct</find>
-      <find>order</find>
-      <find>canPlanLine</find>
-      <find>isExistLine</find>
-      <find>getPlanResult</find>
       <find>pgPipeLine</find>
       <find>getPipeLineBylineName</find>
       <find>StringU</find>
-      <find>getAllAlarm</find>
       <find>getAlarmList</find>
       <find>getPgInPersonListByDay</find>
       <find>getDayInPgStatistic</find>
@@ -254,7 +216,16 @@
       <find>getPgContructionByNameOrType</find>
       <find>&quot;&quot;,&quot;&quot;,</find>
       <find>getPgContructionDtoByNameOrType</find>
+      <find>addConstruction</find>
+      <find>getPgLineAcuHole</find>
+      <find>getPlanResult</find>
       <find>getConstruction</find>
+      <find>addPipeLine</find>
+      <find>未找到入廊数据</find>
+      <find>getCurrentHoleByAcu</find>
+      <find>getAllAlarm</find>
+      <find>getPgDeviceDtoListByPartition</find>
+      <find>getPgDeviceByDevType</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -263,57 +234,57 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlan.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileHoleManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/planData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/PlanData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
       </list>
     </option>
   </component>
@@ -359,7 +330,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -421,53 +391,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="dto" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="manager" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -479,29 +402,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="rs" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -516,6 +416,7 @@
         </subPane>
       </pane>
       <pane id="Scope" />
+      <pane id="PackagesPane" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -710,7 +611,13 @@
       <workItem from="1574902733573" duration="1829000" />
       <workItem from="1574998240004" duration="7016000" />
       <workItem from="1575247959683" duration="6997000" />
-      <workItem from="1575704345590" duration="40473000" />
+      <workItem from="1575704345590" duration="69381000" />
+      <workItem from="1575869479666" duration="721000" />
+      <workItem from="1575947104878" duration="6101000" />
+      <workItem from="1576128264436" duration="3347000" />
+      <workItem from="1576208571543" duration="22000" />
+      <workItem from="1576227513917" duration="862000" />
+      <workItem from="1576293721220" duration="18246000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -817,11 +724,18 @@
       <option name="project" value="LOCAL" />
       <updated>1575775489149</updated>
     </task>
-    <option name="localTasksCounter" value="16" />
+    <task id="LOCAL-00016" summary="整改施工信息">
+      <created>1575791780774</created>
+      <option name="number" value="00016" />
+      <option name="presentableId" value="LOCAL-00016" />
+      <option name="project" value="LOCAL" />
+      <updated>1575791780774</updated>
+    </task>
+    <option name="localTasksCounter" value="17" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="452131000" />
+    <option name="totallyTimeSpent" value="510338000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -834,9 +748,8 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
-    <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.24205749" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2647504" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -847,7 +760,7 @@
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.3295082" />
       <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.4819672" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.65737706" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.3295082" />
@@ -939,7 +852,8 @@
     <MESSAGE value="重新设计智能规划部分" />
     <MESSAGE value="完成智能规划对接" />
     <MESSAGE value="修改报警统计" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改报警统计" />
+    <MESSAGE value="整改施工信息" />
+    <option name="LAST_COMMIT_MESSAGE" value="整改施工信息" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -951,16 +865,10 @@
           <option name="timeStamp" value="3" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java</url>
-          <line>69</line>
+          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java</url>
+          <line>40</line>
           <properties />
-          <option name="timeStamp" value="21" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java</url>
-          <line>96</line>
-          <properties />
-          <option name="timeStamp" value="38" />
+          <option name="timeStamp" value="122" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
@@ -970,394 +878,452 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <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="2068">
-          <caret line="154" column="35" selection-start-line="154" selection-start-column="35" selection-end-line="154" selection-end-column="35" />
-        </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="3300">
-          <caret line="297" column="22" selection-start-line="297" selection-start-column="22" selection-end-line="297" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/StringUtils.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
-          <caret line="13" column="48" lean-forward="true" selection-start-line="13" selection-start-column="48" selection-end-line="13" selection-end-column="48" />
+          <caret line="11" column="5" selection-start-line="11" selection-start-column="5" selection-end-line="11" selection-end-column="5" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="78" lean-forward="true" selection-start-line="78" selection-end-line="78" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="616">
-          <caret line="41" column="1" selection-start-line="41" selection-start-column="1" selection-end-line="41" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="110">
-          <caret line="12" column="23" selection-start-line="12" selection-start-column="23" selection-end-line="12" selection-end-column="23" />
+        <state relative-caret-position="516">
+          <caret line="114" column="12" selection-start-line="114" selection-start-column="12" selection-end-line="114" selection-end-column="12" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="164">
-          <caret line="56" lean-forward="true" selection-start-line="56" selection-end-line="56" />
+        <state relative-caret-position="418">
+          <caret line="33" column="44" selection-start-line="33" selection-start-column="44" selection-end-line="33" selection-end-column="44" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="258">
-          <caret line="27" column="12" lean-forward="true" selection-start-line="27" selection-start-column="12" selection-end-line="27" selection-end-column="12" />
+        <state relative-caret-position="132">
+          <caret line="11" column="20" lean-forward="true" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="20" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.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="-12">
-          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        <state relative-caret-position="516">
+          <caret line="142" column="54" selection-start-line="142" selection-start-column="54" selection-end-line="142" selection-end-column="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="858">
-          <caret line="55" column="27" lean-forward="true" selection-start-line="55" selection-start-column="27" selection-end-line="55" selection-end-column="27" />
+        <state relative-caret-position="66">
+          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="58">
+          <caret line="18" column="28" selection-start-line="18" selection-start-column="19" selection-end-line="18" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="305">
+          <caret line="24" column="31" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="714">
+          <caret line="58" column="5" lean-forward="true" selection-start-line="58" selection-start-column="5" selection-end-line="58" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="924">
+          <caret line="134" column="92" selection-start-line="134" selection-start-column="92" selection-end-line="134" selection-end-column="92" />
+          <folding>
+            <element signature="method#linkDevice#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkPartitionCamera#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkReservePlan#0;class#PgAlarmLinkRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1066">
+          <caret line="90" lean-forward="true" selection-start-line="90" selection-end-line="90" />
+          <folding>
+            <element signature="method#getTjResultByAlarmType#0;class#PgAlarmTjRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="946">
+          <caret line="148" column="11" lean-forward="true" selection-start-line="148" selection-start-column="11" selection-end-line="148" selection-end-column="11" />
+          <folding>
+            <element signature="method#getAlarmTypeList#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#addAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#editAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#deleteAlarmType#0;class#PgAlarmTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="208">
+          <caret line="46" column="23" lean-forward="true" selection-start-line="46" selection-start-column="23" selection-end-line="46" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="113" column="9" lean-forward="true" selection-start-line="113" selection-start-column="9" selection-end-line="113" selection-end-column="9" />
+          <folding>
+            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
+            <element signature="method#getNewestCh4InfoByDev#0;class#PgCh4Rs#0" />
+            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="145" column="6" lean-forward="true" selection-start-line="145" selection-start-column="6" selection-end-line="145" selection-end-column="6" />
+          <folding>
+            <element signature="method#addAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#editAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#deleteAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#getAuthorityList#0;class#PgAuthorityRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="58" column="1" lean-forward="true" selection-start-line="58" selection-start-column="1" selection-end-line="58" selection-end-column="1" />
+          <folding>
+            <element signature="method#getPgAssetPlanList#0;class#PgAssetPlanRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="370">
+          <caret line="371" column="66" selection-start-line="371" selection-start-column="66" selection-end-line="371" selection-end-column="66" />
+          <folding>
+            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#searchConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionDev#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="139" column="13" lean-forward="true" selection-start-line="139" selection-start-column="13" selection-end-line="139" selection-end-column="13" />
+          <folding>
+            <element signature="method#getCoInfoByDevAndDate#0;class#PgCoRs#0" />
+            <element signature="method#getNewestCoInfoByDev#0;class#PgCoRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="540">
+          <caret line="223" column="5" lean-forward="true" selection-start-line="223" selection-start-column="5" selection-end-line="223" selection-end-column="5" />
+          <folding>
+            <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="682">
+          <caret line="100" lean-forward="true" selection-start-line="100" selection-end-line="100" />
+          <folding>
+            <element signature="method#getDeviceTpeyList#0;class#PgDeviceTypeRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="377">
+          <caret line="225" column="35" selection-start-line="225" selection-start-column="35" selection-end-line="225" selection-end-column="35" />
+          <folding>
+            <element signature="method#addEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#addEquipment#1;class#PgEquipmentRs#0" />
+            <element signature="method#getEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#deleteEquipment#0;class#PgEquipmentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="406">
+          <caret line="109" lean-forward="true" selection-start-line="109" selection-end-line="109" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="154">
+          <caret line="28" column="19" selection-start-line="28" selection-start-column="19" selection-end-line="28" selection-end-column="19" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="748">
-          <caret line="49" column="5" lean-forward="true" selection-start-line="49" selection-start-column="5" selection-end-line="49" selection-end-column="5" />
+        <state relative-caret-position="296">
+          <caret line="161" column="35" selection-start-line="161" selection-start-column="35" selection-end-line="161" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="384">
+          <caret line="99" column="5" lean-forward="true" selection-start-line="99" selection-start-column="5" selection-end-line="99" selection-end-column="5" />
+        </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="362">
+          <caret line="340" column="35" selection-start-line="340" selection-start-column="35" selection-end-line="340" selection-end-column="35" />
+          <folding>
+            <element signature="method#addInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPersonInPg#0;class#PgInPgPersonRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-606">
+          <caret line="76" column="20" lean-forward="true" selection-start-line="76" selection-start-column="20" selection-end-line="76" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="65" column="35" selection-start-line="65" selection-start-column="35" selection-end-line="65" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="101" column="35" selection-start-line="101" selection-start-column="35" selection-end-line="101" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="84" column="35" selection-start-line="84" selection-start-column="35" selection-end-line="84" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="59" lean-forward="true" selection-start-line="59" selection-end-line="59" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="60" column="1" lean-forward="true" selection-start-line="60" selection-start-column="1" selection-end-line="60" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="145" column="35" selection-start-line="145" selection-start-column="35" selection-end-line="145" selection-end-column="35" />
+        </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="274">
+          <caret line="350" column="35" selection-start-line="350" selection-start-column="35" selection-end-line="350" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="121" column="39" selection-start-line="121" selection-start-column="39" selection-end-line="121" selection-end-column="39" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="28" column="8" lean-forward="true" selection-start-line="28" selection-start-column="8" selection-end-line="28" selection-end-column="8" />
+        <state relative-caret-position="340">
+          <caret line="103" selection-start-line="103" selection-end-line="103" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="226" column="35" selection-start-line="226" selection-start-column="35" selection-end-line="226" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="203" column="35" selection-start-line="203" selection-start-column="35" selection-end-line="203" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="241" column="35" selection-start-line="241" selection-start-column="35" selection-end-line="241" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="225" column="1" lean-forward="true" selection-start-line="225" selection-start-column="1" selection-end-line="225" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="176" column="5" lean-forward="true" selection-start-line="176" selection-start-column="5" selection-end-line="176" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="178" column="35" lean-forward="true" selection-start-line="178" selection-start-column="35" selection-end-line="178" selection-end-column="35" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="516">
-          <caret line="94" column="53" selection-start-line="94" selection-start-column="53" selection-end-line="94" selection-end-column="53" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="814">
-          <caret line="52" column="9" lean-forward="true" selection-start-line="52" selection-start-column="9" selection-end-line="52" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="182">
-          <caret line="58" column="12" lean-forward="true" selection-start-line="58" selection-start-column="12" selection-end-line="58" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="34" lean-forward="true" selection-start-line="34" selection-end-line="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="32" lean-forward="true" selection-start-line="32" selection-end-line="32" />
-          <folding>
-            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
-            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="185">
-          <caret line="63" column="13" selection-start-line="63" selection-start-column="13" selection-end-line="63" selection-end-column="13" />
-          <folding>
-            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
-            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
-            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="e#6319#6324#0" />
-            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
-          </folding>
+          <caret line="240" lean-forward="true" selection-start-line="240" selection-end-line="240" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
-          <caret line="58" column="28" lean-forward="true" selection-start-line="58" selection-start-column="28" selection-end-line="58" selection-end-column="28" />
-          <folding>
-            <element signature="method#addTempHumData#0;class#PgTempHumRs#0" />
-          </folding>
+        <state relative-caret-position="340">
+          <caret line="148" column="34" selection-start-line="148" selection-start-column="34" selection-end-line="148" selection-end-column="34" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
+        <state relative-caret-position="458">
+          <caret line="99" column="35" selection-start-line="99" selection-start-column="35" selection-end-line="99" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+        <state relative-caret-position="384">
+          <caret line="145" column="32" lean-forward="true" selection-start-line="145" selection-start-column="32" selection-end-line="145" selection-end-column="32" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="414">
-          <caret line="22" column="46" lean-forward="true" selection-start-line="22" selection-start-column="46" selection-end-line="22" selection-end-column="46" />
-        </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="396">
-          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" column="83" selection-start-line="11" selection-start-column="83" selection-end-line="11" selection-end-column="83" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="26">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
-          <folding>
-            <element signature="method#getPgInPgStatusByPerson#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNumByName#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNum#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPersonListByDay#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPgStatusByPgInPgPerson#0;class#PgInPgStatusManager#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="44">
-          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-12">
-          <caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="87" lean-forward="true" selection-start-line="87" selection-end-line="87" />
-          <folding>
-            <element signature="method#getConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#addConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#deleteConstructionType#0;class#PgConstructionTypeRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
-          <folding>
-            <element signature="method#getConstructionTypeByType#0;class#PgConstructionTypeManager#0" />
-            <element signature="method#getAllConstructionTypeDto#0;class#PgConstructionTypeManager#0" />
-          </folding>
-        </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="145">
-          <caret line="258" column="9" lean-forward="true" selection-start-line="258" selection-start-column="9" selection-end-line="258" selection-end-column="9" />
-          <folding>
-            <element signature="method#getMonthInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayInPgStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgOverViewRs#0" />
-            <element signature="method#getAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getMonthAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayAlarmStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgOverViewRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="103">
-          <caret line="105" column="50" lean-forward="true" selection-start-line="105" selection-start-column="50" selection-end-line="105" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateBasicDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="99">
-          <caret line="125" selection-start-line="125" selection-end-line="125" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="190">
-          <caret line="24" column="35" lean-forward="true" selection-start-line="24" selection-start-column="35" selection-end-line="24" selection-end-column="35" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="436">
-          <caret line="24" lean-forward="true" selection-start-line="24" selection-end-line="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" lean-forward="true" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="300">
-          <caret line="34" column="31" lean-forward="true" selection-start-line="34" selection-start-column="31" selection-end-line="34" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="42" column="13" lean-forward="true" selection-start-line="42" selection-start-column="13" selection-end-line="42" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="120" column="72" lean-forward="true" selection-start-line="120" selection-start-column="72" selection-end-line="120" selection-end-column="72" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="293">
-          <caret line="58" column="73" lean-forward="true" selection-start-line="58" selection-start-column="73" selection-end-line="58" selection-end-column="73" />
-          <folding>
-            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
-            <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
-          </folding>
-        </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="307">
-          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
+        <state relative-caret-position="758">
+          <caret line="130" column="5" lean-forward="true" selection-start-line="130" selection-start-column="5" selection-end-line="130" selection-end-column="5" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1170">
-          <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
+        <state relative-caret-position="494">
+          <caret line="86" column="62" lean-forward="true" selection-start-line="86" selection-start-column="62" selection-end-line="86" selection-end-column="62" />
           <folding>
-            <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-            <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+            <element signature="method#getAllDevice#0;class#PgDeviceManager#0" />
+            <element signature="method#getAllDev#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="195" column="28" lean-forward="true" selection-start-line="195" selection-start-column="28" selection-end-line="195" selection-end-column="28" />
+        <state relative-caret-position="166">
+          <caret line="174" column="13" lean-forward="true" selection-start-line="174" selection-start-column="13" selection-end-line="174" selection-end-column="13" />
           <folding>
-            <element signature="method#getAlarmByTypeAndTime#0;class#PgAlarmManager#0" />
-            <element signature="method#getAlarmNum#0;class#PgAlarmManager#0" />
             <element signature="method#getDayAlarmStatistic#0;class#PgAlarmManager#0" />
+            <element signature="method#getAlarmList#0;class#PgAlarmManager#0" />
             <element signature="method#createDTO#0;class#PgAlarmManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="364">
+          <caret line="46" column="56" lean-forward="true" selection-start-line="46" selection-start-column="56" selection-end-line="46" selection-end-column="56" />
+          <folding>
+            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
+            <element signature="method#getPgDev#0;class#PgDeviceRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
+            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+        <state relative-caret-position="396">
+          <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
           <folding>
             <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
             <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -1365,52 +1331,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="239">
-          <caret line="21" column="33" lean-forward="true" selection-start-line="21" selection-start-column="33" selection-end-line="21" selection-end-column="33" />
-        </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="352">
-          <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-        </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="99">
-          <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-          </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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-          <folding>
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-            <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>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
index c436c93..e913155 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
@@ -132,7 +132,10 @@
             this.setAlarmType("");
         else
             this.setAlarmType(pgAlarm.getAlarmTypeId().getAlarmType());
-        this.setAlarmValue(pgAlarm.getAlarmValue());
+        if(pgAlarm.getAlarmValue()==null)
+            this.setAlarmValue("");
+        else
+            this.setAlarmValue(pgAlarm.getAlarmValue());
         if (pgAlarm.getAlarmDate() != null)
             this.setAlarmDate(sdf.format(pgAlarm.getAlarmDate()));
         else
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
index a43965c..565cb41 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -159,11 +159,21 @@
     }
 
     //获取历史报警消息列表
-    public List<PgAlarmDto> getAllAlarm(String alarmType,String startDay,String endDay,String isNew,int page,int rows) {
-        try {
+    public  Map<String, Object> getAllAlarm(String alarmType,String partition,String startDay,String endDay,String isNew,int page,int rows) {
 
+        Map<String, Object> resultMap = new HashMap<>();
+        String msg="";
+
+        try {
             Criteria criteria = createCriteria(PgAlarm.class);
 
+            if (StringUtils.isNotBlank(partition)) {
+                DetachedCriteria inCriteria = DetachedCriteria.forClass(PgDevice.class);
+                inCriteria.add(Restrictions.eq("partition", partition));
+                inCriteria.setProjection(Property.forName("id"));
+                criteria.add(Property.forName("alarmDevId").in(inCriteria));
+            }
+
             if (StringUtils.isNotBlank(alarmType)&&!alarmType.contains("全部")&&pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
                 criteria.add(Restrictions.eq("alarmTypeId", pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)));
 
@@ -190,8 +200,16 @@
             for (PgAlarm pgAlarm : pgAlarmList) {
                 pgAlarmDtoList.add(new PgAlarmDto(pgAlarm));
             }
-
-            return pgAlarmDtoList;
+            if(pgAlarmDtoList==null||pgAlarmDtoList.size()==0) {
+                resultMap.put("msg", "没有报警信息");
+                resultMap.put("code","0");
+            }else {
+                resultMap.put("code","200");
+                resultMap.put("msg", "报警信息获取成功");
+            }
+            resultMap.put("count",pg.getTotalCount());
+            resultMap.put("result",pgAlarmDtoList);
+            return resultMap;
         }
         catch(Exception ex){
             ex.printStackTrace();
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index 7547560..654f49e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -24,11 +24,11 @@
 
         Criteria criteria = createCriteria(PgDevice.class);
 
-        if(road!=null)
+        if(StringUtils.isNotBlank(road))
             criteria.add(Restrictions.eq("road",road));
-        if(partition!=null)
+        if(StringUtils.isNotBlank(partition))
             criteria.add(Restrictions.eq("partition",partition));
-        if(devType!=null)
+        if(StringUtils.isNotBlank(devType))
             criteria.add(Restrictions.eq("devType",devType));
 
         criteria.add(Restrictions.eq("active", 1));
@@ -43,6 +43,29 @@
         return pgDeviceDtoList;
     }
 
+    public List<PgDeviceDto> getAllDev(String road,String partition,String devType) {
+
+        Criteria criteria = createCriteria(PgDevice.class);
+
+        if(StringUtils.isNotBlank(road))
+            criteria.add(Restrictions.eq("road",road));
+        if(StringUtils.isNotBlank(partition))
+            criteria.add(Restrictions.eq("partition",partition));
+        if(StringUtils.isNotBlank(devType))
+            criteria.add(Restrictions.like("devType","%"+devType+"%"));
+
+        criteria.add(Restrictions.eq("active", 1));
+        criteria.addOrder(Order.desc("id"));
+        List<PgDevice> pgDeviceList = criteria.list();
+
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
+        for (PgDevice pgDevice : pgDeviceList) {
+            pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
+        }
+
+        return pgDeviceDtoList;
+    }
+
     //根据名字获取当前设备
     public PgDevice getDeviceByAssetCode(String assetCode) {
         Criteria criteria=createCriteria(PgDevice.class);
@@ -56,9 +79,9 @@
     }
 
     //根据类型获取设备列表
-    public List<PgDeviceDto> getDeviceByDevTypee(String devType) {
+    public List<PgDeviceDto> getDeviceByDevType(String devType) {
         Criteria criteria=createCriteria(PgDevice.class);
-        criteria.add(Restrictions.eq("devType",devType));
+        criteria.add(Restrictions.like("devType","%"+devType+"%"));
 
         List<PgDevice> pgDeviceList=criteria.list();
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
@@ -106,7 +129,7 @@
         criteria.add(Restrictions.eq("partition",partition));
 
         List<PgDevice> pgDeviceList=criteria.list();
-        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<PgDeviceDto>();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
 
         for (PgDevice pgDevice : pgDeviceList) {
             pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
index 3a3bccd..595730e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
@@ -1,10 +1,13 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.devTable.domain.PgAlarmType;
 import com.casic.PgInterface.devTable.domain.PgPartition;
 import com.casic.PgInterface.devTable.domain.PgRoad;
 import com.casic.PgInterface.devTable.domain.PipeGallery;
 import com.casic.PgInterface.devTable.dto.PgPartitionDto;
+import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
@@ -12,7 +15,9 @@
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Created by yxw on 2017/11/4.
@@ -21,7 +26,8 @@
 public class PgPartitionManager extends HibernateEntityDao<PgPartition> {
 
     @Resource
-    PgRoadManager pgRoadManager;
+    private PgRoadManager pgRoadManager;
+
 
     public PgPartition getPartitionByParName(String parName) {
         Criteria criteria = getSession().createCriteria(PgPartition.class);
@@ -99,4 +105,5 @@
         return pgPartitionDtoList;
     }
 
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
index f216360..a6928f1 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
@@ -5,6 +5,7 @@
 public class PgPlanResultRe {
 
     private String taskKey;
+    private List<String> pileAcuList;
     private List<PgPlanResult> pgPlanResultList;
 
     public String getTaskKey() {
@@ -15,6 +16,14 @@
         this.taskKey = taskKey;
     }
 
+    public List<String> getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(List<String> pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+
     public List<PgPlanResult> getPgPlanResultList() {
         return pgPlanResultList;
     }
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
index 71ea765..47eea07 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
@@ -54,9 +54,7 @@
 
         List<PgLineHole> pgLineHoleList=criteria.list();
         List<PgLineHoleDTO> pgLineHoleDTOList=new ArrayList<>();
-        if(pgLineHoleList==null||pgLineHoleList.size()==0)
-            return null;
-        else
+        if(pgLineHoleList!=null&&pgLineHoleList.size()!=0)
             pgLineHoleDTOList=PgLineHoleDTO.ConvertToDTOList(pgLineHoleList,pgPileAcuManager,pgRoadManager);
         return pgLineHoleDTOList;
     }
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
index 0fd9e1f..841a386 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
@@ -1,12 +1,15 @@
 package com.casic.PgInterface.intelPlan.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.devTable.domain.PgPartition;
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
 import com.casic.PgInterface.intelPlan.domain.PgLineHole;
 import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
 import com.casic.PgInterface.intelPlan.domain.PgSection;
 import com.casic.PgInterface.intelPlan.dto.PgPlanResult;
 import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
 import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -22,6 +25,9 @@
     @Resource
     private PgLineHoleManager pgLineHoleManager;
 
+    @Resource
+    private PgRoadManager pgRoadManager;
+
     public PgPileAcu getPgPileAcuByCode(String acuCode){
         List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
 
@@ -58,7 +64,9 @@
         for(PgPlanTask pgPlanTask:pgPlanTaskList){
             List<PgPlanResult> pgPlanResultList=getPgPlanResultByPlantask(pgPlanTask);
             PgPlanResultRe pgPlanResultRe=new PgPlanResultRe();
+
             pgPlanResultRe.setTaskKey(pgPlanTask.getTaskKey());
+            pgPlanResultRe.setPileAcuList(pgPlanTask.getPileAcuList());
             pgPlanResultRe.setPgPlanResultList(pgPlanResultList);
 
             pgPlanResultReList.add(pgPlanResultRe);
@@ -142,4 +150,57 @@
         return length;
     }
 
+    private PgPileAcu getPgPileAcuByAcuCode(String acuCode){
+        List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
+
+        if(pgPileAcuList==null||pgPileAcuList.size()==0)
+            return null;
+        else
+            return pgPileAcuList.get(0);
+    }
+
+    public List<PgAcuTask> getACUTask(String pileAcuList){
+        String[] acuArray=pileAcuList.split(",");
+        List<PgAcuTask> pgAcuTaskList=new ArrayList<>();
+
+        for(String acu:acuArray){
+            PgPileAcu pgPileAcu=this.getPgPileAcuByCode(acu);
+            String roadName=pgRoadManager.get(pgPileAcu.getRoadId()).getRoadName();
+
+            if(!containRoad(roadName,pgAcuTaskList))
+            {
+                PgAcuTask pgAcuTask=new PgAcuTask();
+                pgAcuTask.setRoadName(roadName);
+                pgAcuTask.setPileAcuList(acu);
+                pgAcuTaskList.add(pgAcuTask);
+            }
+            else{
+                PgAcuTask pgAcuTask=getIndexRoad(roadName,pgAcuTaskList);
+                if(pgAcuTask!=null)
+                    pgAcuTask.setPileAcuList(pgAcuTask.getPileAcuList()+","+acu);
+            }
+        }
+
+        return pgAcuTaskList;
+    }
+
+    private boolean containRoad(String roadName,List<PgAcuTask> pgAcuTaskList){
+        if(pgAcuTaskList==null||pgAcuTaskList.size()==0) return false;
+        for(PgAcuTask pgAcuTask:pgAcuTaskList){
+            if(pgAcuTask.getRoadName().equals(roadName))
+                return true;
+        }
+
+        return false;
+    }
+
+    private PgAcuTask getIndexRoad(String roadName, List<PgAcuTask> pgAcuTaskList){
+        for(PgAcuTask pgAcuTask:pgAcuTaskList){
+            if(pgAcuTask.getRoadName().equals(roadName))
+                return pgAcuTask;
+        }
+
+        return null;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java
new file mode 100644
index 0000000..323f7ef
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java
@@ -0,0 +1,25 @@
+package com.casic.PgInterface.reservePlan.dto;
+
+import java.util.List;
+
+public class PgAcuTask {
+
+    private String roadName;//道路
+    private String pileAcuList;//acu分区
+
+    public String getRoadName() {
+        return roadName;
+    }
+
+    public void setRoadName(String roadName) {
+        this.roadName = roadName;
+    }
+
+    public String getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(String pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
index c25e926..c7d7693 100644
--- a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
@@ -70,9 +70,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(Long.valueOf(inPgPersonId));
         PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("hostName",pgInPgPerson.getAssetCode());
-//        PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode());
-//        long maxId = pgTagPositionManager.getMaxId(pgTagMac.getTagMac());
-//        PGTagPosition pgTagPosition = pgTagPositionManager.get(maxId);
+
         PGTagPosition pgTagPosition = tagmacRun.GetTagStatus(pgTagMac);
         boolean bExist = false;
         bExist = pgTagPositionManager.findTagPosition(pgTagPosition.getPositionUpdatetime(),pgTagPosition.getHostId());
@@ -104,8 +102,7 @@
         PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(Long.valueOf(inPgPersonId));
         PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pgInPgPersonId",pgInPgPerson);
         System.out.println("time:"+pgInPgStatus.getInTime());
-//        PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pgInPgPersonId",inPgPersonId);
-//        PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode());
+
         PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("hostName",pgInPgPerson.getAssetCode());
 
         Map<Object,Object> mapPosition = new HashMap<>();
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
index 082ba5d..3eed00a 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
@@ -48,6 +48,7 @@
     public Map<String, Object> linkDevice(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         PgDeviceDto pgDeviceDto = null;
         try {
@@ -62,6 +63,7 @@
                     else {
                         pgDeviceDto = new PgDeviceDto(pgDevice);
                         msg = "报警关联设备获取成功";
+                        code="200";
                     }
                 }
             }
@@ -71,6 +73,7 @@
             e.printStackTrace();
             msg = "获取关联设备失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceDto);
 
@@ -86,6 +89,7 @@
     public Map<String, Object> linkPartitionCamera(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
         try {
@@ -106,6 +110,7 @@
 
                         pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(partition,position);
                         msg = "关联设备获取成功";
+                        code="200";
                     }
                 }
             }
@@ -115,6 +120,7 @@
             e.printStackTrace();
             msg = "分区设备关联失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceDtoList);
         return resultMap;
@@ -129,6 +135,7 @@
     public Map<String, Object> linkReservePlan(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgReservePlanDto> pgReservePlanDtoList=new ArrayList<>();
         try{
@@ -139,10 +146,12 @@
                 else {
                     pgReservePlanDtoList = pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
 
-                    if(pgReservePlanDtoList==null||pgReservePlanDtoList.size()==0)
-                        msg="不存在关联的报警预案";
-                    else
+                    if (pgReservePlanDtoList == null || pgReservePlanDtoList.size() == 0)
+                        msg = "不存在关联的报警预案";
+                    else {
                         msg = "关联预案获取成功";
+                        code="200";
+                    }
                 }
             }
             else
@@ -153,6 +162,7 @@
             e.printStackTrace();
             msg="预案关联失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgReservePlanDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
index 0ddbc4d..0ce886b 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
@@ -41,25 +41,19 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getAlarmList(@FormParam("alarmType") String alarmType,
                                             @FormParam("startDay") String startDay,
+                                            @FormParam("partition") String partition,
                                             @FormParam("endDay") String endDay,
                                             @FormParam("isNew") String isNew,
                                             @FormParam("page") int page,
                                             @FormParam("rows") int rows) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
         try {
-            pgAlarmDtoList = pgAlarmManager.getAllAlarm(alarmType,startDay,endDay,isNew,page,rows);
-            if (pgAlarmDtoList==null||pgAlarmDtoList.size() == 0)
-                msg = "没有报警信息";
-            else
-                msg = "报警信息获取成功";
+            resultMap = pgAlarmManager.getAllAlarm(alarmType,partition,startDay,endDay,isNew,page,rows);
+
         } catch (Exception e) {
             e.printStackTrace();
-            msg = "报警信息获取失败";
         }
-        resultMap.put("msg", msg);
-        resultMap.put("result", pgAlarmDtoList);
         return resultMap;
     }
 
@@ -71,9 +65,10 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> clearAlarmList(@FormParam("id") String id) throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        String result = "false";
+        String result = "";
+        String code="0";
 
         try {
             PgAlarm pgAlarm = new PgAlarm();
@@ -86,12 +81,14 @@
                 pgAlarmManager.save(pgAlarm);
                 msg = "报警信息清除成功";
                 result = "true";
+                code = "200";
             }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警信息清除失败";
             result = "false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
@@ -106,21 +103,26 @@
     public Map<String, Object> getAlarmByTypeOrTime(@FormParam("alarmType") String alarmType,
                                                     @FormParam("startTime") String startTime,
                                                     @FormParam("endTime") String endTime) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
-        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<PgAlarmDto>();
+        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
         try {
             pgAlarmDtoList = pgAlarmManager.getAlarmByTypeAndTime(alarmType, startTime, endTime);
             if (pgAlarmDtoList == null || pgAlarmDtoList.size() == 0)
                 msg = "报警信息不存在";
             else
+            {
                 msg = "报警信息获取成功";
+                code="200";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警信息获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
index 29ce8a4..ed0bf34 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
@@ -39,8 +39,8 @@
     public Map<String, Object> getAlarmRule(@FormParam("devType") String devType) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
-        System.out.println("devType:"+devType);
         List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<>();
         try {
             pgAlarmRuleDtoList = pgAlarmRuleManager.getAlarmRuleDto(devType);
@@ -52,6 +52,7 @@
             e.printStackTrace();
             msg = "报警阈值信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmRuleDtoList);
         return resultMap;

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 25ded8a..283d7ab 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,20 +7,56 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" 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/construction/manager/PgCsDocumentManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/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/manager/PgAlarmManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/~$说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/~$说明20191207.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.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$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/接口说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明20191207.docx" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
@@ -51,7 +87,7 @@
         <counts>
           <entry key="class" value="4" />
           <entry key="iml" value="2" />
-          <entry key="java" value="707" />
+          <entry key="java" value="820" />
           <entry key="properties" value="14" />
           <entry key="xml" value="7" />
         </counts>
@@ -60,7 +96,7 @@
         <counts>
           <entry key="CLASS" value="4" />
           <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="707" />
+          <entry key="JAVA" value="820" />
           <entry key="Properties" value="14" />
           <entry key="XML" value="7" />
         </counts>
@@ -68,32 +104,32 @@
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
           <entry key="dummy" value="38" />
-          <entry key="java" value="30161" />
+          <entry key="java" value="40859" />
           <entry key="properties" value="100" />
-          <entry key="txt" value="176" />
+          <entry key="txt" value="186" />
           <entry key="xml" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="30161" />
-          <entry key="PLAIN_TEXT" value="214" />
+          <entry key="JAVA" value="40859" />
+          <entry key="PLAIN_TEXT" value="224" />
           <entry key="Properties" value="100" />
           <entry key="XML" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="48" />
+          <entry key="project.closed" value="51" />
           <entry key="project.open.time.1" value="5" />
           <entry key="project.open.time.12" value="2" />
           <entry key="project.open.time.13" value="1" />
           <entry key="project.open.time.15" value="1" />
           <entry key="project.open.time.16" value="1" />
           <entry key="project.open.time.17" value="1" />
-          <entry key="project.open.time.2" value="1" />
+          <entry key="project.open.time.2" value="2" />
           <entry key="project.open.time.20" value="1" />
-          <entry key="project.open.time.23" value="1" />
+          <entry key="project.open.time.23" value="2" />
           <entry key="project.open.time.24" value="2" />
           <entry key="project.open.time.251" value="1" />
           <entry key="project.open.time.27" value="2" />
@@ -106,8 +142,8 @@
           <entry key="project.open.time.36" value="1" />
           <entry key="project.open.time.37" value="1" />
           <entry key="project.open.time.39" value="2" />
-          <entry key="project.open.time.4" value="2" />
-          <entry key="project.open.time.40" value="1" />
+          <entry key="project.open.time.4" value="3" />
+          <entry key="project.open.time.40" value="2" />
           <entry key="project.open.time.41" value="2" />
           <entry key="project.open.time.42" value="2" />
           <entry key="project.open.time.43" value="2" />
@@ -122,23 +158,25 @@
           <entry key="project.open.time.6" value="3" />
           <entry key="project.open.time.63" value="2" />
           <entry key="project.open.time.64" value="1" />
+          <entry key="project.open.time.66" value="1" />
           <entry key="project.open.time.71" value="2" />
+          <entry key="project.open.time.74" value="1" />
           <entry key="project.open.time.76" value="1" />
           <entry key="project.open.time.8" value="2" />
           <entry key="project.open.time.9" value="1" />
           <entry key="project.open.time.97" value="1" />
-          <entry key="project.opened" value="78" />
+          <entry key="project.opened" value="84" />
         </counts>
       </usages-collector>
     </session>
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+            <state relative-caret-position="396">
+              <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
               <folding>
                 <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
                 <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -147,73 +185,6 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <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="99">
-              <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-              <folding>
-                <element signature="imports" expanded="true" />
-                <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-1170">
-              <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state>
-              <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
-              <folding>
-                <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-                <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="true">
-        <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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-              <folding>
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-                <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>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <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="352">
-              <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -225,18 +196,9 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>inCriteria</find>
-      <find>getPgPlanResulList</find>
-      <find>getPileAcuListByPileAcuStr</find>
-      <find>distinct</find>
-      <find>order</find>
-      <find>canPlanLine</find>
-      <find>isExistLine</find>
-      <find>getPlanResult</find>
       <find>pgPipeLine</find>
       <find>getPipeLineBylineName</find>
       <find>StringU</find>
-      <find>getAllAlarm</find>
       <find>getAlarmList</find>
       <find>getPgInPersonListByDay</find>
       <find>getDayInPgStatistic</find>
@@ -254,7 +216,16 @@
       <find>getPgContructionByNameOrType</find>
       <find>&quot;&quot;,&quot;&quot;,</find>
       <find>getPgContructionDtoByNameOrType</find>
+      <find>addConstruction</find>
+      <find>getPgLineAcuHole</find>
+      <find>getPlanResult</find>
       <find>getConstruction</find>
+      <find>addPipeLine</find>
+      <find>未找到入廊数据</find>
+      <find>getCurrentHoleByAcu</find>
+      <find>getAllAlarm</find>
+      <find>getPgDeviceDtoListByPartition</find>
+      <find>getPgDeviceByDevType</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -263,57 +234,57 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlan.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileHoleManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/planData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/PlanData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
       </list>
     </option>
   </component>
@@ -359,7 +330,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -421,53 +391,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="dto" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="manager" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -479,29 +402,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="rs" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -516,6 +416,7 @@
         </subPane>
       </pane>
       <pane id="Scope" />
+      <pane id="PackagesPane" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -710,7 +611,13 @@
       <workItem from="1574902733573" duration="1829000" />
       <workItem from="1574998240004" duration="7016000" />
       <workItem from="1575247959683" duration="6997000" />
-      <workItem from="1575704345590" duration="40473000" />
+      <workItem from="1575704345590" duration="69381000" />
+      <workItem from="1575869479666" duration="721000" />
+      <workItem from="1575947104878" duration="6101000" />
+      <workItem from="1576128264436" duration="3347000" />
+      <workItem from="1576208571543" duration="22000" />
+      <workItem from="1576227513917" duration="862000" />
+      <workItem from="1576293721220" duration="18246000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -817,11 +724,18 @@
       <option name="project" value="LOCAL" />
       <updated>1575775489149</updated>
     </task>
-    <option name="localTasksCounter" value="16" />
+    <task id="LOCAL-00016" summary="整改施工信息">
+      <created>1575791780774</created>
+      <option name="number" value="00016" />
+      <option name="presentableId" value="LOCAL-00016" />
+      <option name="project" value="LOCAL" />
+      <updated>1575791780774</updated>
+    </task>
+    <option name="localTasksCounter" value="17" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="452131000" />
+    <option name="totallyTimeSpent" value="510338000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -834,9 +748,8 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
-    <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.24205749" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2647504" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -847,7 +760,7 @@
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.3295082" />
       <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.4819672" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.65737706" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.3295082" />
@@ -939,7 +852,8 @@
     <MESSAGE value="重新设计智能规划部分" />
     <MESSAGE value="完成智能规划对接" />
     <MESSAGE value="修改报警统计" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改报警统计" />
+    <MESSAGE value="整改施工信息" />
+    <option name="LAST_COMMIT_MESSAGE" value="整改施工信息" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -951,16 +865,10 @@
           <option name="timeStamp" value="3" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java</url>
-          <line>69</line>
+          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java</url>
+          <line>40</line>
           <properties />
-          <option name="timeStamp" value="21" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java</url>
-          <line>96</line>
-          <properties />
-          <option name="timeStamp" value="38" />
+          <option name="timeStamp" value="122" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
@@ -970,394 +878,452 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <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="2068">
-          <caret line="154" column="35" selection-start-line="154" selection-start-column="35" selection-end-line="154" selection-end-column="35" />
-        </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="3300">
-          <caret line="297" column="22" selection-start-line="297" selection-start-column="22" selection-end-line="297" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/StringUtils.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
-          <caret line="13" column="48" lean-forward="true" selection-start-line="13" selection-start-column="48" selection-end-line="13" selection-end-column="48" />
+          <caret line="11" column="5" selection-start-line="11" selection-start-column="5" selection-end-line="11" selection-end-column="5" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="78" lean-forward="true" selection-start-line="78" selection-end-line="78" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="616">
-          <caret line="41" column="1" selection-start-line="41" selection-start-column="1" selection-end-line="41" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="110">
-          <caret line="12" column="23" selection-start-line="12" selection-start-column="23" selection-end-line="12" selection-end-column="23" />
+        <state relative-caret-position="516">
+          <caret line="114" column="12" selection-start-line="114" selection-start-column="12" selection-end-line="114" selection-end-column="12" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="164">
-          <caret line="56" lean-forward="true" selection-start-line="56" selection-end-line="56" />
+        <state relative-caret-position="418">
+          <caret line="33" column="44" selection-start-line="33" selection-start-column="44" selection-end-line="33" selection-end-column="44" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="258">
-          <caret line="27" column="12" lean-forward="true" selection-start-line="27" selection-start-column="12" selection-end-line="27" selection-end-column="12" />
+        <state relative-caret-position="132">
+          <caret line="11" column="20" lean-forward="true" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="20" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.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="-12">
-          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        <state relative-caret-position="516">
+          <caret line="142" column="54" selection-start-line="142" selection-start-column="54" selection-end-line="142" selection-end-column="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="858">
-          <caret line="55" column="27" lean-forward="true" selection-start-line="55" selection-start-column="27" selection-end-line="55" selection-end-column="27" />
+        <state relative-caret-position="66">
+          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="58">
+          <caret line="18" column="28" selection-start-line="18" selection-start-column="19" selection-end-line="18" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="305">
+          <caret line="24" column="31" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="714">
+          <caret line="58" column="5" lean-forward="true" selection-start-line="58" selection-start-column="5" selection-end-line="58" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="924">
+          <caret line="134" column="92" selection-start-line="134" selection-start-column="92" selection-end-line="134" selection-end-column="92" />
+          <folding>
+            <element signature="method#linkDevice#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkPartitionCamera#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkReservePlan#0;class#PgAlarmLinkRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1066">
+          <caret line="90" lean-forward="true" selection-start-line="90" selection-end-line="90" />
+          <folding>
+            <element signature="method#getTjResultByAlarmType#0;class#PgAlarmTjRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="946">
+          <caret line="148" column="11" lean-forward="true" selection-start-line="148" selection-start-column="11" selection-end-line="148" selection-end-column="11" />
+          <folding>
+            <element signature="method#getAlarmTypeList#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#addAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#editAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#deleteAlarmType#0;class#PgAlarmTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="208">
+          <caret line="46" column="23" lean-forward="true" selection-start-line="46" selection-start-column="23" selection-end-line="46" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="113" column="9" lean-forward="true" selection-start-line="113" selection-start-column="9" selection-end-line="113" selection-end-column="9" />
+          <folding>
+            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
+            <element signature="method#getNewestCh4InfoByDev#0;class#PgCh4Rs#0" />
+            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="145" column="6" lean-forward="true" selection-start-line="145" selection-start-column="6" selection-end-line="145" selection-end-column="6" />
+          <folding>
+            <element signature="method#addAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#editAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#deleteAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#getAuthorityList#0;class#PgAuthorityRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="58" column="1" lean-forward="true" selection-start-line="58" selection-start-column="1" selection-end-line="58" selection-end-column="1" />
+          <folding>
+            <element signature="method#getPgAssetPlanList#0;class#PgAssetPlanRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="370">
+          <caret line="371" column="66" selection-start-line="371" selection-start-column="66" selection-end-line="371" selection-end-column="66" />
+          <folding>
+            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#searchConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionDev#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="139" column="13" lean-forward="true" selection-start-line="139" selection-start-column="13" selection-end-line="139" selection-end-column="13" />
+          <folding>
+            <element signature="method#getCoInfoByDevAndDate#0;class#PgCoRs#0" />
+            <element signature="method#getNewestCoInfoByDev#0;class#PgCoRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="540">
+          <caret line="223" column="5" lean-forward="true" selection-start-line="223" selection-start-column="5" selection-end-line="223" selection-end-column="5" />
+          <folding>
+            <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="682">
+          <caret line="100" lean-forward="true" selection-start-line="100" selection-end-line="100" />
+          <folding>
+            <element signature="method#getDeviceTpeyList#0;class#PgDeviceTypeRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="377">
+          <caret line="225" column="35" selection-start-line="225" selection-start-column="35" selection-end-line="225" selection-end-column="35" />
+          <folding>
+            <element signature="method#addEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#addEquipment#1;class#PgEquipmentRs#0" />
+            <element signature="method#getEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#deleteEquipment#0;class#PgEquipmentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="406">
+          <caret line="109" lean-forward="true" selection-start-line="109" selection-end-line="109" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="154">
+          <caret line="28" column="19" selection-start-line="28" selection-start-column="19" selection-end-line="28" selection-end-column="19" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="748">
-          <caret line="49" column="5" lean-forward="true" selection-start-line="49" selection-start-column="5" selection-end-line="49" selection-end-column="5" />
+        <state relative-caret-position="296">
+          <caret line="161" column="35" selection-start-line="161" selection-start-column="35" selection-end-line="161" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="384">
+          <caret line="99" column="5" lean-forward="true" selection-start-line="99" selection-start-column="5" selection-end-line="99" selection-end-column="5" />
+        </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="362">
+          <caret line="340" column="35" selection-start-line="340" selection-start-column="35" selection-end-line="340" selection-end-column="35" />
+          <folding>
+            <element signature="method#addInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPersonInPg#0;class#PgInPgPersonRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-606">
+          <caret line="76" column="20" lean-forward="true" selection-start-line="76" selection-start-column="20" selection-end-line="76" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="65" column="35" selection-start-line="65" selection-start-column="35" selection-end-line="65" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="101" column="35" selection-start-line="101" selection-start-column="35" selection-end-line="101" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="84" column="35" selection-start-line="84" selection-start-column="35" selection-end-line="84" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="59" lean-forward="true" selection-start-line="59" selection-end-line="59" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="60" column="1" lean-forward="true" selection-start-line="60" selection-start-column="1" selection-end-line="60" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="145" column="35" selection-start-line="145" selection-start-column="35" selection-end-line="145" selection-end-column="35" />
+        </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="274">
+          <caret line="350" column="35" selection-start-line="350" selection-start-column="35" selection-end-line="350" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="121" column="39" selection-start-line="121" selection-start-column="39" selection-end-line="121" selection-end-column="39" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="28" column="8" lean-forward="true" selection-start-line="28" selection-start-column="8" selection-end-line="28" selection-end-column="8" />
+        <state relative-caret-position="340">
+          <caret line="103" selection-start-line="103" selection-end-line="103" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="226" column="35" selection-start-line="226" selection-start-column="35" selection-end-line="226" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="203" column="35" selection-start-line="203" selection-start-column="35" selection-end-line="203" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="241" column="35" selection-start-line="241" selection-start-column="35" selection-end-line="241" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="225" column="1" lean-forward="true" selection-start-line="225" selection-start-column="1" selection-end-line="225" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="176" column="5" lean-forward="true" selection-start-line="176" selection-start-column="5" selection-end-line="176" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="178" column="35" lean-forward="true" selection-start-line="178" selection-start-column="35" selection-end-line="178" selection-end-column="35" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="516">
-          <caret line="94" column="53" selection-start-line="94" selection-start-column="53" selection-end-line="94" selection-end-column="53" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="814">
-          <caret line="52" column="9" lean-forward="true" selection-start-line="52" selection-start-column="9" selection-end-line="52" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="182">
-          <caret line="58" column="12" lean-forward="true" selection-start-line="58" selection-start-column="12" selection-end-line="58" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="34" lean-forward="true" selection-start-line="34" selection-end-line="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="32" lean-forward="true" selection-start-line="32" selection-end-line="32" />
-          <folding>
-            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
-            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="185">
-          <caret line="63" column="13" selection-start-line="63" selection-start-column="13" selection-end-line="63" selection-end-column="13" />
-          <folding>
-            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
-            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
-            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="e#6319#6324#0" />
-            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
-          </folding>
+          <caret line="240" lean-forward="true" selection-start-line="240" selection-end-line="240" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
-          <caret line="58" column="28" lean-forward="true" selection-start-line="58" selection-start-column="28" selection-end-line="58" selection-end-column="28" />
-          <folding>
-            <element signature="method#addTempHumData#0;class#PgTempHumRs#0" />
-          </folding>
+        <state relative-caret-position="340">
+          <caret line="148" column="34" selection-start-line="148" selection-start-column="34" selection-end-line="148" selection-end-column="34" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
+        <state relative-caret-position="458">
+          <caret line="99" column="35" selection-start-line="99" selection-start-column="35" selection-end-line="99" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+        <state relative-caret-position="384">
+          <caret line="145" column="32" lean-forward="true" selection-start-line="145" selection-start-column="32" selection-end-line="145" selection-end-column="32" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="414">
-          <caret line="22" column="46" lean-forward="true" selection-start-line="22" selection-start-column="46" selection-end-line="22" selection-end-column="46" />
-        </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="396">
-          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" column="83" selection-start-line="11" selection-start-column="83" selection-end-line="11" selection-end-column="83" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="26">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
-          <folding>
-            <element signature="method#getPgInPgStatusByPerson#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNumByName#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNum#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPersonListByDay#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPgStatusByPgInPgPerson#0;class#PgInPgStatusManager#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="44">
-          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-12">
-          <caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="87" lean-forward="true" selection-start-line="87" selection-end-line="87" />
-          <folding>
-            <element signature="method#getConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#addConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#deleteConstructionType#0;class#PgConstructionTypeRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
-          <folding>
-            <element signature="method#getConstructionTypeByType#0;class#PgConstructionTypeManager#0" />
-            <element signature="method#getAllConstructionTypeDto#0;class#PgConstructionTypeManager#0" />
-          </folding>
-        </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="145">
-          <caret line="258" column="9" lean-forward="true" selection-start-line="258" selection-start-column="9" selection-end-line="258" selection-end-column="9" />
-          <folding>
-            <element signature="method#getMonthInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayInPgStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgOverViewRs#0" />
-            <element signature="method#getAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getMonthAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayAlarmStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgOverViewRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="103">
-          <caret line="105" column="50" lean-forward="true" selection-start-line="105" selection-start-column="50" selection-end-line="105" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateBasicDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="99">
-          <caret line="125" selection-start-line="125" selection-end-line="125" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="190">
-          <caret line="24" column="35" lean-forward="true" selection-start-line="24" selection-start-column="35" selection-end-line="24" selection-end-column="35" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="436">
-          <caret line="24" lean-forward="true" selection-start-line="24" selection-end-line="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" lean-forward="true" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="300">
-          <caret line="34" column="31" lean-forward="true" selection-start-line="34" selection-start-column="31" selection-end-line="34" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="42" column="13" lean-forward="true" selection-start-line="42" selection-start-column="13" selection-end-line="42" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="120" column="72" lean-forward="true" selection-start-line="120" selection-start-column="72" selection-end-line="120" selection-end-column="72" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="293">
-          <caret line="58" column="73" lean-forward="true" selection-start-line="58" selection-start-column="73" selection-end-line="58" selection-end-column="73" />
-          <folding>
-            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
-            <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
-          </folding>
-        </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="307">
-          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
+        <state relative-caret-position="758">
+          <caret line="130" column="5" lean-forward="true" selection-start-line="130" selection-start-column="5" selection-end-line="130" selection-end-column="5" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1170">
-          <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
+        <state relative-caret-position="494">
+          <caret line="86" column="62" lean-forward="true" selection-start-line="86" selection-start-column="62" selection-end-line="86" selection-end-column="62" />
           <folding>
-            <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-            <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+            <element signature="method#getAllDevice#0;class#PgDeviceManager#0" />
+            <element signature="method#getAllDev#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="195" column="28" lean-forward="true" selection-start-line="195" selection-start-column="28" selection-end-line="195" selection-end-column="28" />
+        <state relative-caret-position="166">
+          <caret line="174" column="13" lean-forward="true" selection-start-line="174" selection-start-column="13" selection-end-line="174" selection-end-column="13" />
           <folding>
-            <element signature="method#getAlarmByTypeAndTime#0;class#PgAlarmManager#0" />
-            <element signature="method#getAlarmNum#0;class#PgAlarmManager#0" />
             <element signature="method#getDayAlarmStatistic#0;class#PgAlarmManager#0" />
+            <element signature="method#getAlarmList#0;class#PgAlarmManager#0" />
             <element signature="method#createDTO#0;class#PgAlarmManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="364">
+          <caret line="46" column="56" lean-forward="true" selection-start-line="46" selection-start-column="56" selection-end-line="46" selection-end-column="56" />
+          <folding>
+            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
+            <element signature="method#getPgDev#0;class#PgDeviceRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
+            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+        <state relative-caret-position="396">
+          <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
           <folding>
             <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
             <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -1365,52 +1331,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="239">
-          <caret line="21" column="33" lean-forward="true" selection-start-line="21" selection-start-column="33" selection-end-line="21" selection-end-column="33" />
-        </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="352">
-          <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-        </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="99">
-          <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-          </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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-          <folding>
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-            <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>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
index c436c93..e913155 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
@@ -132,7 +132,10 @@
             this.setAlarmType("");
         else
             this.setAlarmType(pgAlarm.getAlarmTypeId().getAlarmType());
-        this.setAlarmValue(pgAlarm.getAlarmValue());
+        if(pgAlarm.getAlarmValue()==null)
+            this.setAlarmValue("");
+        else
+            this.setAlarmValue(pgAlarm.getAlarmValue());
         if (pgAlarm.getAlarmDate() != null)
             this.setAlarmDate(sdf.format(pgAlarm.getAlarmDate()));
         else
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
index a43965c..565cb41 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -159,11 +159,21 @@
     }
 
     //获取历史报警消息列表
-    public List<PgAlarmDto> getAllAlarm(String alarmType,String startDay,String endDay,String isNew,int page,int rows) {
-        try {
+    public  Map<String, Object> getAllAlarm(String alarmType,String partition,String startDay,String endDay,String isNew,int page,int rows) {
 
+        Map<String, Object> resultMap = new HashMap<>();
+        String msg="";
+
+        try {
             Criteria criteria = createCriteria(PgAlarm.class);
 
+            if (StringUtils.isNotBlank(partition)) {
+                DetachedCriteria inCriteria = DetachedCriteria.forClass(PgDevice.class);
+                inCriteria.add(Restrictions.eq("partition", partition));
+                inCriteria.setProjection(Property.forName("id"));
+                criteria.add(Property.forName("alarmDevId").in(inCriteria));
+            }
+
             if (StringUtils.isNotBlank(alarmType)&&!alarmType.contains("全部")&&pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
                 criteria.add(Restrictions.eq("alarmTypeId", pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)));
 
@@ -190,8 +200,16 @@
             for (PgAlarm pgAlarm : pgAlarmList) {
                 pgAlarmDtoList.add(new PgAlarmDto(pgAlarm));
             }
-
-            return pgAlarmDtoList;
+            if(pgAlarmDtoList==null||pgAlarmDtoList.size()==0) {
+                resultMap.put("msg", "没有报警信息");
+                resultMap.put("code","0");
+            }else {
+                resultMap.put("code","200");
+                resultMap.put("msg", "报警信息获取成功");
+            }
+            resultMap.put("count",pg.getTotalCount());
+            resultMap.put("result",pgAlarmDtoList);
+            return resultMap;
         }
         catch(Exception ex){
             ex.printStackTrace();
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index 7547560..654f49e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -24,11 +24,11 @@
 
         Criteria criteria = createCriteria(PgDevice.class);
 
-        if(road!=null)
+        if(StringUtils.isNotBlank(road))
             criteria.add(Restrictions.eq("road",road));
-        if(partition!=null)
+        if(StringUtils.isNotBlank(partition))
             criteria.add(Restrictions.eq("partition",partition));
-        if(devType!=null)
+        if(StringUtils.isNotBlank(devType))
             criteria.add(Restrictions.eq("devType",devType));
 
         criteria.add(Restrictions.eq("active", 1));
@@ -43,6 +43,29 @@
         return pgDeviceDtoList;
     }
 
+    public List<PgDeviceDto> getAllDev(String road,String partition,String devType) {
+
+        Criteria criteria = createCriteria(PgDevice.class);
+
+        if(StringUtils.isNotBlank(road))
+            criteria.add(Restrictions.eq("road",road));
+        if(StringUtils.isNotBlank(partition))
+            criteria.add(Restrictions.eq("partition",partition));
+        if(StringUtils.isNotBlank(devType))
+            criteria.add(Restrictions.like("devType","%"+devType+"%"));
+
+        criteria.add(Restrictions.eq("active", 1));
+        criteria.addOrder(Order.desc("id"));
+        List<PgDevice> pgDeviceList = criteria.list();
+
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
+        for (PgDevice pgDevice : pgDeviceList) {
+            pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
+        }
+
+        return pgDeviceDtoList;
+    }
+
     //根据名字获取当前设备
     public PgDevice getDeviceByAssetCode(String assetCode) {
         Criteria criteria=createCriteria(PgDevice.class);
@@ -56,9 +79,9 @@
     }
 
     //根据类型获取设备列表
-    public List<PgDeviceDto> getDeviceByDevTypee(String devType) {
+    public List<PgDeviceDto> getDeviceByDevType(String devType) {
         Criteria criteria=createCriteria(PgDevice.class);
-        criteria.add(Restrictions.eq("devType",devType));
+        criteria.add(Restrictions.like("devType","%"+devType+"%"));
 
         List<PgDevice> pgDeviceList=criteria.list();
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
@@ -106,7 +129,7 @@
         criteria.add(Restrictions.eq("partition",partition));
 
         List<PgDevice> pgDeviceList=criteria.list();
-        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<PgDeviceDto>();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
 
         for (PgDevice pgDevice : pgDeviceList) {
             pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
index 3a3bccd..595730e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
@@ -1,10 +1,13 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.devTable.domain.PgAlarmType;
 import com.casic.PgInterface.devTable.domain.PgPartition;
 import com.casic.PgInterface.devTable.domain.PgRoad;
 import com.casic.PgInterface.devTable.domain.PipeGallery;
 import com.casic.PgInterface.devTable.dto.PgPartitionDto;
+import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
@@ -12,7 +15,9 @@
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Created by yxw on 2017/11/4.
@@ -21,7 +26,8 @@
 public class PgPartitionManager extends HibernateEntityDao<PgPartition> {
 
     @Resource
-    PgRoadManager pgRoadManager;
+    private PgRoadManager pgRoadManager;
+
 
     public PgPartition getPartitionByParName(String parName) {
         Criteria criteria = getSession().createCriteria(PgPartition.class);
@@ -99,4 +105,5 @@
         return pgPartitionDtoList;
     }
 
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
index f216360..a6928f1 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
@@ -5,6 +5,7 @@
 public class PgPlanResultRe {
 
     private String taskKey;
+    private List<String> pileAcuList;
     private List<PgPlanResult> pgPlanResultList;
 
     public String getTaskKey() {
@@ -15,6 +16,14 @@
         this.taskKey = taskKey;
     }
 
+    public List<String> getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(List<String> pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+
     public List<PgPlanResult> getPgPlanResultList() {
         return pgPlanResultList;
     }
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
index 71ea765..47eea07 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
@@ -54,9 +54,7 @@
 
         List<PgLineHole> pgLineHoleList=criteria.list();
         List<PgLineHoleDTO> pgLineHoleDTOList=new ArrayList<>();
-        if(pgLineHoleList==null||pgLineHoleList.size()==0)
-            return null;
-        else
+        if(pgLineHoleList!=null&&pgLineHoleList.size()!=0)
             pgLineHoleDTOList=PgLineHoleDTO.ConvertToDTOList(pgLineHoleList,pgPileAcuManager,pgRoadManager);
         return pgLineHoleDTOList;
     }
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
index 0fd9e1f..841a386 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
@@ -1,12 +1,15 @@
 package com.casic.PgInterface.intelPlan.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.devTable.domain.PgPartition;
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
 import com.casic.PgInterface.intelPlan.domain.PgLineHole;
 import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
 import com.casic.PgInterface.intelPlan.domain.PgSection;
 import com.casic.PgInterface.intelPlan.dto.PgPlanResult;
 import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
 import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -22,6 +25,9 @@
     @Resource
     private PgLineHoleManager pgLineHoleManager;
 
+    @Resource
+    private PgRoadManager pgRoadManager;
+
     public PgPileAcu getPgPileAcuByCode(String acuCode){
         List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
 
@@ -58,7 +64,9 @@
         for(PgPlanTask pgPlanTask:pgPlanTaskList){
             List<PgPlanResult> pgPlanResultList=getPgPlanResultByPlantask(pgPlanTask);
             PgPlanResultRe pgPlanResultRe=new PgPlanResultRe();
+
             pgPlanResultRe.setTaskKey(pgPlanTask.getTaskKey());
+            pgPlanResultRe.setPileAcuList(pgPlanTask.getPileAcuList());
             pgPlanResultRe.setPgPlanResultList(pgPlanResultList);
 
             pgPlanResultReList.add(pgPlanResultRe);
@@ -142,4 +150,57 @@
         return length;
     }
 
+    private PgPileAcu getPgPileAcuByAcuCode(String acuCode){
+        List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
+
+        if(pgPileAcuList==null||pgPileAcuList.size()==0)
+            return null;
+        else
+            return pgPileAcuList.get(0);
+    }
+
+    public List<PgAcuTask> getACUTask(String pileAcuList){
+        String[] acuArray=pileAcuList.split(",");
+        List<PgAcuTask> pgAcuTaskList=new ArrayList<>();
+
+        for(String acu:acuArray){
+            PgPileAcu pgPileAcu=this.getPgPileAcuByCode(acu);
+            String roadName=pgRoadManager.get(pgPileAcu.getRoadId()).getRoadName();
+
+            if(!containRoad(roadName,pgAcuTaskList))
+            {
+                PgAcuTask pgAcuTask=new PgAcuTask();
+                pgAcuTask.setRoadName(roadName);
+                pgAcuTask.setPileAcuList(acu);
+                pgAcuTaskList.add(pgAcuTask);
+            }
+            else{
+                PgAcuTask pgAcuTask=getIndexRoad(roadName,pgAcuTaskList);
+                if(pgAcuTask!=null)
+                    pgAcuTask.setPileAcuList(pgAcuTask.getPileAcuList()+","+acu);
+            }
+        }
+
+        return pgAcuTaskList;
+    }
+
+    private boolean containRoad(String roadName,List<PgAcuTask> pgAcuTaskList){
+        if(pgAcuTaskList==null||pgAcuTaskList.size()==0) return false;
+        for(PgAcuTask pgAcuTask:pgAcuTaskList){
+            if(pgAcuTask.getRoadName().equals(roadName))
+                return true;
+        }
+
+        return false;
+    }
+
+    private PgAcuTask getIndexRoad(String roadName, List<PgAcuTask> pgAcuTaskList){
+        for(PgAcuTask pgAcuTask:pgAcuTaskList){
+            if(pgAcuTask.getRoadName().equals(roadName))
+                return pgAcuTask;
+        }
+
+        return null;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java
new file mode 100644
index 0000000..323f7ef
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java
@@ -0,0 +1,25 @@
+package com.casic.PgInterface.reservePlan.dto;
+
+import java.util.List;
+
+public class PgAcuTask {
+
+    private String roadName;//道路
+    private String pileAcuList;//acu分区
+
+    public String getRoadName() {
+        return roadName;
+    }
+
+    public void setRoadName(String roadName) {
+        this.roadName = roadName;
+    }
+
+    public String getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(String pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
index c25e926..c7d7693 100644
--- a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
@@ -70,9 +70,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(Long.valueOf(inPgPersonId));
         PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("hostName",pgInPgPerson.getAssetCode());
-//        PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode());
-//        long maxId = pgTagPositionManager.getMaxId(pgTagMac.getTagMac());
-//        PGTagPosition pgTagPosition = pgTagPositionManager.get(maxId);
+
         PGTagPosition pgTagPosition = tagmacRun.GetTagStatus(pgTagMac);
         boolean bExist = false;
         bExist = pgTagPositionManager.findTagPosition(pgTagPosition.getPositionUpdatetime(),pgTagPosition.getHostId());
@@ -104,8 +102,7 @@
         PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(Long.valueOf(inPgPersonId));
         PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pgInPgPersonId",pgInPgPerson);
         System.out.println("time:"+pgInPgStatus.getInTime());
-//        PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pgInPgPersonId",inPgPersonId);
-//        PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode());
+
         PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("hostName",pgInPgPerson.getAssetCode());
 
         Map<Object,Object> mapPosition = new HashMap<>();
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
index 082ba5d..3eed00a 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
@@ -48,6 +48,7 @@
     public Map<String, Object> linkDevice(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         PgDeviceDto pgDeviceDto = null;
         try {
@@ -62,6 +63,7 @@
                     else {
                         pgDeviceDto = new PgDeviceDto(pgDevice);
                         msg = "报警关联设备获取成功";
+                        code="200";
                     }
                 }
             }
@@ -71,6 +73,7 @@
             e.printStackTrace();
             msg = "获取关联设备失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceDto);
 
@@ -86,6 +89,7 @@
     public Map<String, Object> linkPartitionCamera(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
         try {
@@ -106,6 +110,7 @@
 
                         pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(partition,position);
                         msg = "关联设备获取成功";
+                        code="200";
                     }
                 }
             }
@@ -115,6 +120,7 @@
             e.printStackTrace();
             msg = "分区设备关联失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceDtoList);
         return resultMap;
@@ -129,6 +135,7 @@
     public Map<String, Object> linkReservePlan(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgReservePlanDto> pgReservePlanDtoList=new ArrayList<>();
         try{
@@ -139,10 +146,12 @@
                 else {
                     pgReservePlanDtoList = pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
 
-                    if(pgReservePlanDtoList==null||pgReservePlanDtoList.size()==0)
-                        msg="不存在关联的报警预案";
-                    else
+                    if (pgReservePlanDtoList == null || pgReservePlanDtoList.size() == 0)
+                        msg = "不存在关联的报警预案";
+                    else {
                         msg = "关联预案获取成功";
+                        code="200";
+                    }
                 }
             }
             else
@@ -153,6 +162,7 @@
             e.printStackTrace();
             msg="预案关联失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgReservePlanDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
index 0ddbc4d..0ce886b 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
@@ -41,25 +41,19 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getAlarmList(@FormParam("alarmType") String alarmType,
                                             @FormParam("startDay") String startDay,
+                                            @FormParam("partition") String partition,
                                             @FormParam("endDay") String endDay,
                                             @FormParam("isNew") String isNew,
                                             @FormParam("page") int page,
                                             @FormParam("rows") int rows) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
         try {
-            pgAlarmDtoList = pgAlarmManager.getAllAlarm(alarmType,startDay,endDay,isNew,page,rows);
-            if (pgAlarmDtoList==null||pgAlarmDtoList.size() == 0)
-                msg = "没有报警信息";
-            else
-                msg = "报警信息获取成功";
+            resultMap = pgAlarmManager.getAllAlarm(alarmType,partition,startDay,endDay,isNew,page,rows);
+
         } catch (Exception e) {
             e.printStackTrace();
-            msg = "报警信息获取失败";
         }
-        resultMap.put("msg", msg);
-        resultMap.put("result", pgAlarmDtoList);
         return resultMap;
     }
 
@@ -71,9 +65,10 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> clearAlarmList(@FormParam("id") String id) throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        String result = "false";
+        String result = "";
+        String code="0";
 
         try {
             PgAlarm pgAlarm = new PgAlarm();
@@ -86,12 +81,14 @@
                 pgAlarmManager.save(pgAlarm);
                 msg = "报警信息清除成功";
                 result = "true";
+                code = "200";
             }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警信息清除失败";
             result = "false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
@@ -106,21 +103,26 @@
     public Map<String, Object> getAlarmByTypeOrTime(@FormParam("alarmType") String alarmType,
                                                     @FormParam("startTime") String startTime,
                                                     @FormParam("endTime") String endTime) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
-        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<PgAlarmDto>();
+        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
         try {
             pgAlarmDtoList = pgAlarmManager.getAlarmByTypeAndTime(alarmType, startTime, endTime);
             if (pgAlarmDtoList == null || pgAlarmDtoList.size() == 0)
                 msg = "报警信息不存在";
             else
+            {
                 msg = "报警信息获取成功";
+                code="200";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警信息获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
index 29ce8a4..ed0bf34 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
@@ -39,8 +39,8 @@
     public Map<String, Object> getAlarmRule(@FormParam("devType") String devType) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
-        System.out.println("devType:"+devType);
         List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<>();
         try {
             pgAlarmRuleDtoList = pgAlarmRuleManager.getAlarmRuleDto(devType);
@@ -52,6 +52,7 @@
             e.printStackTrace();
             msg = "报警阈值信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmRuleDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
index 24ab894..abef1b1 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
@@ -39,16 +39,21 @@
                                                      @FormParam("endDate") String endDate)throws Exception{
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
+
         List<PgAlarmTjDto> pgAlarmTjDtoList=null;
         try{
             pgAlarmTjDtoList=pgAlarmTjManager.getAlarmTjResultByType(startDate,endDate);
             msg="获取成功";
+            code="200";
         }
         catch(Exception ex) {
             msg = "统计失败";
         }
-        resultMap.put("result",pgAlarmTjDtoList);
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
+        resultMap.put("result",pgAlarmTjDtoList);
+
         return resultMap;
     }
 
@@ -61,23 +66,27 @@
     public Map<String, Object> getAlarmByTime(@FormParam("startTime") String startTime,
                                               @FormParam("endTime") String endTime,
                                               @FormParam("statisticType") String statisticType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code = "0";
 
-        List<PgAlarmTjDto> pgAlarmTjDtoList = new ArrayList<PgAlarmTjDto>();
+        List<PgAlarmTjDto> pgAlarmTjDtoList = new ArrayList<>();
         try {
             pgAlarmTjDtoList = pgAlarmTjManager.getAlarmByTime(startTime, endTime, statisticType);
             if(pgAlarmTjDtoList==null)
                 msg="报警统计信息获取失败";
-            else
-                msg="报警统计信息获取成功";
+            else {
+                msg = "报警统计信息获取成功";
+                code="200";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警统计信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmTjDtoList);
         return resultMap;
     }
 
-}
+}
\ No newline at end of file

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 25ded8a..283d7ab 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,20 +7,56 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" 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/construction/manager/PgCsDocumentManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/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/manager/PgAlarmManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/~$说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/~$说明20191207.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.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$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/接口说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明20191207.docx" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
@@ -51,7 +87,7 @@
         <counts>
           <entry key="class" value="4" />
           <entry key="iml" value="2" />
-          <entry key="java" value="707" />
+          <entry key="java" value="820" />
           <entry key="properties" value="14" />
           <entry key="xml" value="7" />
         </counts>
@@ -60,7 +96,7 @@
         <counts>
           <entry key="CLASS" value="4" />
           <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="707" />
+          <entry key="JAVA" value="820" />
           <entry key="Properties" value="14" />
           <entry key="XML" value="7" />
         </counts>
@@ -68,32 +104,32 @@
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
           <entry key="dummy" value="38" />
-          <entry key="java" value="30161" />
+          <entry key="java" value="40859" />
           <entry key="properties" value="100" />
-          <entry key="txt" value="176" />
+          <entry key="txt" value="186" />
           <entry key="xml" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="30161" />
-          <entry key="PLAIN_TEXT" value="214" />
+          <entry key="JAVA" value="40859" />
+          <entry key="PLAIN_TEXT" value="224" />
           <entry key="Properties" value="100" />
           <entry key="XML" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="48" />
+          <entry key="project.closed" value="51" />
           <entry key="project.open.time.1" value="5" />
           <entry key="project.open.time.12" value="2" />
           <entry key="project.open.time.13" value="1" />
           <entry key="project.open.time.15" value="1" />
           <entry key="project.open.time.16" value="1" />
           <entry key="project.open.time.17" value="1" />
-          <entry key="project.open.time.2" value="1" />
+          <entry key="project.open.time.2" value="2" />
           <entry key="project.open.time.20" value="1" />
-          <entry key="project.open.time.23" value="1" />
+          <entry key="project.open.time.23" value="2" />
           <entry key="project.open.time.24" value="2" />
           <entry key="project.open.time.251" value="1" />
           <entry key="project.open.time.27" value="2" />
@@ -106,8 +142,8 @@
           <entry key="project.open.time.36" value="1" />
           <entry key="project.open.time.37" value="1" />
           <entry key="project.open.time.39" value="2" />
-          <entry key="project.open.time.4" value="2" />
-          <entry key="project.open.time.40" value="1" />
+          <entry key="project.open.time.4" value="3" />
+          <entry key="project.open.time.40" value="2" />
           <entry key="project.open.time.41" value="2" />
           <entry key="project.open.time.42" value="2" />
           <entry key="project.open.time.43" value="2" />
@@ -122,23 +158,25 @@
           <entry key="project.open.time.6" value="3" />
           <entry key="project.open.time.63" value="2" />
           <entry key="project.open.time.64" value="1" />
+          <entry key="project.open.time.66" value="1" />
           <entry key="project.open.time.71" value="2" />
+          <entry key="project.open.time.74" value="1" />
           <entry key="project.open.time.76" value="1" />
           <entry key="project.open.time.8" value="2" />
           <entry key="project.open.time.9" value="1" />
           <entry key="project.open.time.97" value="1" />
-          <entry key="project.opened" value="78" />
+          <entry key="project.opened" value="84" />
         </counts>
       </usages-collector>
     </session>
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+            <state relative-caret-position="396">
+              <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
               <folding>
                 <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
                 <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -147,73 +185,6 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <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="99">
-              <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-              <folding>
-                <element signature="imports" expanded="true" />
-                <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-1170">
-              <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state>
-              <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
-              <folding>
-                <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-                <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="true">
-        <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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-              <folding>
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-                <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>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <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="352">
-              <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -225,18 +196,9 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>inCriteria</find>
-      <find>getPgPlanResulList</find>
-      <find>getPileAcuListByPileAcuStr</find>
-      <find>distinct</find>
-      <find>order</find>
-      <find>canPlanLine</find>
-      <find>isExistLine</find>
-      <find>getPlanResult</find>
       <find>pgPipeLine</find>
       <find>getPipeLineBylineName</find>
       <find>StringU</find>
-      <find>getAllAlarm</find>
       <find>getAlarmList</find>
       <find>getPgInPersonListByDay</find>
       <find>getDayInPgStatistic</find>
@@ -254,7 +216,16 @@
       <find>getPgContructionByNameOrType</find>
       <find>&quot;&quot;,&quot;&quot;,</find>
       <find>getPgContructionDtoByNameOrType</find>
+      <find>addConstruction</find>
+      <find>getPgLineAcuHole</find>
+      <find>getPlanResult</find>
       <find>getConstruction</find>
+      <find>addPipeLine</find>
+      <find>未找到入廊数据</find>
+      <find>getCurrentHoleByAcu</find>
+      <find>getAllAlarm</find>
+      <find>getPgDeviceDtoListByPartition</find>
+      <find>getPgDeviceByDevType</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -263,57 +234,57 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlan.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileHoleManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/planData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/PlanData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
       </list>
     </option>
   </component>
@@ -359,7 +330,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -421,53 +391,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="dto" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="manager" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -479,29 +402,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="rs" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -516,6 +416,7 @@
         </subPane>
       </pane>
       <pane id="Scope" />
+      <pane id="PackagesPane" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -710,7 +611,13 @@
       <workItem from="1574902733573" duration="1829000" />
       <workItem from="1574998240004" duration="7016000" />
       <workItem from="1575247959683" duration="6997000" />
-      <workItem from="1575704345590" duration="40473000" />
+      <workItem from="1575704345590" duration="69381000" />
+      <workItem from="1575869479666" duration="721000" />
+      <workItem from="1575947104878" duration="6101000" />
+      <workItem from="1576128264436" duration="3347000" />
+      <workItem from="1576208571543" duration="22000" />
+      <workItem from="1576227513917" duration="862000" />
+      <workItem from="1576293721220" duration="18246000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -817,11 +724,18 @@
       <option name="project" value="LOCAL" />
       <updated>1575775489149</updated>
     </task>
-    <option name="localTasksCounter" value="16" />
+    <task id="LOCAL-00016" summary="整改施工信息">
+      <created>1575791780774</created>
+      <option name="number" value="00016" />
+      <option name="presentableId" value="LOCAL-00016" />
+      <option name="project" value="LOCAL" />
+      <updated>1575791780774</updated>
+    </task>
+    <option name="localTasksCounter" value="17" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="452131000" />
+    <option name="totallyTimeSpent" value="510338000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -834,9 +748,8 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
-    <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.24205749" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2647504" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -847,7 +760,7 @@
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.3295082" />
       <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.4819672" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.65737706" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.3295082" />
@@ -939,7 +852,8 @@
     <MESSAGE value="重新设计智能规划部分" />
     <MESSAGE value="完成智能规划对接" />
     <MESSAGE value="修改报警统计" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改报警统计" />
+    <MESSAGE value="整改施工信息" />
+    <option name="LAST_COMMIT_MESSAGE" value="整改施工信息" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -951,16 +865,10 @@
           <option name="timeStamp" value="3" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java</url>
-          <line>69</line>
+          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java</url>
+          <line>40</line>
           <properties />
-          <option name="timeStamp" value="21" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java</url>
-          <line>96</line>
-          <properties />
-          <option name="timeStamp" value="38" />
+          <option name="timeStamp" value="122" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
@@ -970,394 +878,452 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <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="2068">
-          <caret line="154" column="35" selection-start-line="154" selection-start-column="35" selection-end-line="154" selection-end-column="35" />
-        </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="3300">
-          <caret line="297" column="22" selection-start-line="297" selection-start-column="22" selection-end-line="297" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/StringUtils.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
-          <caret line="13" column="48" lean-forward="true" selection-start-line="13" selection-start-column="48" selection-end-line="13" selection-end-column="48" />
+          <caret line="11" column="5" selection-start-line="11" selection-start-column="5" selection-end-line="11" selection-end-column="5" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="78" lean-forward="true" selection-start-line="78" selection-end-line="78" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="616">
-          <caret line="41" column="1" selection-start-line="41" selection-start-column="1" selection-end-line="41" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="110">
-          <caret line="12" column="23" selection-start-line="12" selection-start-column="23" selection-end-line="12" selection-end-column="23" />
+        <state relative-caret-position="516">
+          <caret line="114" column="12" selection-start-line="114" selection-start-column="12" selection-end-line="114" selection-end-column="12" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="164">
-          <caret line="56" lean-forward="true" selection-start-line="56" selection-end-line="56" />
+        <state relative-caret-position="418">
+          <caret line="33" column="44" selection-start-line="33" selection-start-column="44" selection-end-line="33" selection-end-column="44" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="258">
-          <caret line="27" column="12" lean-forward="true" selection-start-line="27" selection-start-column="12" selection-end-line="27" selection-end-column="12" />
+        <state relative-caret-position="132">
+          <caret line="11" column="20" lean-forward="true" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="20" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.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="-12">
-          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        <state relative-caret-position="516">
+          <caret line="142" column="54" selection-start-line="142" selection-start-column="54" selection-end-line="142" selection-end-column="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="858">
-          <caret line="55" column="27" lean-forward="true" selection-start-line="55" selection-start-column="27" selection-end-line="55" selection-end-column="27" />
+        <state relative-caret-position="66">
+          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="58">
+          <caret line="18" column="28" selection-start-line="18" selection-start-column="19" selection-end-line="18" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="305">
+          <caret line="24" column="31" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="714">
+          <caret line="58" column="5" lean-forward="true" selection-start-line="58" selection-start-column="5" selection-end-line="58" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="924">
+          <caret line="134" column="92" selection-start-line="134" selection-start-column="92" selection-end-line="134" selection-end-column="92" />
+          <folding>
+            <element signature="method#linkDevice#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkPartitionCamera#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkReservePlan#0;class#PgAlarmLinkRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1066">
+          <caret line="90" lean-forward="true" selection-start-line="90" selection-end-line="90" />
+          <folding>
+            <element signature="method#getTjResultByAlarmType#0;class#PgAlarmTjRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="946">
+          <caret line="148" column="11" lean-forward="true" selection-start-line="148" selection-start-column="11" selection-end-line="148" selection-end-column="11" />
+          <folding>
+            <element signature="method#getAlarmTypeList#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#addAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#editAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#deleteAlarmType#0;class#PgAlarmTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="208">
+          <caret line="46" column="23" lean-forward="true" selection-start-line="46" selection-start-column="23" selection-end-line="46" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="113" column="9" lean-forward="true" selection-start-line="113" selection-start-column="9" selection-end-line="113" selection-end-column="9" />
+          <folding>
+            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
+            <element signature="method#getNewestCh4InfoByDev#0;class#PgCh4Rs#0" />
+            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="145" column="6" lean-forward="true" selection-start-line="145" selection-start-column="6" selection-end-line="145" selection-end-column="6" />
+          <folding>
+            <element signature="method#addAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#editAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#deleteAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#getAuthorityList#0;class#PgAuthorityRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="58" column="1" lean-forward="true" selection-start-line="58" selection-start-column="1" selection-end-line="58" selection-end-column="1" />
+          <folding>
+            <element signature="method#getPgAssetPlanList#0;class#PgAssetPlanRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="370">
+          <caret line="371" column="66" selection-start-line="371" selection-start-column="66" selection-end-line="371" selection-end-column="66" />
+          <folding>
+            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#searchConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionDev#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="139" column="13" lean-forward="true" selection-start-line="139" selection-start-column="13" selection-end-line="139" selection-end-column="13" />
+          <folding>
+            <element signature="method#getCoInfoByDevAndDate#0;class#PgCoRs#0" />
+            <element signature="method#getNewestCoInfoByDev#0;class#PgCoRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="540">
+          <caret line="223" column="5" lean-forward="true" selection-start-line="223" selection-start-column="5" selection-end-line="223" selection-end-column="5" />
+          <folding>
+            <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="682">
+          <caret line="100" lean-forward="true" selection-start-line="100" selection-end-line="100" />
+          <folding>
+            <element signature="method#getDeviceTpeyList#0;class#PgDeviceTypeRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="377">
+          <caret line="225" column="35" selection-start-line="225" selection-start-column="35" selection-end-line="225" selection-end-column="35" />
+          <folding>
+            <element signature="method#addEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#addEquipment#1;class#PgEquipmentRs#0" />
+            <element signature="method#getEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#deleteEquipment#0;class#PgEquipmentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="406">
+          <caret line="109" lean-forward="true" selection-start-line="109" selection-end-line="109" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="154">
+          <caret line="28" column="19" selection-start-line="28" selection-start-column="19" selection-end-line="28" selection-end-column="19" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="748">
-          <caret line="49" column="5" lean-forward="true" selection-start-line="49" selection-start-column="5" selection-end-line="49" selection-end-column="5" />
+        <state relative-caret-position="296">
+          <caret line="161" column="35" selection-start-line="161" selection-start-column="35" selection-end-line="161" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="384">
+          <caret line="99" column="5" lean-forward="true" selection-start-line="99" selection-start-column="5" selection-end-line="99" selection-end-column="5" />
+        </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="362">
+          <caret line="340" column="35" selection-start-line="340" selection-start-column="35" selection-end-line="340" selection-end-column="35" />
+          <folding>
+            <element signature="method#addInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPersonInPg#0;class#PgInPgPersonRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-606">
+          <caret line="76" column="20" lean-forward="true" selection-start-line="76" selection-start-column="20" selection-end-line="76" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="65" column="35" selection-start-line="65" selection-start-column="35" selection-end-line="65" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="101" column="35" selection-start-line="101" selection-start-column="35" selection-end-line="101" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="84" column="35" selection-start-line="84" selection-start-column="35" selection-end-line="84" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="59" lean-forward="true" selection-start-line="59" selection-end-line="59" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="60" column="1" lean-forward="true" selection-start-line="60" selection-start-column="1" selection-end-line="60" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="145" column="35" selection-start-line="145" selection-start-column="35" selection-end-line="145" selection-end-column="35" />
+        </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="274">
+          <caret line="350" column="35" selection-start-line="350" selection-start-column="35" selection-end-line="350" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="121" column="39" selection-start-line="121" selection-start-column="39" selection-end-line="121" selection-end-column="39" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="28" column="8" lean-forward="true" selection-start-line="28" selection-start-column="8" selection-end-line="28" selection-end-column="8" />
+        <state relative-caret-position="340">
+          <caret line="103" selection-start-line="103" selection-end-line="103" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="226" column="35" selection-start-line="226" selection-start-column="35" selection-end-line="226" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="203" column="35" selection-start-line="203" selection-start-column="35" selection-end-line="203" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="241" column="35" selection-start-line="241" selection-start-column="35" selection-end-line="241" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="225" column="1" lean-forward="true" selection-start-line="225" selection-start-column="1" selection-end-line="225" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="176" column="5" lean-forward="true" selection-start-line="176" selection-start-column="5" selection-end-line="176" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="178" column="35" lean-forward="true" selection-start-line="178" selection-start-column="35" selection-end-line="178" selection-end-column="35" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="516">
-          <caret line="94" column="53" selection-start-line="94" selection-start-column="53" selection-end-line="94" selection-end-column="53" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="814">
-          <caret line="52" column="9" lean-forward="true" selection-start-line="52" selection-start-column="9" selection-end-line="52" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="182">
-          <caret line="58" column="12" lean-forward="true" selection-start-line="58" selection-start-column="12" selection-end-line="58" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="34" lean-forward="true" selection-start-line="34" selection-end-line="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="32" lean-forward="true" selection-start-line="32" selection-end-line="32" />
-          <folding>
-            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
-            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="185">
-          <caret line="63" column="13" selection-start-line="63" selection-start-column="13" selection-end-line="63" selection-end-column="13" />
-          <folding>
-            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
-            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
-            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="e#6319#6324#0" />
-            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
-          </folding>
+          <caret line="240" lean-forward="true" selection-start-line="240" selection-end-line="240" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
-          <caret line="58" column="28" lean-forward="true" selection-start-line="58" selection-start-column="28" selection-end-line="58" selection-end-column="28" />
-          <folding>
-            <element signature="method#addTempHumData#0;class#PgTempHumRs#0" />
-          </folding>
+        <state relative-caret-position="340">
+          <caret line="148" column="34" selection-start-line="148" selection-start-column="34" selection-end-line="148" selection-end-column="34" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
+        <state relative-caret-position="458">
+          <caret line="99" column="35" selection-start-line="99" selection-start-column="35" selection-end-line="99" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+        <state relative-caret-position="384">
+          <caret line="145" column="32" lean-forward="true" selection-start-line="145" selection-start-column="32" selection-end-line="145" selection-end-column="32" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="414">
-          <caret line="22" column="46" lean-forward="true" selection-start-line="22" selection-start-column="46" selection-end-line="22" selection-end-column="46" />
-        </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="396">
-          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" column="83" selection-start-line="11" selection-start-column="83" selection-end-line="11" selection-end-column="83" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="26">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
-          <folding>
-            <element signature="method#getPgInPgStatusByPerson#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNumByName#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNum#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPersonListByDay#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPgStatusByPgInPgPerson#0;class#PgInPgStatusManager#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="44">
-          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-12">
-          <caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="87" lean-forward="true" selection-start-line="87" selection-end-line="87" />
-          <folding>
-            <element signature="method#getConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#addConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#deleteConstructionType#0;class#PgConstructionTypeRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
-          <folding>
-            <element signature="method#getConstructionTypeByType#0;class#PgConstructionTypeManager#0" />
-            <element signature="method#getAllConstructionTypeDto#0;class#PgConstructionTypeManager#0" />
-          </folding>
-        </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="145">
-          <caret line="258" column="9" lean-forward="true" selection-start-line="258" selection-start-column="9" selection-end-line="258" selection-end-column="9" />
-          <folding>
-            <element signature="method#getMonthInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayInPgStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgOverViewRs#0" />
-            <element signature="method#getAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getMonthAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayAlarmStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgOverViewRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="103">
-          <caret line="105" column="50" lean-forward="true" selection-start-line="105" selection-start-column="50" selection-end-line="105" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateBasicDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="99">
-          <caret line="125" selection-start-line="125" selection-end-line="125" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="190">
-          <caret line="24" column="35" lean-forward="true" selection-start-line="24" selection-start-column="35" selection-end-line="24" selection-end-column="35" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="436">
-          <caret line="24" lean-forward="true" selection-start-line="24" selection-end-line="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" lean-forward="true" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="300">
-          <caret line="34" column="31" lean-forward="true" selection-start-line="34" selection-start-column="31" selection-end-line="34" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="42" column="13" lean-forward="true" selection-start-line="42" selection-start-column="13" selection-end-line="42" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="120" column="72" lean-forward="true" selection-start-line="120" selection-start-column="72" selection-end-line="120" selection-end-column="72" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="293">
-          <caret line="58" column="73" lean-forward="true" selection-start-line="58" selection-start-column="73" selection-end-line="58" selection-end-column="73" />
-          <folding>
-            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
-            <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
-          </folding>
-        </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="307">
-          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
+        <state relative-caret-position="758">
+          <caret line="130" column="5" lean-forward="true" selection-start-line="130" selection-start-column="5" selection-end-line="130" selection-end-column="5" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1170">
-          <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
+        <state relative-caret-position="494">
+          <caret line="86" column="62" lean-forward="true" selection-start-line="86" selection-start-column="62" selection-end-line="86" selection-end-column="62" />
           <folding>
-            <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-            <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+            <element signature="method#getAllDevice#0;class#PgDeviceManager#0" />
+            <element signature="method#getAllDev#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="195" column="28" lean-forward="true" selection-start-line="195" selection-start-column="28" selection-end-line="195" selection-end-column="28" />
+        <state relative-caret-position="166">
+          <caret line="174" column="13" lean-forward="true" selection-start-line="174" selection-start-column="13" selection-end-line="174" selection-end-column="13" />
           <folding>
-            <element signature="method#getAlarmByTypeAndTime#0;class#PgAlarmManager#0" />
-            <element signature="method#getAlarmNum#0;class#PgAlarmManager#0" />
             <element signature="method#getDayAlarmStatistic#0;class#PgAlarmManager#0" />
+            <element signature="method#getAlarmList#0;class#PgAlarmManager#0" />
             <element signature="method#createDTO#0;class#PgAlarmManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="364">
+          <caret line="46" column="56" lean-forward="true" selection-start-line="46" selection-start-column="56" selection-end-line="46" selection-end-column="56" />
+          <folding>
+            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
+            <element signature="method#getPgDev#0;class#PgDeviceRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
+            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+        <state relative-caret-position="396">
+          <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
           <folding>
             <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
             <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -1365,52 +1331,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="239">
-          <caret line="21" column="33" lean-forward="true" selection-start-line="21" selection-start-column="33" selection-end-line="21" selection-end-column="33" />
-        </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="352">
-          <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-        </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="99">
-          <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-          </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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-          <folding>
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-            <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>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
index c436c93..e913155 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
@@ -132,7 +132,10 @@
             this.setAlarmType("");
         else
             this.setAlarmType(pgAlarm.getAlarmTypeId().getAlarmType());
-        this.setAlarmValue(pgAlarm.getAlarmValue());
+        if(pgAlarm.getAlarmValue()==null)
+            this.setAlarmValue("");
+        else
+            this.setAlarmValue(pgAlarm.getAlarmValue());
         if (pgAlarm.getAlarmDate() != null)
             this.setAlarmDate(sdf.format(pgAlarm.getAlarmDate()));
         else
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
index a43965c..565cb41 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -159,11 +159,21 @@
     }
 
     //获取历史报警消息列表
-    public List<PgAlarmDto> getAllAlarm(String alarmType,String startDay,String endDay,String isNew,int page,int rows) {
-        try {
+    public  Map<String, Object> getAllAlarm(String alarmType,String partition,String startDay,String endDay,String isNew,int page,int rows) {
 
+        Map<String, Object> resultMap = new HashMap<>();
+        String msg="";
+
+        try {
             Criteria criteria = createCriteria(PgAlarm.class);
 
+            if (StringUtils.isNotBlank(partition)) {
+                DetachedCriteria inCriteria = DetachedCriteria.forClass(PgDevice.class);
+                inCriteria.add(Restrictions.eq("partition", partition));
+                inCriteria.setProjection(Property.forName("id"));
+                criteria.add(Property.forName("alarmDevId").in(inCriteria));
+            }
+
             if (StringUtils.isNotBlank(alarmType)&&!alarmType.contains("全部")&&pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
                 criteria.add(Restrictions.eq("alarmTypeId", pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)));
 
@@ -190,8 +200,16 @@
             for (PgAlarm pgAlarm : pgAlarmList) {
                 pgAlarmDtoList.add(new PgAlarmDto(pgAlarm));
             }
-
-            return pgAlarmDtoList;
+            if(pgAlarmDtoList==null||pgAlarmDtoList.size()==0) {
+                resultMap.put("msg", "没有报警信息");
+                resultMap.put("code","0");
+            }else {
+                resultMap.put("code","200");
+                resultMap.put("msg", "报警信息获取成功");
+            }
+            resultMap.put("count",pg.getTotalCount());
+            resultMap.put("result",pgAlarmDtoList);
+            return resultMap;
         }
         catch(Exception ex){
             ex.printStackTrace();
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index 7547560..654f49e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -24,11 +24,11 @@
 
         Criteria criteria = createCriteria(PgDevice.class);
 
-        if(road!=null)
+        if(StringUtils.isNotBlank(road))
             criteria.add(Restrictions.eq("road",road));
-        if(partition!=null)
+        if(StringUtils.isNotBlank(partition))
             criteria.add(Restrictions.eq("partition",partition));
-        if(devType!=null)
+        if(StringUtils.isNotBlank(devType))
             criteria.add(Restrictions.eq("devType",devType));
 
         criteria.add(Restrictions.eq("active", 1));
@@ -43,6 +43,29 @@
         return pgDeviceDtoList;
     }
 
+    public List<PgDeviceDto> getAllDev(String road,String partition,String devType) {
+
+        Criteria criteria = createCriteria(PgDevice.class);
+
+        if(StringUtils.isNotBlank(road))
+            criteria.add(Restrictions.eq("road",road));
+        if(StringUtils.isNotBlank(partition))
+            criteria.add(Restrictions.eq("partition",partition));
+        if(StringUtils.isNotBlank(devType))
+            criteria.add(Restrictions.like("devType","%"+devType+"%"));
+
+        criteria.add(Restrictions.eq("active", 1));
+        criteria.addOrder(Order.desc("id"));
+        List<PgDevice> pgDeviceList = criteria.list();
+
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
+        for (PgDevice pgDevice : pgDeviceList) {
+            pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
+        }
+
+        return pgDeviceDtoList;
+    }
+
     //根据名字获取当前设备
     public PgDevice getDeviceByAssetCode(String assetCode) {
         Criteria criteria=createCriteria(PgDevice.class);
@@ -56,9 +79,9 @@
     }
 
     //根据类型获取设备列表
-    public List<PgDeviceDto> getDeviceByDevTypee(String devType) {
+    public List<PgDeviceDto> getDeviceByDevType(String devType) {
         Criteria criteria=createCriteria(PgDevice.class);
-        criteria.add(Restrictions.eq("devType",devType));
+        criteria.add(Restrictions.like("devType","%"+devType+"%"));
 
         List<PgDevice> pgDeviceList=criteria.list();
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
@@ -106,7 +129,7 @@
         criteria.add(Restrictions.eq("partition",partition));
 
         List<PgDevice> pgDeviceList=criteria.list();
-        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<PgDeviceDto>();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
 
         for (PgDevice pgDevice : pgDeviceList) {
             pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
index 3a3bccd..595730e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
@@ -1,10 +1,13 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.devTable.domain.PgAlarmType;
 import com.casic.PgInterface.devTable.domain.PgPartition;
 import com.casic.PgInterface.devTable.domain.PgRoad;
 import com.casic.PgInterface.devTable.domain.PipeGallery;
 import com.casic.PgInterface.devTable.dto.PgPartitionDto;
+import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
@@ -12,7 +15,9 @@
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Created by yxw on 2017/11/4.
@@ -21,7 +26,8 @@
 public class PgPartitionManager extends HibernateEntityDao<PgPartition> {
 
     @Resource
-    PgRoadManager pgRoadManager;
+    private PgRoadManager pgRoadManager;
+
 
     public PgPartition getPartitionByParName(String parName) {
         Criteria criteria = getSession().createCriteria(PgPartition.class);
@@ -99,4 +105,5 @@
         return pgPartitionDtoList;
     }
 
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
index f216360..a6928f1 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
@@ -5,6 +5,7 @@
 public class PgPlanResultRe {
 
     private String taskKey;
+    private List<String> pileAcuList;
     private List<PgPlanResult> pgPlanResultList;
 
     public String getTaskKey() {
@@ -15,6 +16,14 @@
         this.taskKey = taskKey;
     }
 
+    public List<String> getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(List<String> pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+
     public List<PgPlanResult> getPgPlanResultList() {
         return pgPlanResultList;
     }
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
index 71ea765..47eea07 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
@@ -54,9 +54,7 @@
 
         List<PgLineHole> pgLineHoleList=criteria.list();
         List<PgLineHoleDTO> pgLineHoleDTOList=new ArrayList<>();
-        if(pgLineHoleList==null||pgLineHoleList.size()==0)
-            return null;
-        else
+        if(pgLineHoleList!=null&&pgLineHoleList.size()!=0)
             pgLineHoleDTOList=PgLineHoleDTO.ConvertToDTOList(pgLineHoleList,pgPileAcuManager,pgRoadManager);
         return pgLineHoleDTOList;
     }
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
index 0fd9e1f..841a386 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
@@ -1,12 +1,15 @@
 package com.casic.PgInterface.intelPlan.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.devTable.domain.PgPartition;
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
 import com.casic.PgInterface.intelPlan.domain.PgLineHole;
 import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
 import com.casic.PgInterface.intelPlan.domain.PgSection;
 import com.casic.PgInterface.intelPlan.dto.PgPlanResult;
 import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
 import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -22,6 +25,9 @@
     @Resource
     private PgLineHoleManager pgLineHoleManager;
 
+    @Resource
+    private PgRoadManager pgRoadManager;
+
     public PgPileAcu getPgPileAcuByCode(String acuCode){
         List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
 
@@ -58,7 +64,9 @@
         for(PgPlanTask pgPlanTask:pgPlanTaskList){
             List<PgPlanResult> pgPlanResultList=getPgPlanResultByPlantask(pgPlanTask);
             PgPlanResultRe pgPlanResultRe=new PgPlanResultRe();
+
             pgPlanResultRe.setTaskKey(pgPlanTask.getTaskKey());
+            pgPlanResultRe.setPileAcuList(pgPlanTask.getPileAcuList());
             pgPlanResultRe.setPgPlanResultList(pgPlanResultList);
 
             pgPlanResultReList.add(pgPlanResultRe);
@@ -142,4 +150,57 @@
         return length;
     }
 
+    private PgPileAcu getPgPileAcuByAcuCode(String acuCode){
+        List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
+
+        if(pgPileAcuList==null||pgPileAcuList.size()==0)
+            return null;
+        else
+            return pgPileAcuList.get(0);
+    }
+
+    public List<PgAcuTask> getACUTask(String pileAcuList){
+        String[] acuArray=pileAcuList.split(",");
+        List<PgAcuTask> pgAcuTaskList=new ArrayList<>();
+
+        for(String acu:acuArray){
+            PgPileAcu pgPileAcu=this.getPgPileAcuByCode(acu);
+            String roadName=pgRoadManager.get(pgPileAcu.getRoadId()).getRoadName();
+
+            if(!containRoad(roadName,pgAcuTaskList))
+            {
+                PgAcuTask pgAcuTask=new PgAcuTask();
+                pgAcuTask.setRoadName(roadName);
+                pgAcuTask.setPileAcuList(acu);
+                pgAcuTaskList.add(pgAcuTask);
+            }
+            else{
+                PgAcuTask pgAcuTask=getIndexRoad(roadName,pgAcuTaskList);
+                if(pgAcuTask!=null)
+                    pgAcuTask.setPileAcuList(pgAcuTask.getPileAcuList()+","+acu);
+            }
+        }
+
+        return pgAcuTaskList;
+    }
+
+    private boolean containRoad(String roadName,List<PgAcuTask> pgAcuTaskList){
+        if(pgAcuTaskList==null||pgAcuTaskList.size()==0) return false;
+        for(PgAcuTask pgAcuTask:pgAcuTaskList){
+            if(pgAcuTask.getRoadName().equals(roadName))
+                return true;
+        }
+
+        return false;
+    }
+
+    private PgAcuTask getIndexRoad(String roadName, List<PgAcuTask> pgAcuTaskList){
+        for(PgAcuTask pgAcuTask:pgAcuTaskList){
+            if(pgAcuTask.getRoadName().equals(roadName))
+                return pgAcuTask;
+        }
+
+        return null;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java
new file mode 100644
index 0000000..323f7ef
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java
@@ -0,0 +1,25 @@
+package com.casic.PgInterface.reservePlan.dto;
+
+import java.util.List;
+
+public class PgAcuTask {
+
+    private String roadName;//道路
+    private String pileAcuList;//acu分区
+
+    public String getRoadName() {
+        return roadName;
+    }
+
+    public void setRoadName(String roadName) {
+        this.roadName = roadName;
+    }
+
+    public String getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(String pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
index c25e926..c7d7693 100644
--- a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
@@ -70,9 +70,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(Long.valueOf(inPgPersonId));
         PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("hostName",pgInPgPerson.getAssetCode());
-//        PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode());
-//        long maxId = pgTagPositionManager.getMaxId(pgTagMac.getTagMac());
-//        PGTagPosition pgTagPosition = pgTagPositionManager.get(maxId);
+
         PGTagPosition pgTagPosition = tagmacRun.GetTagStatus(pgTagMac);
         boolean bExist = false;
         bExist = pgTagPositionManager.findTagPosition(pgTagPosition.getPositionUpdatetime(),pgTagPosition.getHostId());
@@ -104,8 +102,7 @@
         PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(Long.valueOf(inPgPersonId));
         PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pgInPgPersonId",pgInPgPerson);
         System.out.println("time:"+pgInPgStatus.getInTime());
-//        PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pgInPgPersonId",inPgPersonId);
-//        PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode());
+
         PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("hostName",pgInPgPerson.getAssetCode());
 
         Map<Object,Object> mapPosition = new HashMap<>();
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
index 082ba5d..3eed00a 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
@@ -48,6 +48,7 @@
     public Map<String, Object> linkDevice(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         PgDeviceDto pgDeviceDto = null;
         try {
@@ -62,6 +63,7 @@
                     else {
                         pgDeviceDto = new PgDeviceDto(pgDevice);
                         msg = "报警关联设备获取成功";
+                        code="200";
                     }
                 }
             }
@@ -71,6 +73,7 @@
             e.printStackTrace();
             msg = "获取关联设备失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceDto);
 
@@ -86,6 +89,7 @@
     public Map<String, Object> linkPartitionCamera(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
         try {
@@ -106,6 +110,7 @@
 
                         pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(partition,position);
                         msg = "关联设备获取成功";
+                        code="200";
                     }
                 }
             }
@@ -115,6 +120,7 @@
             e.printStackTrace();
             msg = "分区设备关联失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceDtoList);
         return resultMap;
@@ -129,6 +135,7 @@
     public Map<String, Object> linkReservePlan(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgReservePlanDto> pgReservePlanDtoList=new ArrayList<>();
         try{
@@ -139,10 +146,12 @@
                 else {
                     pgReservePlanDtoList = pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
 
-                    if(pgReservePlanDtoList==null||pgReservePlanDtoList.size()==0)
-                        msg="不存在关联的报警预案";
-                    else
+                    if (pgReservePlanDtoList == null || pgReservePlanDtoList.size() == 0)
+                        msg = "不存在关联的报警预案";
+                    else {
                         msg = "关联预案获取成功";
+                        code="200";
+                    }
                 }
             }
             else
@@ -153,6 +162,7 @@
             e.printStackTrace();
             msg="预案关联失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgReservePlanDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
index 0ddbc4d..0ce886b 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
@@ -41,25 +41,19 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getAlarmList(@FormParam("alarmType") String alarmType,
                                             @FormParam("startDay") String startDay,
+                                            @FormParam("partition") String partition,
                                             @FormParam("endDay") String endDay,
                                             @FormParam("isNew") String isNew,
                                             @FormParam("page") int page,
                                             @FormParam("rows") int rows) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
         try {
-            pgAlarmDtoList = pgAlarmManager.getAllAlarm(alarmType,startDay,endDay,isNew,page,rows);
-            if (pgAlarmDtoList==null||pgAlarmDtoList.size() == 0)
-                msg = "没有报警信息";
-            else
-                msg = "报警信息获取成功";
+            resultMap = pgAlarmManager.getAllAlarm(alarmType,partition,startDay,endDay,isNew,page,rows);
+
         } catch (Exception e) {
             e.printStackTrace();
-            msg = "报警信息获取失败";
         }
-        resultMap.put("msg", msg);
-        resultMap.put("result", pgAlarmDtoList);
         return resultMap;
     }
 
@@ -71,9 +65,10 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> clearAlarmList(@FormParam("id") String id) throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        String result = "false";
+        String result = "";
+        String code="0";
 
         try {
             PgAlarm pgAlarm = new PgAlarm();
@@ -86,12 +81,14 @@
                 pgAlarmManager.save(pgAlarm);
                 msg = "报警信息清除成功";
                 result = "true";
+                code = "200";
             }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警信息清除失败";
             result = "false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
@@ -106,21 +103,26 @@
     public Map<String, Object> getAlarmByTypeOrTime(@FormParam("alarmType") String alarmType,
                                                     @FormParam("startTime") String startTime,
                                                     @FormParam("endTime") String endTime) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
-        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<PgAlarmDto>();
+        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
         try {
             pgAlarmDtoList = pgAlarmManager.getAlarmByTypeAndTime(alarmType, startTime, endTime);
             if (pgAlarmDtoList == null || pgAlarmDtoList.size() == 0)
                 msg = "报警信息不存在";
             else
+            {
                 msg = "报警信息获取成功";
+                code="200";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警信息获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
index 29ce8a4..ed0bf34 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
@@ -39,8 +39,8 @@
     public Map<String, Object> getAlarmRule(@FormParam("devType") String devType) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
-        System.out.println("devType:"+devType);
         List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<>();
         try {
             pgAlarmRuleDtoList = pgAlarmRuleManager.getAlarmRuleDto(devType);
@@ -52,6 +52,7 @@
             e.printStackTrace();
             msg = "报警阈值信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmRuleDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
index 24ab894..abef1b1 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
@@ -39,16 +39,21 @@
                                                      @FormParam("endDate") String endDate)throws Exception{
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
+
         List<PgAlarmTjDto> pgAlarmTjDtoList=null;
         try{
             pgAlarmTjDtoList=pgAlarmTjManager.getAlarmTjResultByType(startDate,endDate);
             msg="获取成功";
+            code="200";
         }
         catch(Exception ex) {
             msg = "统计失败";
         }
-        resultMap.put("result",pgAlarmTjDtoList);
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
+        resultMap.put("result",pgAlarmTjDtoList);
+
         return resultMap;
     }
 
@@ -61,23 +66,27 @@
     public Map<String, Object> getAlarmByTime(@FormParam("startTime") String startTime,
                                               @FormParam("endTime") String endTime,
                                               @FormParam("statisticType") String statisticType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code = "0";
 
-        List<PgAlarmTjDto> pgAlarmTjDtoList = new ArrayList<PgAlarmTjDto>();
+        List<PgAlarmTjDto> pgAlarmTjDtoList = new ArrayList<>();
         try {
             pgAlarmTjDtoList = pgAlarmTjManager.getAlarmByTime(startTime, endTime, statisticType);
             if(pgAlarmTjDtoList==null)
                 msg="报警统计信息获取失败";
-            else
-                msg="报警统计信息获取成功";
+            else {
+                msg = "报警统计信息获取成功";
+                code="200";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警统计信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmTjDtoList);
         return resultMap;
     }
 
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
index 28bc811..b6278a9 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
@@ -30,7 +30,6 @@
     @Resource
     private PgAlarmTypeManager pgAlarmTypeManager;
 
-
     /**
      * 获取报警类型
      */
@@ -38,19 +37,24 @@
     @Path("getAlarmType")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getAlarmTypeList()throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
-        List<PgAlarmTypeDto> pgAlarmTypeDtoList=new ArrayList<PgAlarmTypeDto>();
+        String code="";
+
+        List<PgAlarmTypeDto> pgAlarmTypeDtoList=new ArrayList<>();
         try {
             pgAlarmTypeDtoList = pgAlarmTypeManager.getAllAlarmTypeDto();
             if(pgAlarmTypeDtoList.size()==0)
                 msg="没有报警类型信息";
-            else
-                msg="报警类型信息获取成功";
+            else {
+                code="200";
+                msg = "报警类型信息获取成功";
+            }
         }catch(Exception e){
             e.printStackTrace();
             msg="报警类型信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAlarmTypeDtoList);
         return resultMap;
@@ -66,6 +70,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
@@ -83,6 +88,7 @@
                 logger.info("成功保存");
                 result = "true";
                 msg = "保存成功";
+                code="200";
             }
         } catch (Exception e) {
             result = "false";
@@ -90,6 +96,7 @@
             e.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -106,6 +113,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try{
             if(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
@@ -119,6 +127,7 @@
                 pgAlarmTypeManager.save(pgAlarmType);
                 result = "true";
                 msg = "编辑成功";
+                code="200";
             }
         }
         catch(Exception e)
@@ -128,6 +137,7 @@
             e.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("result",result);
         resultMap.put("msg",msg);
 
@@ -146,6 +156,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
         String result="false";
+        String code="0";
 
         try {
             PgAlarmType pgAlarmType=pgAlarmTypeManager.get(Long.valueOf(id));
@@ -157,6 +168,7 @@
             {
                 pgAlarmType.setActive(0);
                 pgAlarmTypeManager.save(pgAlarmType);
+                code="200";
                 msg="报警类型删除成功";
                 result="true";
             }
@@ -165,6 +177,7 @@
             msg="报警类型删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 25ded8a..283d7ab 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,20 +7,56 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" 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/construction/manager/PgCsDocumentManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/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/manager/PgAlarmManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/~$说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/~$说明20191207.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.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$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/接口说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明20191207.docx" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
@@ -51,7 +87,7 @@
         <counts>
           <entry key="class" value="4" />
           <entry key="iml" value="2" />
-          <entry key="java" value="707" />
+          <entry key="java" value="820" />
           <entry key="properties" value="14" />
           <entry key="xml" value="7" />
         </counts>
@@ -60,7 +96,7 @@
         <counts>
           <entry key="CLASS" value="4" />
           <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="707" />
+          <entry key="JAVA" value="820" />
           <entry key="Properties" value="14" />
           <entry key="XML" value="7" />
         </counts>
@@ -68,32 +104,32 @@
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
           <entry key="dummy" value="38" />
-          <entry key="java" value="30161" />
+          <entry key="java" value="40859" />
           <entry key="properties" value="100" />
-          <entry key="txt" value="176" />
+          <entry key="txt" value="186" />
           <entry key="xml" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="30161" />
-          <entry key="PLAIN_TEXT" value="214" />
+          <entry key="JAVA" value="40859" />
+          <entry key="PLAIN_TEXT" value="224" />
           <entry key="Properties" value="100" />
           <entry key="XML" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="48" />
+          <entry key="project.closed" value="51" />
           <entry key="project.open.time.1" value="5" />
           <entry key="project.open.time.12" value="2" />
           <entry key="project.open.time.13" value="1" />
           <entry key="project.open.time.15" value="1" />
           <entry key="project.open.time.16" value="1" />
           <entry key="project.open.time.17" value="1" />
-          <entry key="project.open.time.2" value="1" />
+          <entry key="project.open.time.2" value="2" />
           <entry key="project.open.time.20" value="1" />
-          <entry key="project.open.time.23" value="1" />
+          <entry key="project.open.time.23" value="2" />
           <entry key="project.open.time.24" value="2" />
           <entry key="project.open.time.251" value="1" />
           <entry key="project.open.time.27" value="2" />
@@ -106,8 +142,8 @@
           <entry key="project.open.time.36" value="1" />
           <entry key="project.open.time.37" value="1" />
           <entry key="project.open.time.39" value="2" />
-          <entry key="project.open.time.4" value="2" />
-          <entry key="project.open.time.40" value="1" />
+          <entry key="project.open.time.4" value="3" />
+          <entry key="project.open.time.40" value="2" />
           <entry key="project.open.time.41" value="2" />
           <entry key="project.open.time.42" value="2" />
           <entry key="project.open.time.43" value="2" />
@@ -122,23 +158,25 @@
           <entry key="project.open.time.6" value="3" />
           <entry key="project.open.time.63" value="2" />
           <entry key="project.open.time.64" value="1" />
+          <entry key="project.open.time.66" value="1" />
           <entry key="project.open.time.71" value="2" />
+          <entry key="project.open.time.74" value="1" />
           <entry key="project.open.time.76" value="1" />
           <entry key="project.open.time.8" value="2" />
           <entry key="project.open.time.9" value="1" />
           <entry key="project.open.time.97" value="1" />
-          <entry key="project.opened" value="78" />
+          <entry key="project.opened" value="84" />
         </counts>
       </usages-collector>
     </session>
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+            <state relative-caret-position="396">
+              <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
               <folding>
                 <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
                 <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -147,73 +185,6 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <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="99">
-              <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-              <folding>
-                <element signature="imports" expanded="true" />
-                <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-1170">
-              <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state>
-              <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
-              <folding>
-                <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-                <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="true">
-        <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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-              <folding>
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-                <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>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <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="352">
-              <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -225,18 +196,9 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>inCriteria</find>
-      <find>getPgPlanResulList</find>
-      <find>getPileAcuListByPileAcuStr</find>
-      <find>distinct</find>
-      <find>order</find>
-      <find>canPlanLine</find>
-      <find>isExistLine</find>
-      <find>getPlanResult</find>
       <find>pgPipeLine</find>
       <find>getPipeLineBylineName</find>
       <find>StringU</find>
-      <find>getAllAlarm</find>
       <find>getAlarmList</find>
       <find>getPgInPersonListByDay</find>
       <find>getDayInPgStatistic</find>
@@ -254,7 +216,16 @@
       <find>getPgContructionByNameOrType</find>
       <find>&quot;&quot;,&quot;&quot;,</find>
       <find>getPgContructionDtoByNameOrType</find>
+      <find>addConstruction</find>
+      <find>getPgLineAcuHole</find>
+      <find>getPlanResult</find>
       <find>getConstruction</find>
+      <find>addPipeLine</find>
+      <find>未找到入廊数据</find>
+      <find>getCurrentHoleByAcu</find>
+      <find>getAllAlarm</find>
+      <find>getPgDeviceDtoListByPartition</find>
+      <find>getPgDeviceByDevType</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -263,57 +234,57 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlan.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileHoleManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/planData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/PlanData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
       </list>
     </option>
   </component>
@@ -359,7 +330,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -421,53 +391,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="dto" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="manager" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -479,29 +402,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="rs" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -516,6 +416,7 @@
         </subPane>
       </pane>
       <pane id="Scope" />
+      <pane id="PackagesPane" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -710,7 +611,13 @@
       <workItem from="1574902733573" duration="1829000" />
       <workItem from="1574998240004" duration="7016000" />
       <workItem from="1575247959683" duration="6997000" />
-      <workItem from="1575704345590" duration="40473000" />
+      <workItem from="1575704345590" duration="69381000" />
+      <workItem from="1575869479666" duration="721000" />
+      <workItem from="1575947104878" duration="6101000" />
+      <workItem from="1576128264436" duration="3347000" />
+      <workItem from="1576208571543" duration="22000" />
+      <workItem from="1576227513917" duration="862000" />
+      <workItem from="1576293721220" duration="18246000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -817,11 +724,18 @@
       <option name="project" value="LOCAL" />
       <updated>1575775489149</updated>
     </task>
-    <option name="localTasksCounter" value="16" />
+    <task id="LOCAL-00016" summary="整改施工信息">
+      <created>1575791780774</created>
+      <option name="number" value="00016" />
+      <option name="presentableId" value="LOCAL-00016" />
+      <option name="project" value="LOCAL" />
+      <updated>1575791780774</updated>
+    </task>
+    <option name="localTasksCounter" value="17" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="452131000" />
+    <option name="totallyTimeSpent" value="510338000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -834,9 +748,8 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
-    <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.24205749" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2647504" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -847,7 +760,7 @@
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.3295082" />
       <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.4819672" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.65737706" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.3295082" />
@@ -939,7 +852,8 @@
     <MESSAGE value="重新设计智能规划部分" />
     <MESSAGE value="完成智能规划对接" />
     <MESSAGE value="修改报警统计" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改报警统计" />
+    <MESSAGE value="整改施工信息" />
+    <option name="LAST_COMMIT_MESSAGE" value="整改施工信息" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -951,16 +865,10 @@
           <option name="timeStamp" value="3" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java</url>
-          <line>69</line>
+          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java</url>
+          <line>40</line>
           <properties />
-          <option name="timeStamp" value="21" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java</url>
-          <line>96</line>
-          <properties />
-          <option name="timeStamp" value="38" />
+          <option name="timeStamp" value="122" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
@@ -970,394 +878,452 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <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="2068">
-          <caret line="154" column="35" selection-start-line="154" selection-start-column="35" selection-end-line="154" selection-end-column="35" />
-        </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="3300">
-          <caret line="297" column="22" selection-start-line="297" selection-start-column="22" selection-end-line="297" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/StringUtils.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
-          <caret line="13" column="48" lean-forward="true" selection-start-line="13" selection-start-column="48" selection-end-line="13" selection-end-column="48" />
+          <caret line="11" column="5" selection-start-line="11" selection-start-column="5" selection-end-line="11" selection-end-column="5" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="78" lean-forward="true" selection-start-line="78" selection-end-line="78" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="616">
-          <caret line="41" column="1" selection-start-line="41" selection-start-column="1" selection-end-line="41" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="110">
-          <caret line="12" column="23" selection-start-line="12" selection-start-column="23" selection-end-line="12" selection-end-column="23" />
+        <state relative-caret-position="516">
+          <caret line="114" column="12" selection-start-line="114" selection-start-column="12" selection-end-line="114" selection-end-column="12" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="164">
-          <caret line="56" lean-forward="true" selection-start-line="56" selection-end-line="56" />
+        <state relative-caret-position="418">
+          <caret line="33" column="44" selection-start-line="33" selection-start-column="44" selection-end-line="33" selection-end-column="44" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="258">
-          <caret line="27" column="12" lean-forward="true" selection-start-line="27" selection-start-column="12" selection-end-line="27" selection-end-column="12" />
+        <state relative-caret-position="132">
+          <caret line="11" column="20" lean-forward="true" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="20" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.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="-12">
-          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        <state relative-caret-position="516">
+          <caret line="142" column="54" selection-start-line="142" selection-start-column="54" selection-end-line="142" selection-end-column="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="858">
-          <caret line="55" column="27" lean-forward="true" selection-start-line="55" selection-start-column="27" selection-end-line="55" selection-end-column="27" />
+        <state relative-caret-position="66">
+          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="58">
+          <caret line="18" column="28" selection-start-line="18" selection-start-column="19" selection-end-line="18" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="305">
+          <caret line="24" column="31" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="714">
+          <caret line="58" column="5" lean-forward="true" selection-start-line="58" selection-start-column="5" selection-end-line="58" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="924">
+          <caret line="134" column="92" selection-start-line="134" selection-start-column="92" selection-end-line="134" selection-end-column="92" />
+          <folding>
+            <element signature="method#linkDevice#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkPartitionCamera#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkReservePlan#0;class#PgAlarmLinkRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1066">
+          <caret line="90" lean-forward="true" selection-start-line="90" selection-end-line="90" />
+          <folding>
+            <element signature="method#getTjResultByAlarmType#0;class#PgAlarmTjRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="946">
+          <caret line="148" column="11" lean-forward="true" selection-start-line="148" selection-start-column="11" selection-end-line="148" selection-end-column="11" />
+          <folding>
+            <element signature="method#getAlarmTypeList#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#addAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#editAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#deleteAlarmType#0;class#PgAlarmTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="208">
+          <caret line="46" column="23" lean-forward="true" selection-start-line="46" selection-start-column="23" selection-end-line="46" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="113" column="9" lean-forward="true" selection-start-line="113" selection-start-column="9" selection-end-line="113" selection-end-column="9" />
+          <folding>
+            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
+            <element signature="method#getNewestCh4InfoByDev#0;class#PgCh4Rs#0" />
+            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="145" column="6" lean-forward="true" selection-start-line="145" selection-start-column="6" selection-end-line="145" selection-end-column="6" />
+          <folding>
+            <element signature="method#addAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#editAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#deleteAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#getAuthorityList#0;class#PgAuthorityRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="58" column="1" lean-forward="true" selection-start-line="58" selection-start-column="1" selection-end-line="58" selection-end-column="1" />
+          <folding>
+            <element signature="method#getPgAssetPlanList#0;class#PgAssetPlanRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="370">
+          <caret line="371" column="66" selection-start-line="371" selection-start-column="66" selection-end-line="371" selection-end-column="66" />
+          <folding>
+            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#searchConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionDev#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="139" column="13" lean-forward="true" selection-start-line="139" selection-start-column="13" selection-end-line="139" selection-end-column="13" />
+          <folding>
+            <element signature="method#getCoInfoByDevAndDate#0;class#PgCoRs#0" />
+            <element signature="method#getNewestCoInfoByDev#0;class#PgCoRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="540">
+          <caret line="223" column="5" lean-forward="true" selection-start-line="223" selection-start-column="5" selection-end-line="223" selection-end-column="5" />
+          <folding>
+            <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="682">
+          <caret line="100" lean-forward="true" selection-start-line="100" selection-end-line="100" />
+          <folding>
+            <element signature="method#getDeviceTpeyList#0;class#PgDeviceTypeRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="377">
+          <caret line="225" column="35" selection-start-line="225" selection-start-column="35" selection-end-line="225" selection-end-column="35" />
+          <folding>
+            <element signature="method#addEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#addEquipment#1;class#PgEquipmentRs#0" />
+            <element signature="method#getEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#deleteEquipment#0;class#PgEquipmentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="406">
+          <caret line="109" lean-forward="true" selection-start-line="109" selection-end-line="109" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="154">
+          <caret line="28" column="19" selection-start-line="28" selection-start-column="19" selection-end-line="28" selection-end-column="19" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="748">
-          <caret line="49" column="5" lean-forward="true" selection-start-line="49" selection-start-column="5" selection-end-line="49" selection-end-column="5" />
+        <state relative-caret-position="296">
+          <caret line="161" column="35" selection-start-line="161" selection-start-column="35" selection-end-line="161" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="384">
+          <caret line="99" column="5" lean-forward="true" selection-start-line="99" selection-start-column="5" selection-end-line="99" selection-end-column="5" />
+        </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="362">
+          <caret line="340" column="35" selection-start-line="340" selection-start-column="35" selection-end-line="340" selection-end-column="35" />
+          <folding>
+            <element signature="method#addInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPersonInPg#0;class#PgInPgPersonRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-606">
+          <caret line="76" column="20" lean-forward="true" selection-start-line="76" selection-start-column="20" selection-end-line="76" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="65" column="35" selection-start-line="65" selection-start-column="35" selection-end-line="65" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="101" column="35" selection-start-line="101" selection-start-column="35" selection-end-line="101" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="84" column="35" selection-start-line="84" selection-start-column="35" selection-end-line="84" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="59" lean-forward="true" selection-start-line="59" selection-end-line="59" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="60" column="1" lean-forward="true" selection-start-line="60" selection-start-column="1" selection-end-line="60" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="145" column="35" selection-start-line="145" selection-start-column="35" selection-end-line="145" selection-end-column="35" />
+        </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="274">
+          <caret line="350" column="35" selection-start-line="350" selection-start-column="35" selection-end-line="350" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="121" column="39" selection-start-line="121" selection-start-column="39" selection-end-line="121" selection-end-column="39" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="28" column="8" lean-forward="true" selection-start-line="28" selection-start-column="8" selection-end-line="28" selection-end-column="8" />
+        <state relative-caret-position="340">
+          <caret line="103" selection-start-line="103" selection-end-line="103" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="226" column="35" selection-start-line="226" selection-start-column="35" selection-end-line="226" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="203" column="35" selection-start-line="203" selection-start-column="35" selection-end-line="203" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="241" column="35" selection-start-line="241" selection-start-column="35" selection-end-line="241" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="225" column="1" lean-forward="true" selection-start-line="225" selection-start-column="1" selection-end-line="225" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="176" column="5" lean-forward="true" selection-start-line="176" selection-start-column="5" selection-end-line="176" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="178" column="35" lean-forward="true" selection-start-line="178" selection-start-column="35" selection-end-line="178" selection-end-column="35" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="516">
-          <caret line="94" column="53" selection-start-line="94" selection-start-column="53" selection-end-line="94" selection-end-column="53" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="814">
-          <caret line="52" column="9" lean-forward="true" selection-start-line="52" selection-start-column="9" selection-end-line="52" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="182">
-          <caret line="58" column="12" lean-forward="true" selection-start-line="58" selection-start-column="12" selection-end-line="58" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="34" lean-forward="true" selection-start-line="34" selection-end-line="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="32" lean-forward="true" selection-start-line="32" selection-end-line="32" />
-          <folding>
-            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
-            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="185">
-          <caret line="63" column="13" selection-start-line="63" selection-start-column="13" selection-end-line="63" selection-end-column="13" />
-          <folding>
-            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
-            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
-            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="e#6319#6324#0" />
-            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
-          </folding>
+          <caret line="240" lean-forward="true" selection-start-line="240" selection-end-line="240" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
-          <caret line="58" column="28" lean-forward="true" selection-start-line="58" selection-start-column="28" selection-end-line="58" selection-end-column="28" />
-          <folding>
-            <element signature="method#addTempHumData#0;class#PgTempHumRs#0" />
-          </folding>
+        <state relative-caret-position="340">
+          <caret line="148" column="34" selection-start-line="148" selection-start-column="34" selection-end-line="148" selection-end-column="34" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
+        <state relative-caret-position="458">
+          <caret line="99" column="35" selection-start-line="99" selection-start-column="35" selection-end-line="99" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+        <state relative-caret-position="384">
+          <caret line="145" column="32" lean-forward="true" selection-start-line="145" selection-start-column="32" selection-end-line="145" selection-end-column="32" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="414">
-          <caret line="22" column="46" lean-forward="true" selection-start-line="22" selection-start-column="46" selection-end-line="22" selection-end-column="46" />
-        </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="396">
-          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" column="83" selection-start-line="11" selection-start-column="83" selection-end-line="11" selection-end-column="83" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="26">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
-          <folding>
-            <element signature="method#getPgInPgStatusByPerson#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNumByName#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNum#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPersonListByDay#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPgStatusByPgInPgPerson#0;class#PgInPgStatusManager#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="44">
-          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-12">
-          <caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="87" lean-forward="true" selection-start-line="87" selection-end-line="87" />
-          <folding>
-            <element signature="method#getConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#addConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#deleteConstructionType#0;class#PgConstructionTypeRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
-          <folding>
-            <element signature="method#getConstructionTypeByType#0;class#PgConstructionTypeManager#0" />
-            <element signature="method#getAllConstructionTypeDto#0;class#PgConstructionTypeManager#0" />
-          </folding>
-        </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="145">
-          <caret line="258" column="9" lean-forward="true" selection-start-line="258" selection-start-column="9" selection-end-line="258" selection-end-column="9" />
-          <folding>
-            <element signature="method#getMonthInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayInPgStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgOverViewRs#0" />
-            <element signature="method#getAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getMonthAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayAlarmStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgOverViewRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="103">
-          <caret line="105" column="50" lean-forward="true" selection-start-line="105" selection-start-column="50" selection-end-line="105" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateBasicDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="99">
-          <caret line="125" selection-start-line="125" selection-end-line="125" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="190">
-          <caret line="24" column="35" lean-forward="true" selection-start-line="24" selection-start-column="35" selection-end-line="24" selection-end-column="35" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="436">
-          <caret line="24" lean-forward="true" selection-start-line="24" selection-end-line="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" lean-forward="true" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="300">
-          <caret line="34" column="31" lean-forward="true" selection-start-line="34" selection-start-column="31" selection-end-line="34" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="42" column="13" lean-forward="true" selection-start-line="42" selection-start-column="13" selection-end-line="42" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="120" column="72" lean-forward="true" selection-start-line="120" selection-start-column="72" selection-end-line="120" selection-end-column="72" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="293">
-          <caret line="58" column="73" lean-forward="true" selection-start-line="58" selection-start-column="73" selection-end-line="58" selection-end-column="73" />
-          <folding>
-            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
-            <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
-          </folding>
-        </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="307">
-          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
+        <state relative-caret-position="758">
+          <caret line="130" column="5" lean-forward="true" selection-start-line="130" selection-start-column="5" selection-end-line="130" selection-end-column="5" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1170">
-          <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
+        <state relative-caret-position="494">
+          <caret line="86" column="62" lean-forward="true" selection-start-line="86" selection-start-column="62" selection-end-line="86" selection-end-column="62" />
           <folding>
-            <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-            <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+            <element signature="method#getAllDevice#0;class#PgDeviceManager#0" />
+            <element signature="method#getAllDev#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="195" column="28" lean-forward="true" selection-start-line="195" selection-start-column="28" selection-end-line="195" selection-end-column="28" />
+        <state relative-caret-position="166">
+          <caret line="174" column="13" lean-forward="true" selection-start-line="174" selection-start-column="13" selection-end-line="174" selection-end-column="13" />
           <folding>
-            <element signature="method#getAlarmByTypeAndTime#0;class#PgAlarmManager#0" />
-            <element signature="method#getAlarmNum#0;class#PgAlarmManager#0" />
             <element signature="method#getDayAlarmStatistic#0;class#PgAlarmManager#0" />
+            <element signature="method#getAlarmList#0;class#PgAlarmManager#0" />
             <element signature="method#createDTO#0;class#PgAlarmManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="364">
+          <caret line="46" column="56" lean-forward="true" selection-start-line="46" selection-start-column="56" selection-end-line="46" selection-end-column="56" />
+          <folding>
+            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
+            <element signature="method#getPgDev#0;class#PgDeviceRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
+            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+        <state relative-caret-position="396">
+          <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
           <folding>
             <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
             <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -1365,52 +1331,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="239">
-          <caret line="21" column="33" lean-forward="true" selection-start-line="21" selection-start-column="33" selection-end-line="21" selection-end-column="33" />
-        </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="352">
-          <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-        </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="99">
-          <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-          </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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-          <folding>
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-            <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>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
index c436c93..e913155 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
@@ -132,7 +132,10 @@
             this.setAlarmType("");
         else
             this.setAlarmType(pgAlarm.getAlarmTypeId().getAlarmType());
-        this.setAlarmValue(pgAlarm.getAlarmValue());
+        if(pgAlarm.getAlarmValue()==null)
+            this.setAlarmValue("");
+        else
+            this.setAlarmValue(pgAlarm.getAlarmValue());
         if (pgAlarm.getAlarmDate() != null)
             this.setAlarmDate(sdf.format(pgAlarm.getAlarmDate()));
         else
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
index a43965c..565cb41 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -159,11 +159,21 @@
     }
 
     //获取历史报警消息列表
-    public List<PgAlarmDto> getAllAlarm(String alarmType,String startDay,String endDay,String isNew,int page,int rows) {
-        try {
+    public  Map<String, Object> getAllAlarm(String alarmType,String partition,String startDay,String endDay,String isNew,int page,int rows) {
 
+        Map<String, Object> resultMap = new HashMap<>();
+        String msg="";
+
+        try {
             Criteria criteria = createCriteria(PgAlarm.class);
 
+            if (StringUtils.isNotBlank(partition)) {
+                DetachedCriteria inCriteria = DetachedCriteria.forClass(PgDevice.class);
+                inCriteria.add(Restrictions.eq("partition", partition));
+                inCriteria.setProjection(Property.forName("id"));
+                criteria.add(Property.forName("alarmDevId").in(inCriteria));
+            }
+
             if (StringUtils.isNotBlank(alarmType)&&!alarmType.contains("全部")&&pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
                 criteria.add(Restrictions.eq("alarmTypeId", pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)));
 
@@ -190,8 +200,16 @@
             for (PgAlarm pgAlarm : pgAlarmList) {
                 pgAlarmDtoList.add(new PgAlarmDto(pgAlarm));
             }
-
-            return pgAlarmDtoList;
+            if(pgAlarmDtoList==null||pgAlarmDtoList.size()==0) {
+                resultMap.put("msg", "没有报警信息");
+                resultMap.put("code","0");
+            }else {
+                resultMap.put("code","200");
+                resultMap.put("msg", "报警信息获取成功");
+            }
+            resultMap.put("count",pg.getTotalCount());
+            resultMap.put("result",pgAlarmDtoList);
+            return resultMap;
         }
         catch(Exception ex){
             ex.printStackTrace();
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index 7547560..654f49e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -24,11 +24,11 @@
 
         Criteria criteria = createCriteria(PgDevice.class);
 
-        if(road!=null)
+        if(StringUtils.isNotBlank(road))
             criteria.add(Restrictions.eq("road",road));
-        if(partition!=null)
+        if(StringUtils.isNotBlank(partition))
             criteria.add(Restrictions.eq("partition",partition));
-        if(devType!=null)
+        if(StringUtils.isNotBlank(devType))
             criteria.add(Restrictions.eq("devType",devType));
 
         criteria.add(Restrictions.eq("active", 1));
@@ -43,6 +43,29 @@
         return pgDeviceDtoList;
     }
 
+    public List<PgDeviceDto> getAllDev(String road,String partition,String devType) {
+
+        Criteria criteria = createCriteria(PgDevice.class);
+
+        if(StringUtils.isNotBlank(road))
+            criteria.add(Restrictions.eq("road",road));
+        if(StringUtils.isNotBlank(partition))
+            criteria.add(Restrictions.eq("partition",partition));
+        if(StringUtils.isNotBlank(devType))
+            criteria.add(Restrictions.like("devType","%"+devType+"%"));
+
+        criteria.add(Restrictions.eq("active", 1));
+        criteria.addOrder(Order.desc("id"));
+        List<PgDevice> pgDeviceList = criteria.list();
+
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
+        for (PgDevice pgDevice : pgDeviceList) {
+            pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
+        }
+
+        return pgDeviceDtoList;
+    }
+
     //根据名字获取当前设备
     public PgDevice getDeviceByAssetCode(String assetCode) {
         Criteria criteria=createCriteria(PgDevice.class);
@@ -56,9 +79,9 @@
     }
 
     //根据类型获取设备列表
-    public List<PgDeviceDto> getDeviceByDevTypee(String devType) {
+    public List<PgDeviceDto> getDeviceByDevType(String devType) {
         Criteria criteria=createCriteria(PgDevice.class);
-        criteria.add(Restrictions.eq("devType",devType));
+        criteria.add(Restrictions.like("devType","%"+devType+"%"));
 
         List<PgDevice> pgDeviceList=criteria.list();
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
@@ -106,7 +129,7 @@
         criteria.add(Restrictions.eq("partition",partition));
 
         List<PgDevice> pgDeviceList=criteria.list();
-        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<PgDeviceDto>();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
 
         for (PgDevice pgDevice : pgDeviceList) {
             pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
index 3a3bccd..595730e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
@@ -1,10 +1,13 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.devTable.domain.PgAlarmType;
 import com.casic.PgInterface.devTable.domain.PgPartition;
 import com.casic.PgInterface.devTable.domain.PgRoad;
 import com.casic.PgInterface.devTable.domain.PipeGallery;
 import com.casic.PgInterface.devTable.dto.PgPartitionDto;
+import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
@@ -12,7 +15,9 @@
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Created by yxw on 2017/11/4.
@@ -21,7 +26,8 @@
 public class PgPartitionManager extends HibernateEntityDao<PgPartition> {
 
     @Resource
-    PgRoadManager pgRoadManager;
+    private PgRoadManager pgRoadManager;
+
 
     public PgPartition getPartitionByParName(String parName) {
         Criteria criteria = getSession().createCriteria(PgPartition.class);
@@ -99,4 +105,5 @@
         return pgPartitionDtoList;
     }
 
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
index f216360..a6928f1 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
@@ -5,6 +5,7 @@
 public class PgPlanResultRe {
 
     private String taskKey;
+    private List<String> pileAcuList;
     private List<PgPlanResult> pgPlanResultList;
 
     public String getTaskKey() {
@@ -15,6 +16,14 @@
         this.taskKey = taskKey;
     }
 
+    public List<String> getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(List<String> pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+
     public List<PgPlanResult> getPgPlanResultList() {
         return pgPlanResultList;
     }
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
index 71ea765..47eea07 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
@@ -54,9 +54,7 @@
 
         List<PgLineHole> pgLineHoleList=criteria.list();
         List<PgLineHoleDTO> pgLineHoleDTOList=new ArrayList<>();
-        if(pgLineHoleList==null||pgLineHoleList.size()==0)
-            return null;
-        else
+        if(pgLineHoleList!=null&&pgLineHoleList.size()!=0)
             pgLineHoleDTOList=PgLineHoleDTO.ConvertToDTOList(pgLineHoleList,pgPileAcuManager,pgRoadManager);
         return pgLineHoleDTOList;
     }
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
index 0fd9e1f..841a386 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
@@ -1,12 +1,15 @@
 package com.casic.PgInterface.intelPlan.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.devTable.domain.PgPartition;
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
 import com.casic.PgInterface.intelPlan.domain.PgLineHole;
 import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
 import com.casic.PgInterface.intelPlan.domain.PgSection;
 import com.casic.PgInterface.intelPlan.dto.PgPlanResult;
 import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
 import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -22,6 +25,9 @@
     @Resource
     private PgLineHoleManager pgLineHoleManager;
 
+    @Resource
+    private PgRoadManager pgRoadManager;
+
     public PgPileAcu getPgPileAcuByCode(String acuCode){
         List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
 
@@ -58,7 +64,9 @@
         for(PgPlanTask pgPlanTask:pgPlanTaskList){
             List<PgPlanResult> pgPlanResultList=getPgPlanResultByPlantask(pgPlanTask);
             PgPlanResultRe pgPlanResultRe=new PgPlanResultRe();
+
             pgPlanResultRe.setTaskKey(pgPlanTask.getTaskKey());
+            pgPlanResultRe.setPileAcuList(pgPlanTask.getPileAcuList());
             pgPlanResultRe.setPgPlanResultList(pgPlanResultList);
 
             pgPlanResultReList.add(pgPlanResultRe);
@@ -142,4 +150,57 @@
         return length;
     }
 
+    private PgPileAcu getPgPileAcuByAcuCode(String acuCode){
+        List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
+
+        if(pgPileAcuList==null||pgPileAcuList.size()==0)
+            return null;
+        else
+            return pgPileAcuList.get(0);
+    }
+
+    public List<PgAcuTask> getACUTask(String pileAcuList){
+        String[] acuArray=pileAcuList.split(",");
+        List<PgAcuTask> pgAcuTaskList=new ArrayList<>();
+
+        for(String acu:acuArray){
+            PgPileAcu pgPileAcu=this.getPgPileAcuByCode(acu);
+            String roadName=pgRoadManager.get(pgPileAcu.getRoadId()).getRoadName();
+
+            if(!containRoad(roadName,pgAcuTaskList))
+            {
+                PgAcuTask pgAcuTask=new PgAcuTask();
+                pgAcuTask.setRoadName(roadName);
+                pgAcuTask.setPileAcuList(acu);
+                pgAcuTaskList.add(pgAcuTask);
+            }
+            else{
+                PgAcuTask pgAcuTask=getIndexRoad(roadName,pgAcuTaskList);
+                if(pgAcuTask!=null)
+                    pgAcuTask.setPileAcuList(pgAcuTask.getPileAcuList()+","+acu);
+            }
+        }
+
+        return pgAcuTaskList;
+    }
+
+    private boolean containRoad(String roadName,List<PgAcuTask> pgAcuTaskList){
+        if(pgAcuTaskList==null||pgAcuTaskList.size()==0) return false;
+        for(PgAcuTask pgAcuTask:pgAcuTaskList){
+            if(pgAcuTask.getRoadName().equals(roadName))
+                return true;
+        }
+
+        return false;
+    }
+
+    private PgAcuTask getIndexRoad(String roadName, List<PgAcuTask> pgAcuTaskList){
+        for(PgAcuTask pgAcuTask:pgAcuTaskList){
+            if(pgAcuTask.getRoadName().equals(roadName))
+                return pgAcuTask;
+        }
+
+        return null;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java
new file mode 100644
index 0000000..323f7ef
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java
@@ -0,0 +1,25 @@
+package com.casic.PgInterface.reservePlan.dto;
+
+import java.util.List;
+
+public class PgAcuTask {
+
+    private String roadName;//道路
+    private String pileAcuList;//acu分区
+
+    public String getRoadName() {
+        return roadName;
+    }
+
+    public void setRoadName(String roadName) {
+        this.roadName = roadName;
+    }
+
+    public String getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(String pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
index c25e926..c7d7693 100644
--- a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
@@ -70,9 +70,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(Long.valueOf(inPgPersonId));
         PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("hostName",pgInPgPerson.getAssetCode());
-//        PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode());
-//        long maxId = pgTagPositionManager.getMaxId(pgTagMac.getTagMac());
-//        PGTagPosition pgTagPosition = pgTagPositionManager.get(maxId);
+
         PGTagPosition pgTagPosition = tagmacRun.GetTagStatus(pgTagMac);
         boolean bExist = false;
         bExist = pgTagPositionManager.findTagPosition(pgTagPosition.getPositionUpdatetime(),pgTagPosition.getHostId());
@@ -104,8 +102,7 @@
         PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(Long.valueOf(inPgPersonId));
         PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pgInPgPersonId",pgInPgPerson);
         System.out.println("time:"+pgInPgStatus.getInTime());
-//        PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pgInPgPersonId",inPgPersonId);
-//        PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode());
+
         PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("hostName",pgInPgPerson.getAssetCode());
 
         Map<Object,Object> mapPosition = new HashMap<>();
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
index 082ba5d..3eed00a 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
@@ -48,6 +48,7 @@
     public Map<String, Object> linkDevice(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         PgDeviceDto pgDeviceDto = null;
         try {
@@ -62,6 +63,7 @@
                     else {
                         pgDeviceDto = new PgDeviceDto(pgDevice);
                         msg = "报警关联设备获取成功";
+                        code="200";
                     }
                 }
             }
@@ -71,6 +73,7 @@
             e.printStackTrace();
             msg = "获取关联设备失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceDto);
 
@@ -86,6 +89,7 @@
     public Map<String, Object> linkPartitionCamera(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
         try {
@@ -106,6 +110,7 @@
 
                         pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(partition,position);
                         msg = "关联设备获取成功";
+                        code="200";
                     }
                 }
             }
@@ -115,6 +120,7 @@
             e.printStackTrace();
             msg = "分区设备关联失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceDtoList);
         return resultMap;
@@ -129,6 +135,7 @@
     public Map<String, Object> linkReservePlan(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgReservePlanDto> pgReservePlanDtoList=new ArrayList<>();
         try{
@@ -139,10 +146,12 @@
                 else {
                     pgReservePlanDtoList = pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
 
-                    if(pgReservePlanDtoList==null||pgReservePlanDtoList.size()==0)
-                        msg="不存在关联的报警预案";
-                    else
+                    if (pgReservePlanDtoList == null || pgReservePlanDtoList.size() == 0)
+                        msg = "不存在关联的报警预案";
+                    else {
                         msg = "关联预案获取成功";
+                        code="200";
+                    }
                 }
             }
             else
@@ -153,6 +162,7 @@
             e.printStackTrace();
             msg="预案关联失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgReservePlanDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
index 0ddbc4d..0ce886b 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
@@ -41,25 +41,19 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getAlarmList(@FormParam("alarmType") String alarmType,
                                             @FormParam("startDay") String startDay,
+                                            @FormParam("partition") String partition,
                                             @FormParam("endDay") String endDay,
                                             @FormParam("isNew") String isNew,
                                             @FormParam("page") int page,
                                             @FormParam("rows") int rows) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
         try {
-            pgAlarmDtoList = pgAlarmManager.getAllAlarm(alarmType,startDay,endDay,isNew,page,rows);
-            if (pgAlarmDtoList==null||pgAlarmDtoList.size() == 0)
-                msg = "没有报警信息";
-            else
-                msg = "报警信息获取成功";
+            resultMap = pgAlarmManager.getAllAlarm(alarmType,partition,startDay,endDay,isNew,page,rows);
+
         } catch (Exception e) {
             e.printStackTrace();
-            msg = "报警信息获取失败";
         }
-        resultMap.put("msg", msg);
-        resultMap.put("result", pgAlarmDtoList);
         return resultMap;
     }
 
@@ -71,9 +65,10 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> clearAlarmList(@FormParam("id") String id) throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        String result = "false";
+        String result = "";
+        String code="0";
 
         try {
             PgAlarm pgAlarm = new PgAlarm();
@@ -86,12 +81,14 @@
                 pgAlarmManager.save(pgAlarm);
                 msg = "报警信息清除成功";
                 result = "true";
+                code = "200";
             }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警信息清除失败";
             result = "false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
@@ -106,21 +103,26 @@
     public Map<String, Object> getAlarmByTypeOrTime(@FormParam("alarmType") String alarmType,
                                                     @FormParam("startTime") String startTime,
                                                     @FormParam("endTime") String endTime) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
-        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<PgAlarmDto>();
+        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
         try {
             pgAlarmDtoList = pgAlarmManager.getAlarmByTypeAndTime(alarmType, startTime, endTime);
             if (pgAlarmDtoList == null || pgAlarmDtoList.size() == 0)
                 msg = "报警信息不存在";
             else
+            {
                 msg = "报警信息获取成功";
+                code="200";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警信息获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
index 29ce8a4..ed0bf34 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
@@ -39,8 +39,8 @@
     public Map<String, Object> getAlarmRule(@FormParam("devType") String devType) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
-        System.out.println("devType:"+devType);
         List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<>();
         try {
             pgAlarmRuleDtoList = pgAlarmRuleManager.getAlarmRuleDto(devType);
@@ -52,6 +52,7 @@
             e.printStackTrace();
             msg = "报警阈值信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmRuleDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
index 24ab894..abef1b1 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
@@ -39,16 +39,21 @@
                                                      @FormParam("endDate") String endDate)throws Exception{
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
+
         List<PgAlarmTjDto> pgAlarmTjDtoList=null;
         try{
             pgAlarmTjDtoList=pgAlarmTjManager.getAlarmTjResultByType(startDate,endDate);
             msg="获取成功";
+            code="200";
         }
         catch(Exception ex) {
             msg = "统计失败";
         }
-        resultMap.put("result",pgAlarmTjDtoList);
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
+        resultMap.put("result",pgAlarmTjDtoList);
+
         return resultMap;
     }
 
@@ -61,23 +66,27 @@
     public Map<String, Object> getAlarmByTime(@FormParam("startTime") String startTime,
                                               @FormParam("endTime") String endTime,
                                               @FormParam("statisticType") String statisticType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code = "0";
 
-        List<PgAlarmTjDto> pgAlarmTjDtoList = new ArrayList<PgAlarmTjDto>();
+        List<PgAlarmTjDto> pgAlarmTjDtoList = new ArrayList<>();
         try {
             pgAlarmTjDtoList = pgAlarmTjManager.getAlarmByTime(startTime, endTime, statisticType);
             if(pgAlarmTjDtoList==null)
                 msg="报警统计信息获取失败";
-            else
-                msg="报警统计信息获取成功";
+            else {
+                msg = "报警统计信息获取成功";
+                code="200";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警统计信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmTjDtoList);
         return resultMap;
     }
 
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
index 28bc811..b6278a9 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
@@ -30,7 +30,6 @@
     @Resource
     private PgAlarmTypeManager pgAlarmTypeManager;
 
-
     /**
      * 获取报警类型
      */
@@ -38,19 +37,24 @@
     @Path("getAlarmType")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getAlarmTypeList()throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
-        List<PgAlarmTypeDto> pgAlarmTypeDtoList=new ArrayList<PgAlarmTypeDto>();
+        String code="";
+
+        List<PgAlarmTypeDto> pgAlarmTypeDtoList=new ArrayList<>();
         try {
             pgAlarmTypeDtoList = pgAlarmTypeManager.getAllAlarmTypeDto();
             if(pgAlarmTypeDtoList.size()==0)
                 msg="没有报警类型信息";
-            else
-                msg="报警类型信息获取成功";
+            else {
+                code="200";
+                msg = "报警类型信息获取成功";
+            }
         }catch(Exception e){
             e.printStackTrace();
             msg="报警类型信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAlarmTypeDtoList);
         return resultMap;
@@ -66,6 +70,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
@@ -83,6 +88,7 @@
                 logger.info("成功保存");
                 result = "true";
                 msg = "保存成功";
+                code="200";
             }
         } catch (Exception e) {
             result = "false";
@@ -90,6 +96,7 @@
             e.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -106,6 +113,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try{
             if(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
@@ -119,6 +127,7 @@
                 pgAlarmTypeManager.save(pgAlarmType);
                 result = "true";
                 msg = "编辑成功";
+                code="200";
             }
         }
         catch(Exception e)
@@ -128,6 +137,7 @@
             e.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("result",result);
         resultMap.put("msg",msg);
 
@@ -146,6 +156,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
         String result="false";
+        String code="0";
 
         try {
             PgAlarmType pgAlarmType=pgAlarmTypeManager.get(Long.valueOf(id));
@@ -157,6 +168,7 @@
             {
                 pgAlarmType.setActive(0);
                 pgAlarmTypeManager.save(pgAlarmType);
+                code="200";
                 msg="报警类型删除成功";
                 result="true";
             }
@@ -165,6 +177,7 @@
             msg="报警类型删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
index 4533e1a..85940bb 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
@@ -33,12 +33,15 @@
                                                  @FormParam("inSpectionPlace") String inSpectionPlace){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
         List<PgAssetPlanDto> pgAssetPlanDtoList=new ArrayList<>();
         try{
             pgAssetPlanDtoList=pgAssetPlanManager.getPgAssetPlanDtoList(startDay,endDay,inSpectionPlace);
-            if(pgAssetPlanDtoList!=null&&pgAssetPlanDtoList.size()!=0)
-                msg="巡检信息获取成功";
+            if(pgAssetPlanDtoList!=null&&pgAssetPlanDtoList.size()!=0) {
+                code="200";
+                msg = "巡检信息获取成功";
+            }
             else
                 msg="不存在巡检信息";
         }
@@ -47,6 +50,7 @@
             msg="巡检信息获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAssetPlanDtoList);
 

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 25ded8a..283d7ab 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,20 +7,56 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" 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/construction/manager/PgCsDocumentManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/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/manager/PgAlarmManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/~$说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/~$说明20191207.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.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$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/接口说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明20191207.docx" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
@@ -51,7 +87,7 @@
         <counts>
           <entry key="class" value="4" />
           <entry key="iml" value="2" />
-          <entry key="java" value="707" />
+          <entry key="java" value="820" />
           <entry key="properties" value="14" />
           <entry key="xml" value="7" />
         </counts>
@@ -60,7 +96,7 @@
         <counts>
           <entry key="CLASS" value="4" />
           <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="707" />
+          <entry key="JAVA" value="820" />
           <entry key="Properties" value="14" />
           <entry key="XML" value="7" />
         </counts>
@@ -68,32 +104,32 @@
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
           <entry key="dummy" value="38" />
-          <entry key="java" value="30161" />
+          <entry key="java" value="40859" />
           <entry key="properties" value="100" />
-          <entry key="txt" value="176" />
+          <entry key="txt" value="186" />
           <entry key="xml" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="30161" />
-          <entry key="PLAIN_TEXT" value="214" />
+          <entry key="JAVA" value="40859" />
+          <entry key="PLAIN_TEXT" value="224" />
           <entry key="Properties" value="100" />
           <entry key="XML" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="48" />
+          <entry key="project.closed" value="51" />
           <entry key="project.open.time.1" value="5" />
           <entry key="project.open.time.12" value="2" />
           <entry key="project.open.time.13" value="1" />
           <entry key="project.open.time.15" value="1" />
           <entry key="project.open.time.16" value="1" />
           <entry key="project.open.time.17" value="1" />
-          <entry key="project.open.time.2" value="1" />
+          <entry key="project.open.time.2" value="2" />
           <entry key="project.open.time.20" value="1" />
-          <entry key="project.open.time.23" value="1" />
+          <entry key="project.open.time.23" value="2" />
           <entry key="project.open.time.24" value="2" />
           <entry key="project.open.time.251" value="1" />
           <entry key="project.open.time.27" value="2" />
@@ -106,8 +142,8 @@
           <entry key="project.open.time.36" value="1" />
           <entry key="project.open.time.37" value="1" />
           <entry key="project.open.time.39" value="2" />
-          <entry key="project.open.time.4" value="2" />
-          <entry key="project.open.time.40" value="1" />
+          <entry key="project.open.time.4" value="3" />
+          <entry key="project.open.time.40" value="2" />
           <entry key="project.open.time.41" value="2" />
           <entry key="project.open.time.42" value="2" />
           <entry key="project.open.time.43" value="2" />
@@ -122,23 +158,25 @@
           <entry key="project.open.time.6" value="3" />
           <entry key="project.open.time.63" value="2" />
           <entry key="project.open.time.64" value="1" />
+          <entry key="project.open.time.66" value="1" />
           <entry key="project.open.time.71" value="2" />
+          <entry key="project.open.time.74" value="1" />
           <entry key="project.open.time.76" value="1" />
           <entry key="project.open.time.8" value="2" />
           <entry key="project.open.time.9" value="1" />
           <entry key="project.open.time.97" value="1" />
-          <entry key="project.opened" value="78" />
+          <entry key="project.opened" value="84" />
         </counts>
       </usages-collector>
     </session>
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+            <state relative-caret-position="396">
+              <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
               <folding>
                 <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
                 <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -147,73 +185,6 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <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="99">
-              <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-              <folding>
-                <element signature="imports" expanded="true" />
-                <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-1170">
-              <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state>
-              <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
-              <folding>
-                <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-                <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="true">
-        <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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-              <folding>
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-                <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>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <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="352">
-              <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -225,18 +196,9 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>inCriteria</find>
-      <find>getPgPlanResulList</find>
-      <find>getPileAcuListByPileAcuStr</find>
-      <find>distinct</find>
-      <find>order</find>
-      <find>canPlanLine</find>
-      <find>isExistLine</find>
-      <find>getPlanResult</find>
       <find>pgPipeLine</find>
       <find>getPipeLineBylineName</find>
       <find>StringU</find>
-      <find>getAllAlarm</find>
       <find>getAlarmList</find>
       <find>getPgInPersonListByDay</find>
       <find>getDayInPgStatistic</find>
@@ -254,7 +216,16 @@
       <find>getPgContructionByNameOrType</find>
       <find>&quot;&quot;,&quot;&quot;,</find>
       <find>getPgContructionDtoByNameOrType</find>
+      <find>addConstruction</find>
+      <find>getPgLineAcuHole</find>
+      <find>getPlanResult</find>
       <find>getConstruction</find>
+      <find>addPipeLine</find>
+      <find>未找到入廊数据</find>
+      <find>getCurrentHoleByAcu</find>
+      <find>getAllAlarm</find>
+      <find>getPgDeviceDtoListByPartition</find>
+      <find>getPgDeviceByDevType</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -263,57 +234,57 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlan.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileHoleManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/planData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/PlanData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
       </list>
     </option>
   </component>
@@ -359,7 +330,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -421,53 +391,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="dto" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="manager" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -479,29 +402,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="rs" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -516,6 +416,7 @@
         </subPane>
       </pane>
       <pane id="Scope" />
+      <pane id="PackagesPane" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -710,7 +611,13 @@
       <workItem from="1574902733573" duration="1829000" />
       <workItem from="1574998240004" duration="7016000" />
       <workItem from="1575247959683" duration="6997000" />
-      <workItem from="1575704345590" duration="40473000" />
+      <workItem from="1575704345590" duration="69381000" />
+      <workItem from="1575869479666" duration="721000" />
+      <workItem from="1575947104878" duration="6101000" />
+      <workItem from="1576128264436" duration="3347000" />
+      <workItem from="1576208571543" duration="22000" />
+      <workItem from="1576227513917" duration="862000" />
+      <workItem from="1576293721220" duration="18246000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -817,11 +724,18 @@
       <option name="project" value="LOCAL" />
       <updated>1575775489149</updated>
     </task>
-    <option name="localTasksCounter" value="16" />
+    <task id="LOCAL-00016" summary="整改施工信息">
+      <created>1575791780774</created>
+      <option name="number" value="00016" />
+      <option name="presentableId" value="LOCAL-00016" />
+      <option name="project" value="LOCAL" />
+      <updated>1575791780774</updated>
+    </task>
+    <option name="localTasksCounter" value="17" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="452131000" />
+    <option name="totallyTimeSpent" value="510338000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -834,9 +748,8 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
-    <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.24205749" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2647504" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -847,7 +760,7 @@
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.3295082" />
       <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.4819672" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.65737706" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.3295082" />
@@ -939,7 +852,8 @@
     <MESSAGE value="重新设计智能规划部分" />
     <MESSAGE value="完成智能规划对接" />
     <MESSAGE value="修改报警统计" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改报警统计" />
+    <MESSAGE value="整改施工信息" />
+    <option name="LAST_COMMIT_MESSAGE" value="整改施工信息" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -951,16 +865,10 @@
           <option name="timeStamp" value="3" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java</url>
-          <line>69</line>
+          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java</url>
+          <line>40</line>
           <properties />
-          <option name="timeStamp" value="21" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java</url>
-          <line>96</line>
-          <properties />
-          <option name="timeStamp" value="38" />
+          <option name="timeStamp" value="122" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
@@ -970,394 +878,452 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <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="2068">
-          <caret line="154" column="35" selection-start-line="154" selection-start-column="35" selection-end-line="154" selection-end-column="35" />
-        </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="3300">
-          <caret line="297" column="22" selection-start-line="297" selection-start-column="22" selection-end-line="297" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/StringUtils.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
-          <caret line="13" column="48" lean-forward="true" selection-start-line="13" selection-start-column="48" selection-end-line="13" selection-end-column="48" />
+          <caret line="11" column="5" selection-start-line="11" selection-start-column="5" selection-end-line="11" selection-end-column="5" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="78" lean-forward="true" selection-start-line="78" selection-end-line="78" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="616">
-          <caret line="41" column="1" selection-start-line="41" selection-start-column="1" selection-end-line="41" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="110">
-          <caret line="12" column="23" selection-start-line="12" selection-start-column="23" selection-end-line="12" selection-end-column="23" />
+        <state relative-caret-position="516">
+          <caret line="114" column="12" selection-start-line="114" selection-start-column="12" selection-end-line="114" selection-end-column="12" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="164">
-          <caret line="56" lean-forward="true" selection-start-line="56" selection-end-line="56" />
+        <state relative-caret-position="418">
+          <caret line="33" column="44" selection-start-line="33" selection-start-column="44" selection-end-line="33" selection-end-column="44" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="258">
-          <caret line="27" column="12" lean-forward="true" selection-start-line="27" selection-start-column="12" selection-end-line="27" selection-end-column="12" />
+        <state relative-caret-position="132">
+          <caret line="11" column="20" lean-forward="true" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="20" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.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="-12">
-          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        <state relative-caret-position="516">
+          <caret line="142" column="54" selection-start-line="142" selection-start-column="54" selection-end-line="142" selection-end-column="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="858">
-          <caret line="55" column="27" lean-forward="true" selection-start-line="55" selection-start-column="27" selection-end-line="55" selection-end-column="27" />
+        <state relative-caret-position="66">
+          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="58">
+          <caret line="18" column="28" selection-start-line="18" selection-start-column="19" selection-end-line="18" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="305">
+          <caret line="24" column="31" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="714">
+          <caret line="58" column="5" lean-forward="true" selection-start-line="58" selection-start-column="5" selection-end-line="58" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="924">
+          <caret line="134" column="92" selection-start-line="134" selection-start-column="92" selection-end-line="134" selection-end-column="92" />
+          <folding>
+            <element signature="method#linkDevice#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkPartitionCamera#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkReservePlan#0;class#PgAlarmLinkRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1066">
+          <caret line="90" lean-forward="true" selection-start-line="90" selection-end-line="90" />
+          <folding>
+            <element signature="method#getTjResultByAlarmType#0;class#PgAlarmTjRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="946">
+          <caret line="148" column="11" lean-forward="true" selection-start-line="148" selection-start-column="11" selection-end-line="148" selection-end-column="11" />
+          <folding>
+            <element signature="method#getAlarmTypeList#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#addAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#editAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#deleteAlarmType#0;class#PgAlarmTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="208">
+          <caret line="46" column="23" lean-forward="true" selection-start-line="46" selection-start-column="23" selection-end-line="46" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="113" column="9" lean-forward="true" selection-start-line="113" selection-start-column="9" selection-end-line="113" selection-end-column="9" />
+          <folding>
+            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
+            <element signature="method#getNewestCh4InfoByDev#0;class#PgCh4Rs#0" />
+            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="145" column="6" lean-forward="true" selection-start-line="145" selection-start-column="6" selection-end-line="145" selection-end-column="6" />
+          <folding>
+            <element signature="method#addAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#editAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#deleteAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#getAuthorityList#0;class#PgAuthorityRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="58" column="1" lean-forward="true" selection-start-line="58" selection-start-column="1" selection-end-line="58" selection-end-column="1" />
+          <folding>
+            <element signature="method#getPgAssetPlanList#0;class#PgAssetPlanRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="370">
+          <caret line="371" column="66" selection-start-line="371" selection-start-column="66" selection-end-line="371" selection-end-column="66" />
+          <folding>
+            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#searchConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionDev#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="139" column="13" lean-forward="true" selection-start-line="139" selection-start-column="13" selection-end-line="139" selection-end-column="13" />
+          <folding>
+            <element signature="method#getCoInfoByDevAndDate#0;class#PgCoRs#0" />
+            <element signature="method#getNewestCoInfoByDev#0;class#PgCoRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="540">
+          <caret line="223" column="5" lean-forward="true" selection-start-line="223" selection-start-column="5" selection-end-line="223" selection-end-column="5" />
+          <folding>
+            <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="682">
+          <caret line="100" lean-forward="true" selection-start-line="100" selection-end-line="100" />
+          <folding>
+            <element signature="method#getDeviceTpeyList#0;class#PgDeviceTypeRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="377">
+          <caret line="225" column="35" selection-start-line="225" selection-start-column="35" selection-end-line="225" selection-end-column="35" />
+          <folding>
+            <element signature="method#addEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#addEquipment#1;class#PgEquipmentRs#0" />
+            <element signature="method#getEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#deleteEquipment#0;class#PgEquipmentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="406">
+          <caret line="109" lean-forward="true" selection-start-line="109" selection-end-line="109" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="154">
+          <caret line="28" column="19" selection-start-line="28" selection-start-column="19" selection-end-line="28" selection-end-column="19" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="748">
-          <caret line="49" column="5" lean-forward="true" selection-start-line="49" selection-start-column="5" selection-end-line="49" selection-end-column="5" />
+        <state relative-caret-position="296">
+          <caret line="161" column="35" selection-start-line="161" selection-start-column="35" selection-end-line="161" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="384">
+          <caret line="99" column="5" lean-forward="true" selection-start-line="99" selection-start-column="5" selection-end-line="99" selection-end-column="5" />
+        </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="362">
+          <caret line="340" column="35" selection-start-line="340" selection-start-column="35" selection-end-line="340" selection-end-column="35" />
+          <folding>
+            <element signature="method#addInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPersonInPg#0;class#PgInPgPersonRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-606">
+          <caret line="76" column="20" lean-forward="true" selection-start-line="76" selection-start-column="20" selection-end-line="76" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="65" column="35" selection-start-line="65" selection-start-column="35" selection-end-line="65" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="101" column="35" selection-start-line="101" selection-start-column="35" selection-end-line="101" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="84" column="35" selection-start-line="84" selection-start-column="35" selection-end-line="84" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="59" lean-forward="true" selection-start-line="59" selection-end-line="59" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="60" column="1" lean-forward="true" selection-start-line="60" selection-start-column="1" selection-end-line="60" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="145" column="35" selection-start-line="145" selection-start-column="35" selection-end-line="145" selection-end-column="35" />
+        </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="274">
+          <caret line="350" column="35" selection-start-line="350" selection-start-column="35" selection-end-line="350" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="121" column="39" selection-start-line="121" selection-start-column="39" selection-end-line="121" selection-end-column="39" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="28" column="8" lean-forward="true" selection-start-line="28" selection-start-column="8" selection-end-line="28" selection-end-column="8" />
+        <state relative-caret-position="340">
+          <caret line="103" selection-start-line="103" selection-end-line="103" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="226" column="35" selection-start-line="226" selection-start-column="35" selection-end-line="226" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="203" column="35" selection-start-line="203" selection-start-column="35" selection-end-line="203" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="241" column="35" selection-start-line="241" selection-start-column="35" selection-end-line="241" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="225" column="1" lean-forward="true" selection-start-line="225" selection-start-column="1" selection-end-line="225" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="176" column="5" lean-forward="true" selection-start-line="176" selection-start-column="5" selection-end-line="176" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="178" column="35" lean-forward="true" selection-start-line="178" selection-start-column="35" selection-end-line="178" selection-end-column="35" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="516">
-          <caret line="94" column="53" selection-start-line="94" selection-start-column="53" selection-end-line="94" selection-end-column="53" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="814">
-          <caret line="52" column="9" lean-forward="true" selection-start-line="52" selection-start-column="9" selection-end-line="52" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="182">
-          <caret line="58" column="12" lean-forward="true" selection-start-line="58" selection-start-column="12" selection-end-line="58" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="34" lean-forward="true" selection-start-line="34" selection-end-line="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="32" lean-forward="true" selection-start-line="32" selection-end-line="32" />
-          <folding>
-            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
-            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="185">
-          <caret line="63" column="13" selection-start-line="63" selection-start-column="13" selection-end-line="63" selection-end-column="13" />
-          <folding>
-            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
-            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
-            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="e#6319#6324#0" />
-            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
-          </folding>
+          <caret line="240" lean-forward="true" selection-start-line="240" selection-end-line="240" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
-          <caret line="58" column="28" lean-forward="true" selection-start-line="58" selection-start-column="28" selection-end-line="58" selection-end-column="28" />
-          <folding>
-            <element signature="method#addTempHumData#0;class#PgTempHumRs#0" />
-          </folding>
+        <state relative-caret-position="340">
+          <caret line="148" column="34" selection-start-line="148" selection-start-column="34" selection-end-line="148" selection-end-column="34" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
+        <state relative-caret-position="458">
+          <caret line="99" column="35" selection-start-line="99" selection-start-column="35" selection-end-line="99" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+        <state relative-caret-position="384">
+          <caret line="145" column="32" lean-forward="true" selection-start-line="145" selection-start-column="32" selection-end-line="145" selection-end-column="32" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="414">
-          <caret line="22" column="46" lean-forward="true" selection-start-line="22" selection-start-column="46" selection-end-line="22" selection-end-column="46" />
-        </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="396">
-          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" column="83" selection-start-line="11" selection-start-column="83" selection-end-line="11" selection-end-column="83" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="26">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
-          <folding>
-            <element signature="method#getPgInPgStatusByPerson#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNumByName#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNum#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPersonListByDay#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPgStatusByPgInPgPerson#0;class#PgInPgStatusManager#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="44">
-          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-12">
-          <caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="87" lean-forward="true" selection-start-line="87" selection-end-line="87" />
-          <folding>
-            <element signature="method#getConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#addConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#deleteConstructionType#0;class#PgConstructionTypeRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
-          <folding>
-            <element signature="method#getConstructionTypeByType#0;class#PgConstructionTypeManager#0" />
-            <element signature="method#getAllConstructionTypeDto#0;class#PgConstructionTypeManager#0" />
-          </folding>
-        </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="145">
-          <caret line="258" column="9" lean-forward="true" selection-start-line="258" selection-start-column="9" selection-end-line="258" selection-end-column="9" />
-          <folding>
-            <element signature="method#getMonthInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayInPgStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgOverViewRs#0" />
-            <element signature="method#getAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getMonthAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayAlarmStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgOverViewRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="103">
-          <caret line="105" column="50" lean-forward="true" selection-start-line="105" selection-start-column="50" selection-end-line="105" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateBasicDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="99">
-          <caret line="125" selection-start-line="125" selection-end-line="125" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="190">
-          <caret line="24" column="35" lean-forward="true" selection-start-line="24" selection-start-column="35" selection-end-line="24" selection-end-column="35" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="436">
-          <caret line="24" lean-forward="true" selection-start-line="24" selection-end-line="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" lean-forward="true" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="300">
-          <caret line="34" column="31" lean-forward="true" selection-start-line="34" selection-start-column="31" selection-end-line="34" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="42" column="13" lean-forward="true" selection-start-line="42" selection-start-column="13" selection-end-line="42" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="120" column="72" lean-forward="true" selection-start-line="120" selection-start-column="72" selection-end-line="120" selection-end-column="72" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="293">
-          <caret line="58" column="73" lean-forward="true" selection-start-line="58" selection-start-column="73" selection-end-line="58" selection-end-column="73" />
-          <folding>
-            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
-            <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
-          </folding>
-        </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="307">
-          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
+        <state relative-caret-position="758">
+          <caret line="130" column="5" lean-forward="true" selection-start-line="130" selection-start-column="5" selection-end-line="130" selection-end-column="5" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1170">
-          <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
+        <state relative-caret-position="494">
+          <caret line="86" column="62" lean-forward="true" selection-start-line="86" selection-start-column="62" selection-end-line="86" selection-end-column="62" />
           <folding>
-            <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-            <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+            <element signature="method#getAllDevice#0;class#PgDeviceManager#0" />
+            <element signature="method#getAllDev#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="195" column="28" lean-forward="true" selection-start-line="195" selection-start-column="28" selection-end-line="195" selection-end-column="28" />
+        <state relative-caret-position="166">
+          <caret line="174" column="13" lean-forward="true" selection-start-line="174" selection-start-column="13" selection-end-line="174" selection-end-column="13" />
           <folding>
-            <element signature="method#getAlarmByTypeAndTime#0;class#PgAlarmManager#0" />
-            <element signature="method#getAlarmNum#0;class#PgAlarmManager#0" />
             <element signature="method#getDayAlarmStatistic#0;class#PgAlarmManager#0" />
+            <element signature="method#getAlarmList#0;class#PgAlarmManager#0" />
             <element signature="method#createDTO#0;class#PgAlarmManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="364">
+          <caret line="46" column="56" lean-forward="true" selection-start-line="46" selection-start-column="56" selection-end-line="46" selection-end-column="56" />
+          <folding>
+            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
+            <element signature="method#getPgDev#0;class#PgDeviceRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
+            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+        <state relative-caret-position="396">
+          <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
           <folding>
             <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
             <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -1365,52 +1331,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="239">
-          <caret line="21" column="33" lean-forward="true" selection-start-line="21" selection-start-column="33" selection-end-line="21" selection-end-column="33" />
-        </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="352">
-          <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-        </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="99">
-          <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-          </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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-          <folding>
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-            <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>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
index c436c93..e913155 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
@@ -132,7 +132,10 @@
             this.setAlarmType("");
         else
             this.setAlarmType(pgAlarm.getAlarmTypeId().getAlarmType());
-        this.setAlarmValue(pgAlarm.getAlarmValue());
+        if(pgAlarm.getAlarmValue()==null)
+            this.setAlarmValue("");
+        else
+            this.setAlarmValue(pgAlarm.getAlarmValue());
         if (pgAlarm.getAlarmDate() != null)
             this.setAlarmDate(sdf.format(pgAlarm.getAlarmDate()));
         else
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
index a43965c..565cb41 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -159,11 +159,21 @@
     }
 
     //获取历史报警消息列表
-    public List<PgAlarmDto> getAllAlarm(String alarmType,String startDay,String endDay,String isNew,int page,int rows) {
-        try {
+    public  Map<String, Object> getAllAlarm(String alarmType,String partition,String startDay,String endDay,String isNew,int page,int rows) {
 
+        Map<String, Object> resultMap = new HashMap<>();
+        String msg="";
+
+        try {
             Criteria criteria = createCriteria(PgAlarm.class);
 
+            if (StringUtils.isNotBlank(partition)) {
+                DetachedCriteria inCriteria = DetachedCriteria.forClass(PgDevice.class);
+                inCriteria.add(Restrictions.eq("partition", partition));
+                inCriteria.setProjection(Property.forName("id"));
+                criteria.add(Property.forName("alarmDevId").in(inCriteria));
+            }
+
             if (StringUtils.isNotBlank(alarmType)&&!alarmType.contains("全部")&&pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
                 criteria.add(Restrictions.eq("alarmTypeId", pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)));
 
@@ -190,8 +200,16 @@
             for (PgAlarm pgAlarm : pgAlarmList) {
                 pgAlarmDtoList.add(new PgAlarmDto(pgAlarm));
             }
-
-            return pgAlarmDtoList;
+            if(pgAlarmDtoList==null||pgAlarmDtoList.size()==0) {
+                resultMap.put("msg", "没有报警信息");
+                resultMap.put("code","0");
+            }else {
+                resultMap.put("code","200");
+                resultMap.put("msg", "报警信息获取成功");
+            }
+            resultMap.put("count",pg.getTotalCount());
+            resultMap.put("result",pgAlarmDtoList);
+            return resultMap;
         }
         catch(Exception ex){
             ex.printStackTrace();
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index 7547560..654f49e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -24,11 +24,11 @@
 
         Criteria criteria = createCriteria(PgDevice.class);
 
-        if(road!=null)
+        if(StringUtils.isNotBlank(road))
             criteria.add(Restrictions.eq("road",road));
-        if(partition!=null)
+        if(StringUtils.isNotBlank(partition))
             criteria.add(Restrictions.eq("partition",partition));
-        if(devType!=null)
+        if(StringUtils.isNotBlank(devType))
             criteria.add(Restrictions.eq("devType",devType));
 
         criteria.add(Restrictions.eq("active", 1));
@@ -43,6 +43,29 @@
         return pgDeviceDtoList;
     }
 
+    public List<PgDeviceDto> getAllDev(String road,String partition,String devType) {
+
+        Criteria criteria = createCriteria(PgDevice.class);
+
+        if(StringUtils.isNotBlank(road))
+            criteria.add(Restrictions.eq("road",road));
+        if(StringUtils.isNotBlank(partition))
+            criteria.add(Restrictions.eq("partition",partition));
+        if(StringUtils.isNotBlank(devType))
+            criteria.add(Restrictions.like("devType","%"+devType+"%"));
+
+        criteria.add(Restrictions.eq("active", 1));
+        criteria.addOrder(Order.desc("id"));
+        List<PgDevice> pgDeviceList = criteria.list();
+
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
+        for (PgDevice pgDevice : pgDeviceList) {
+            pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
+        }
+
+        return pgDeviceDtoList;
+    }
+
     //根据名字获取当前设备
     public PgDevice getDeviceByAssetCode(String assetCode) {
         Criteria criteria=createCriteria(PgDevice.class);
@@ -56,9 +79,9 @@
     }
 
     //根据类型获取设备列表
-    public List<PgDeviceDto> getDeviceByDevTypee(String devType) {
+    public List<PgDeviceDto> getDeviceByDevType(String devType) {
         Criteria criteria=createCriteria(PgDevice.class);
-        criteria.add(Restrictions.eq("devType",devType));
+        criteria.add(Restrictions.like("devType","%"+devType+"%"));
 
         List<PgDevice> pgDeviceList=criteria.list();
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
@@ -106,7 +129,7 @@
         criteria.add(Restrictions.eq("partition",partition));
 
         List<PgDevice> pgDeviceList=criteria.list();
-        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<PgDeviceDto>();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
 
         for (PgDevice pgDevice : pgDeviceList) {
             pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
index 3a3bccd..595730e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
@@ -1,10 +1,13 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.devTable.domain.PgAlarmType;
 import com.casic.PgInterface.devTable.domain.PgPartition;
 import com.casic.PgInterface.devTable.domain.PgRoad;
 import com.casic.PgInterface.devTable.domain.PipeGallery;
 import com.casic.PgInterface.devTable.dto.PgPartitionDto;
+import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
@@ -12,7 +15,9 @@
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Created by yxw on 2017/11/4.
@@ -21,7 +26,8 @@
 public class PgPartitionManager extends HibernateEntityDao<PgPartition> {
 
     @Resource
-    PgRoadManager pgRoadManager;
+    private PgRoadManager pgRoadManager;
+
 
     public PgPartition getPartitionByParName(String parName) {
         Criteria criteria = getSession().createCriteria(PgPartition.class);
@@ -99,4 +105,5 @@
         return pgPartitionDtoList;
     }
 
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
index f216360..a6928f1 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
@@ -5,6 +5,7 @@
 public class PgPlanResultRe {
 
     private String taskKey;
+    private List<String> pileAcuList;
     private List<PgPlanResult> pgPlanResultList;
 
     public String getTaskKey() {
@@ -15,6 +16,14 @@
         this.taskKey = taskKey;
     }
 
+    public List<String> getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(List<String> pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+
     public List<PgPlanResult> getPgPlanResultList() {
         return pgPlanResultList;
     }
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
index 71ea765..47eea07 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
@@ -54,9 +54,7 @@
 
         List<PgLineHole> pgLineHoleList=criteria.list();
         List<PgLineHoleDTO> pgLineHoleDTOList=new ArrayList<>();
-        if(pgLineHoleList==null||pgLineHoleList.size()==0)
-            return null;
-        else
+        if(pgLineHoleList!=null&&pgLineHoleList.size()!=0)
             pgLineHoleDTOList=PgLineHoleDTO.ConvertToDTOList(pgLineHoleList,pgPileAcuManager,pgRoadManager);
         return pgLineHoleDTOList;
     }
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
index 0fd9e1f..841a386 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
@@ -1,12 +1,15 @@
 package com.casic.PgInterface.intelPlan.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.devTable.domain.PgPartition;
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
 import com.casic.PgInterface.intelPlan.domain.PgLineHole;
 import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
 import com.casic.PgInterface.intelPlan.domain.PgSection;
 import com.casic.PgInterface.intelPlan.dto.PgPlanResult;
 import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
 import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -22,6 +25,9 @@
     @Resource
     private PgLineHoleManager pgLineHoleManager;
 
+    @Resource
+    private PgRoadManager pgRoadManager;
+
     public PgPileAcu getPgPileAcuByCode(String acuCode){
         List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
 
@@ -58,7 +64,9 @@
         for(PgPlanTask pgPlanTask:pgPlanTaskList){
             List<PgPlanResult> pgPlanResultList=getPgPlanResultByPlantask(pgPlanTask);
             PgPlanResultRe pgPlanResultRe=new PgPlanResultRe();
+
             pgPlanResultRe.setTaskKey(pgPlanTask.getTaskKey());
+            pgPlanResultRe.setPileAcuList(pgPlanTask.getPileAcuList());
             pgPlanResultRe.setPgPlanResultList(pgPlanResultList);
 
             pgPlanResultReList.add(pgPlanResultRe);
@@ -142,4 +150,57 @@
         return length;
     }
 
+    private PgPileAcu getPgPileAcuByAcuCode(String acuCode){
+        List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
+
+        if(pgPileAcuList==null||pgPileAcuList.size()==0)
+            return null;
+        else
+            return pgPileAcuList.get(0);
+    }
+
+    public List<PgAcuTask> getACUTask(String pileAcuList){
+        String[] acuArray=pileAcuList.split(",");
+        List<PgAcuTask> pgAcuTaskList=new ArrayList<>();
+
+        for(String acu:acuArray){
+            PgPileAcu pgPileAcu=this.getPgPileAcuByCode(acu);
+            String roadName=pgRoadManager.get(pgPileAcu.getRoadId()).getRoadName();
+
+            if(!containRoad(roadName,pgAcuTaskList))
+            {
+                PgAcuTask pgAcuTask=new PgAcuTask();
+                pgAcuTask.setRoadName(roadName);
+                pgAcuTask.setPileAcuList(acu);
+                pgAcuTaskList.add(pgAcuTask);
+            }
+            else{
+                PgAcuTask pgAcuTask=getIndexRoad(roadName,pgAcuTaskList);
+                if(pgAcuTask!=null)
+                    pgAcuTask.setPileAcuList(pgAcuTask.getPileAcuList()+","+acu);
+            }
+        }
+
+        return pgAcuTaskList;
+    }
+
+    private boolean containRoad(String roadName,List<PgAcuTask> pgAcuTaskList){
+        if(pgAcuTaskList==null||pgAcuTaskList.size()==0) return false;
+        for(PgAcuTask pgAcuTask:pgAcuTaskList){
+            if(pgAcuTask.getRoadName().equals(roadName))
+                return true;
+        }
+
+        return false;
+    }
+
+    private PgAcuTask getIndexRoad(String roadName, List<PgAcuTask> pgAcuTaskList){
+        for(PgAcuTask pgAcuTask:pgAcuTaskList){
+            if(pgAcuTask.getRoadName().equals(roadName))
+                return pgAcuTask;
+        }
+
+        return null;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java
new file mode 100644
index 0000000..323f7ef
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java
@@ -0,0 +1,25 @@
+package com.casic.PgInterface.reservePlan.dto;
+
+import java.util.List;
+
+public class PgAcuTask {
+
+    private String roadName;//道路
+    private String pileAcuList;//acu分区
+
+    public String getRoadName() {
+        return roadName;
+    }
+
+    public void setRoadName(String roadName) {
+        this.roadName = roadName;
+    }
+
+    public String getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(String pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
index c25e926..c7d7693 100644
--- a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
@@ -70,9 +70,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(Long.valueOf(inPgPersonId));
         PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("hostName",pgInPgPerson.getAssetCode());
-//        PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode());
-//        long maxId = pgTagPositionManager.getMaxId(pgTagMac.getTagMac());
-//        PGTagPosition pgTagPosition = pgTagPositionManager.get(maxId);
+
         PGTagPosition pgTagPosition = tagmacRun.GetTagStatus(pgTagMac);
         boolean bExist = false;
         bExist = pgTagPositionManager.findTagPosition(pgTagPosition.getPositionUpdatetime(),pgTagPosition.getHostId());
@@ -104,8 +102,7 @@
         PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(Long.valueOf(inPgPersonId));
         PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pgInPgPersonId",pgInPgPerson);
         System.out.println("time:"+pgInPgStatus.getInTime());
-//        PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pgInPgPersonId",inPgPersonId);
-//        PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode());
+
         PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("hostName",pgInPgPerson.getAssetCode());
 
         Map<Object,Object> mapPosition = new HashMap<>();
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
index 082ba5d..3eed00a 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
@@ -48,6 +48,7 @@
     public Map<String, Object> linkDevice(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         PgDeviceDto pgDeviceDto = null;
         try {
@@ -62,6 +63,7 @@
                     else {
                         pgDeviceDto = new PgDeviceDto(pgDevice);
                         msg = "报警关联设备获取成功";
+                        code="200";
                     }
                 }
             }
@@ -71,6 +73,7 @@
             e.printStackTrace();
             msg = "获取关联设备失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceDto);
 
@@ -86,6 +89,7 @@
     public Map<String, Object> linkPartitionCamera(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
         try {
@@ -106,6 +110,7 @@
 
                         pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(partition,position);
                         msg = "关联设备获取成功";
+                        code="200";
                     }
                 }
             }
@@ -115,6 +120,7 @@
             e.printStackTrace();
             msg = "分区设备关联失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceDtoList);
         return resultMap;
@@ -129,6 +135,7 @@
     public Map<String, Object> linkReservePlan(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgReservePlanDto> pgReservePlanDtoList=new ArrayList<>();
         try{
@@ -139,10 +146,12 @@
                 else {
                     pgReservePlanDtoList = pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
 
-                    if(pgReservePlanDtoList==null||pgReservePlanDtoList.size()==0)
-                        msg="不存在关联的报警预案";
-                    else
+                    if (pgReservePlanDtoList == null || pgReservePlanDtoList.size() == 0)
+                        msg = "不存在关联的报警预案";
+                    else {
                         msg = "关联预案获取成功";
+                        code="200";
+                    }
                 }
             }
             else
@@ -153,6 +162,7 @@
             e.printStackTrace();
             msg="预案关联失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgReservePlanDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
index 0ddbc4d..0ce886b 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
@@ -41,25 +41,19 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getAlarmList(@FormParam("alarmType") String alarmType,
                                             @FormParam("startDay") String startDay,
+                                            @FormParam("partition") String partition,
                                             @FormParam("endDay") String endDay,
                                             @FormParam("isNew") String isNew,
                                             @FormParam("page") int page,
                                             @FormParam("rows") int rows) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
         try {
-            pgAlarmDtoList = pgAlarmManager.getAllAlarm(alarmType,startDay,endDay,isNew,page,rows);
-            if (pgAlarmDtoList==null||pgAlarmDtoList.size() == 0)
-                msg = "没有报警信息";
-            else
-                msg = "报警信息获取成功";
+            resultMap = pgAlarmManager.getAllAlarm(alarmType,partition,startDay,endDay,isNew,page,rows);
+
         } catch (Exception e) {
             e.printStackTrace();
-            msg = "报警信息获取失败";
         }
-        resultMap.put("msg", msg);
-        resultMap.put("result", pgAlarmDtoList);
         return resultMap;
     }
 
@@ -71,9 +65,10 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> clearAlarmList(@FormParam("id") String id) throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        String result = "false";
+        String result = "";
+        String code="0";
 
         try {
             PgAlarm pgAlarm = new PgAlarm();
@@ -86,12 +81,14 @@
                 pgAlarmManager.save(pgAlarm);
                 msg = "报警信息清除成功";
                 result = "true";
+                code = "200";
             }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警信息清除失败";
             result = "false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
@@ -106,21 +103,26 @@
     public Map<String, Object> getAlarmByTypeOrTime(@FormParam("alarmType") String alarmType,
                                                     @FormParam("startTime") String startTime,
                                                     @FormParam("endTime") String endTime) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
-        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<PgAlarmDto>();
+        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
         try {
             pgAlarmDtoList = pgAlarmManager.getAlarmByTypeAndTime(alarmType, startTime, endTime);
             if (pgAlarmDtoList == null || pgAlarmDtoList.size() == 0)
                 msg = "报警信息不存在";
             else
+            {
                 msg = "报警信息获取成功";
+                code="200";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警信息获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
index 29ce8a4..ed0bf34 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
@@ -39,8 +39,8 @@
     public Map<String, Object> getAlarmRule(@FormParam("devType") String devType) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
-        System.out.println("devType:"+devType);
         List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<>();
         try {
             pgAlarmRuleDtoList = pgAlarmRuleManager.getAlarmRuleDto(devType);
@@ -52,6 +52,7 @@
             e.printStackTrace();
             msg = "报警阈值信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmRuleDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
index 24ab894..abef1b1 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
@@ -39,16 +39,21 @@
                                                      @FormParam("endDate") String endDate)throws Exception{
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
+
         List<PgAlarmTjDto> pgAlarmTjDtoList=null;
         try{
             pgAlarmTjDtoList=pgAlarmTjManager.getAlarmTjResultByType(startDate,endDate);
             msg="获取成功";
+            code="200";
         }
         catch(Exception ex) {
             msg = "统计失败";
         }
-        resultMap.put("result",pgAlarmTjDtoList);
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
+        resultMap.put("result",pgAlarmTjDtoList);
+
         return resultMap;
     }
 
@@ -61,23 +66,27 @@
     public Map<String, Object> getAlarmByTime(@FormParam("startTime") String startTime,
                                               @FormParam("endTime") String endTime,
                                               @FormParam("statisticType") String statisticType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code = "0";
 
-        List<PgAlarmTjDto> pgAlarmTjDtoList = new ArrayList<PgAlarmTjDto>();
+        List<PgAlarmTjDto> pgAlarmTjDtoList = new ArrayList<>();
         try {
             pgAlarmTjDtoList = pgAlarmTjManager.getAlarmByTime(startTime, endTime, statisticType);
             if(pgAlarmTjDtoList==null)
                 msg="报警统计信息获取失败";
-            else
-                msg="报警统计信息获取成功";
+            else {
+                msg = "报警统计信息获取成功";
+                code="200";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警统计信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmTjDtoList);
         return resultMap;
     }
 
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
index 28bc811..b6278a9 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
@@ -30,7 +30,6 @@
     @Resource
     private PgAlarmTypeManager pgAlarmTypeManager;
 
-
     /**
      * 获取报警类型
      */
@@ -38,19 +37,24 @@
     @Path("getAlarmType")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getAlarmTypeList()throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
-        List<PgAlarmTypeDto> pgAlarmTypeDtoList=new ArrayList<PgAlarmTypeDto>();
+        String code="";
+
+        List<PgAlarmTypeDto> pgAlarmTypeDtoList=new ArrayList<>();
         try {
             pgAlarmTypeDtoList = pgAlarmTypeManager.getAllAlarmTypeDto();
             if(pgAlarmTypeDtoList.size()==0)
                 msg="没有报警类型信息";
-            else
-                msg="报警类型信息获取成功";
+            else {
+                code="200";
+                msg = "报警类型信息获取成功";
+            }
         }catch(Exception e){
             e.printStackTrace();
             msg="报警类型信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAlarmTypeDtoList);
         return resultMap;
@@ -66,6 +70,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
@@ -83,6 +88,7 @@
                 logger.info("成功保存");
                 result = "true";
                 msg = "保存成功";
+                code="200";
             }
         } catch (Exception e) {
             result = "false";
@@ -90,6 +96,7 @@
             e.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -106,6 +113,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try{
             if(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
@@ -119,6 +127,7 @@
                 pgAlarmTypeManager.save(pgAlarmType);
                 result = "true";
                 msg = "编辑成功";
+                code="200";
             }
         }
         catch(Exception e)
@@ -128,6 +137,7 @@
             e.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("result",result);
         resultMap.put("msg",msg);
 
@@ -146,6 +156,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
         String result="false";
+        String code="0";
 
         try {
             PgAlarmType pgAlarmType=pgAlarmTypeManager.get(Long.valueOf(id));
@@ -157,6 +168,7 @@
             {
                 pgAlarmType.setActive(0);
                 pgAlarmTypeManager.save(pgAlarmType);
+                code="200";
                 msg="报警类型删除成功";
                 result="true";
             }
@@ -165,6 +177,7 @@
             msg="报警类型删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
index 4533e1a..85940bb 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
@@ -33,12 +33,15 @@
                                                  @FormParam("inSpectionPlace") String inSpectionPlace){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
         List<PgAssetPlanDto> pgAssetPlanDtoList=new ArrayList<>();
         try{
             pgAssetPlanDtoList=pgAssetPlanManager.getPgAssetPlanDtoList(startDay,endDay,inSpectionPlace);
-            if(pgAssetPlanDtoList!=null&&pgAssetPlanDtoList.size()!=0)
-                msg="巡检信息获取成功";
+            if(pgAssetPlanDtoList!=null&&pgAssetPlanDtoList.size()!=0) {
+                code="200";
+                msg = "巡检信息获取成功";
+            }
             else
                 msg="不存在巡检信息";
         }
@@ -47,6 +50,7 @@
             msg="巡检信息获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAssetPlanDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
index 47ef9d1..5cbdfcb 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
@@ -30,12 +30,15 @@
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
         String result="";
+        String code="0";
 
         List<PgAssetPlanStatic> pgAssetPlanStaticList = null;
         try{
             pgAssetPlanStaticList=pgAssetPlanManager.getPgAssetPlanStaticLisByTime(startTime,endTime,staticType);
-            if(pgAssetPlanStaticList!=null&&pgAssetPlanStaticList.size()!=0)
-                msg="巡检统计信息获取成功";
+            if(pgAssetPlanStaticList!=null&&pgAssetPlanStaticList.size()!=0) {
+                code = "200";
+                msg = "巡检统计信息获取成功";
+            }
             else
                 msg="统计信息获取失败";
         }
@@ -44,6 +47,7 @@
             msg="统计失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAssetPlanStaticList);
 

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 25ded8a..283d7ab 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,20 +7,56 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" 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/construction/manager/PgCsDocumentManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/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/manager/PgAlarmManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/~$说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/~$说明20191207.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.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$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/接口说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明20191207.docx" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
@@ -51,7 +87,7 @@
         <counts>
           <entry key="class" value="4" />
           <entry key="iml" value="2" />
-          <entry key="java" value="707" />
+          <entry key="java" value="820" />
           <entry key="properties" value="14" />
           <entry key="xml" value="7" />
         </counts>
@@ -60,7 +96,7 @@
         <counts>
           <entry key="CLASS" value="4" />
           <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="707" />
+          <entry key="JAVA" value="820" />
           <entry key="Properties" value="14" />
           <entry key="XML" value="7" />
         </counts>
@@ -68,32 +104,32 @@
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
           <entry key="dummy" value="38" />
-          <entry key="java" value="30161" />
+          <entry key="java" value="40859" />
           <entry key="properties" value="100" />
-          <entry key="txt" value="176" />
+          <entry key="txt" value="186" />
           <entry key="xml" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="30161" />
-          <entry key="PLAIN_TEXT" value="214" />
+          <entry key="JAVA" value="40859" />
+          <entry key="PLAIN_TEXT" value="224" />
           <entry key="Properties" value="100" />
           <entry key="XML" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="48" />
+          <entry key="project.closed" value="51" />
           <entry key="project.open.time.1" value="5" />
           <entry key="project.open.time.12" value="2" />
           <entry key="project.open.time.13" value="1" />
           <entry key="project.open.time.15" value="1" />
           <entry key="project.open.time.16" value="1" />
           <entry key="project.open.time.17" value="1" />
-          <entry key="project.open.time.2" value="1" />
+          <entry key="project.open.time.2" value="2" />
           <entry key="project.open.time.20" value="1" />
-          <entry key="project.open.time.23" value="1" />
+          <entry key="project.open.time.23" value="2" />
           <entry key="project.open.time.24" value="2" />
           <entry key="project.open.time.251" value="1" />
           <entry key="project.open.time.27" value="2" />
@@ -106,8 +142,8 @@
           <entry key="project.open.time.36" value="1" />
           <entry key="project.open.time.37" value="1" />
           <entry key="project.open.time.39" value="2" />
-          <entry key="project.open.time.4" value="2" />
-          <entry key="project.open.time.40" value="1" />
+          <entry key="project.open.time.4" value="3" />
+          <entry key="project.open.time.40" value="2" />
           <entry key="project.open.time.41" value="2" />
           <entry key="project.open.time.42" value="2" />
           <entry key="project.open.time.43" value="2" />
@@ -122,23 +158,25 @@
           <entry key="project.open.time.6" value="3" />
           <entry key="project.open.time.63" value="2" />
           <entry key="project.open.time.64" value="1" />
+          <entry key="project.open.time.66" value="1" />
           <entry key="project.open.time.71" value="2" />
+          <entry key="project.open.time.74" value="1" />
           <entry key="project.open.time.76" value="1" />
           <entry key="project.open.time.8" value="2" />
           <entry key="project.open.time.9" value="1" />
           <entry key="project.open.time.97" value="1" />
-          <entry key="project.opened" value="78" />
+          <entry key="project.opened" value="84" />
         </counts>
       </usages-collector>
     </session>
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+            <state relative-caret-position="396">
+              <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
               <folding>
                 <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
                 <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -147,73 +185,6 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <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="99">
-              <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-              <folding>
-                <element signature="imports" expanded="true" />
-                <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-1170">
-              <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state>
-              <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
-              <folding>
-                <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-                <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="true">
-        <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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-              <folding>
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-                <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>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <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="352">
-              <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -225,18 +196,9 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>inCriteria</find>
-      <find>getPgPlanResulList</find>
-      <find>getPileAcuListByPileAcuStr</find>
-      <find>distinct</find>
-      <find>order</find>
-      <find>canPlanLine</find>
-      <find>isExistLine</find>
-      <find>getPlanResult</find>
       <find>pgPipeLine</find>
       <find>getPipeLineBylineName</find>
       <find>StringU</find>
-      <find>getAllAlarm</find>
       <find>getAlarmList</find>
       <find>getPgInPersonListByDay</find>
       <find>getDayInPgStatistic</find>
@@ -254,7 +216,16 @@
       <find>getPgContructionByNameOrType</find>
       <find>&quot;&quot;,&quot;&quot;,</find>
       <find>getPgContructionDtoByNameOrType</find>
+      <find>addConstruction</find>
+      <find>getPgLineAcuHole</find>
+      <find>getPlanResult</find>
       <find>getConstruction</find>
+      <find>addPipeLine</find>
+      <find>未找到入廊数据</find>
+      <find>getCurrentHoleByAcu</find>
+      <find>getAllAlarm</find>
+      <find>getPgDeviceDtoListByPartition</find>
+      <find>getPgDeviceByDevType</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -263,57 +234,57 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlan.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileHoleManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/planData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/PlanData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
       </list>
     </option>
   </component>
@@ -359,7 +330,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -421,53 +391,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="dto" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="manager" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -479,29 +402,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="rs" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -516,6 +416,7 @@
         </subPane>
       </pane>
       <pane id="Scope" />
+      <pane id="PackagesPane" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -710,7 +611,13 @@
       <workItem from="1574902733573" duration="1829000" />
       <workItem from="1574998240004" duration="7016000" />
       <workItem from="1575247959683" duration="6997000" />
-      <workItem from="1575704345590" duration="40473000" />
+      <workItem from="1575704345590" duration="69381000" />
+      <workItem from="1575869479666" duration="721000" />
+      <workItem from="1575947104878" duration="6101000" />
+      <workItem from="1576128264436" duration="3347000" />
+      <workItem from="1576208571543" duration="22000" />
+      <workItem from="1576227513917" duration="862000" />
+      <workItem from="1576293721220" duration="18246000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -817,11 +724,18 @@
       <option name="project" value="LOCAL" />
       <updated>1575775489149</updated>
     </task>
-    <option name="localTasksCounter" value="16" />
+    <task id="LOCAL-00016" summary="整改施工信息">
+      <created>1575791780774</created>
+      <option name="number" value="00016" />
+      <option name="presentableId" value="LOCAL-00016" />
+      <option name="project" value="LOCAL" />
+      <updated>1575791780774</updated>
+    </task>
+    <option name="localTasksCounter" value="17" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="452131000" />
+    <option name="totallyTimeSpent" value="510338000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -834,9 +748,8 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
-    <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.24205749" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2647504" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -847,7 +760,7 @@
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.3295082" />
       <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.4819672" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.65737706" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.3295082" />
@@ -939,7 +852,8 @@
     <MESSAGE value="重新设计智能规划部分" />
     <MESSAGE value="完成智能规划对接" />
     <MESSAGE value="修改报警统计" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改报警统计" />
+    <MESSAGE value="整改施工信息" />
+    <option name="LAST_COMMIT_MESSAGE" value="整改施工信息" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -951,16 +865,10 @@
           <option name="timeStamp" value="3" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java</url>
-          <line>69</line>
+          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java</url>
+          <line>40</line>
           <properties />
-          <option name="timeStamp" value="21" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java</url>
-          <line>96</line>
-          <properties />
-          <option name="timeStamp" value="38" />
+          <option name="timeStamp" value="122" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
@@ -970,394 +878,452 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <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="2068">
-          <caret line="154" column="35" selection-start-line="154" selection-start-column="35" selection-end-line="154" selection-end-column="35" />
-        </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="3300">
-          <caret line="297" column="22" selection-start-line="297" selection-start-column="22" selection-end-line="297" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/StringUtils.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
-          <caret line="13" column="48" lean-forward="true" selection-start-line="13" selection-start-column="48" selection-end-line="13" selection-end-column="48" />
+          <caret line="11" column="5" selection-start-line="11" selection-start-column="5" selection-end-line="11" selection-end-column="5" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="78" lean-forward="true" selection-start-line="78" selection-end-line="78" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="616">
-          <caret line="41" column="1" selection-start-line="41" selection-start-column="1" selection-end-line="41" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="110">
-          <caret line="12" column="23" selection-start-line="12" selection-start-column="23" selection-end-line="12" selection-end-column="23" />
+        <state relative-caret-position="516">
+          <caret line="114" column="12" selection-start-line="114" selection-start-column="12" selection-end-line="114" selection-end-column="12" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="164">
-          <caret line="56" lean-forward="true" selection-start-line="56" selection-end-line="56" />
+        <state relative-caret-position="418">
+          <caret line="33" column="44" selection-start-line="33" selection-start-column="44" selection-end-line="33" selection-end-column="44" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="258">
-          <caret line="27" column="12" lean-forward="true" selection-start-line="27" selection-start-column="12" selection-end-line="27" selection-end-column="12" />
+        <state relative-caret-position="132">
+          <caret line="11" column="20" lean-forward="true" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="20" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.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="-12">
-          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        <state relative-caret-position="516">
+          <caret line="142" column="54" selection-start-line="142" selection-start-column="54" selection-end-line="142" selection-end-column="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="858">
-          <caret line="55" column="27" lean-forward="true" selection-start-line="55" selection-start-column="27" selection-end-line="55" selection-end-column="27" />
+        <state relative-caret-position="66">
+          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="58">
+          <caret line="18" column="28" selection-start-line="18" selection-start-column="19" selection-end-line="18" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="305">
+          <caret line="24" column="31" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="714">
+          <caret line="58" column="5" lean-forward="true" selection-start-line="58" selection-start-column="5" selection-end-line="58" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="924">
+          <caret line="134" column="92" selection-start-line="134" selection-start-column="92" selection-end-line="134" selection-end-column="92" />
+          <folding>
+            <element signature="method#linkDevice#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkPartitionCamera#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkReservePlan#0;class#PgAlarmLinkRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1066">
+          <caret line="90" lean-forward="true" selection-start-line="90" selection-end-line="90" />
+          <folding>
+            <element signature="method#getTjResultByAlarmType#0;class#PgAlarmTjRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="946">
+          <caret line="148" column="11" lean-forward="true" selection-start-line="148" selection-start-column="11" selection-end-line="148" selection-end-column="11" />
+          <folding>
+            <element signature="method#getAlarmTypeList#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#addAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#editAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#deleteAlarmType#0;class#PgAlarmTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="208">
+          <caret line="46" column="23" lean-forward="true" selection-start-line="46" selection-start-column="23" selection-end-line="46" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="113" column="9" lean-forward="true" selection-start-line="113" selection-start-column="9" selection-end-line="113" selection-end-column="9" />
+          <folding>
+            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
+            <element signature="method#getNewestCh4InfoByDev#0;class#PgCh4Rs#0" />
+            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="145" column="6" lean-forward="true" selection-start-line="145" selection-start-column="6" selection-end-line="145" selection-end-column="6" />
+          <folding>
+            <element signature="method#addAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#editAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#deleteAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#getAuthorityList#0;class#PgAuthorityRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="58" column="1" lean-forward="true" selection-start-line="58" selection-start-column="1" selection-end-line="58" selection-end-column="1" />
+          <folding>
+            <element signature="method#getPgAssetPlanList#0;class#PgAssetPlanRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="370">
+          <caret line="371" column="66" selection-start-line="371" selection-start-column="66" selection-end-line="371" selection-end-column="66" />
+          <folding>
+            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#searchConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionDev#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="139" column="13" lean-forward="true" selection-start-line="139" selection-start-column="13" selection-end-line="139" selection-end-column="13" />
+          <folding>
+            <element signature="method#getCoInfoByDevAndDate#0;class#PgCoRs#0" />
+            <element signature="method#getNewestCoInfoByDev#0;class#PgCoRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="540">
+          <caret line="223" column="5" lean-forward="true" selection-start-line="223" selection-start-column="5" selection-end-line="223" selection-end-column="5" />
+          <folding>
+            <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="682">
+          <caret line="100" lean-forward="true" selection-start-line="100" selection-end-line="100" />
+          <folding>
+            <element signature="method#getDeviceTpeyList#0;class#PgDeviceTypeRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="377">
+          <caret line="225" column="35" selection-start-line="225" selection-start-column="35" selection-end-line="225" selection-end-column="35" />
+          <folding>
+            <element signature="method#addEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#addEquipment#1;class#PgEquipmentRs#0" />
+            <element signature="method#getEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#deleteEquipment#0;class#PgEquipmentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="406">
+          <caret line="109" lean-forward="true" selection-start-line="109" selection-end-line="109" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="154">
+          <caret line="28" column="19" selection-start-line="28" selection-start-column="19" selection-end-line="28" selection-end-column="19" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="748">
-          <caret line="49" column="5" lean-forward="true" selection-start-line="49" selection-start-column="5" selection-end-line="49" selection-end-column="5" />
+        <state relative-caret-position="296">
+          <caret line="161" column="35" selection-start-line="161" selection-start-column="35" selection-end-line="161" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="384">
+          <caret line="99" column="5" lean-forward="true" selection-start-line="99" selection-start-column="5" selection-end-line="99" selection-end-column="5" />
+        </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="362">
+          <caret line="340" column="35" selection-start-line="340" selection-start-column="35" selection-end-line="340" selection-end-column="35" />
+          <folding>
+            <element signature="method#addInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPersonInPg#0;class#PgInPgPersonRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-606">
+          <caret line="76" column="20" lean-forward="true" selection-start-line="76" selection-start-column="20" selection-end-line="76" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="65" column="35" selection-start-line="65" selection-start-column="35" selection-end-line="65" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="101" column="35" selection-start-line="101" selection-start-column="35" selection-end-line="101" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="84" column="35" selection-start-line="84" selection-start-column="35" selection-end-line="84" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="59" lean-forward="true" selection-start-line="59" selection-end-line="59" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="60" column="1" lean-forward="true" selection-start-line="60" selection-start-column="1" selection-end-line="60" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="145" column="35" selection-start-line="145" selection-start-column="35" selection-end-line="145" selection-end-column="35" />
+        </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="274">
+          <caret line="350" column="35" selection-start-line="350" selection-start-column="35" selection-end-line="350" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="121" column="39" selection-start-line="121" selection-start-column="39" selection-end-line="121" selection-end-column="39" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="28" column="8" lean-forward="true" selection-start-line="28" selection-start-column="8" selection-end-line="28" selection-end-column="8" />
+        <state relative-caret-position="340">
+          <caret line="103" selection-start-line="103" selection-end-line="103" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="226" column="35" selection-start-line="226" selection-start-column="35" selection-end-line="226" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="203" column="35" selection-start-line="203" selection-start-column="35" selection-end-line="203" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="241" column="35" selection-start-line="241" selection-start-column="35" selection-end-line="241" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="225" column="1" lean-forward="true" selection-start-line="225" selection-start-column="1" selection-end-line="225" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="176" column="5" lean-forward="true" selection-start-line="176" selection-start-column="5" selection-end-line="176" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="178" column="35" lean-forward="true" selection-start-line="178" selection-start-column="35" selection-end-line="178" selection-end-column="35" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="516">
-          <caret line="94" column="53" selection-start-line="94" selection-start-column="53" selection-end-line="94" selection-end-column="53" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="814">
-          <caret line="52" column="9" lean-forward="true" selection-start-line="52" selection-start-column="9" selection-end-line="52" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="182">
-          <caret line="58" column="12" lean-forward="true" selection-start-line="58" selection-start-column="12" selection-end-line="58" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="34" lean-forward="true" selection-start-line="34" selection-end-line="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="32" lean-forward="true" selection-start-line="32" selection-end-line="32" />
-          <folding>
-            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
-            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="185">
-          <caret line="63" column="13" selection-start-line="63" selection-start-column="13" selection-end-line="63" selection-end-column="13" />
-          <folding>
-            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
-            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
-            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="e#6319#6324#0" />
-            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
-          </folding>
+          <caret line="240" lean-forward="true" selection-start-line="240" selection-end-line="240" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
-          <caret line="58" column="28" lean-forward="true" selection-start-line="58" selection-start-column="28" selection-end-line="58" selection-end-column="28" />
-          <folding>
-            <element signature="method#addTempHumData#0;class#PgTempHumRs#0" />
-          </folding>
+        <state relative-caret-position="340">
+          <caret line="148" column="34" selection-start-line="148" selection-start-column="34" selection-end-line="148" selection-end-column="34" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
+        <state relative-caret-position="458">
+          <caret line="99" column="35" selection-start-line="99" selection-start-column="35" selection-end-line="99" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+        <state relative-caret-position="384">
+          <caret line="145" column="32" lean-forward="true" selection-start-line="145" selection-start-column="32" selection-end-line="145" selection-end-column="32" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="414">
-          <caret line="22" column="46" lean-forward="true" selection-start-line="22" selection-start-column="46" selection-end-line="22" selection-end-column="46" />
-        </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="396">
-          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" column="83" selection-start-line="11" selection-start-column="83" selection-end-line="11" selection-end-column="83" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="26">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
-          <folding>
-            <element signature="method#getPgInPgStatusByPerson#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNumByName#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNum#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPersonListByDay#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPgStatusByPgInPgPerson#0;class#PgInPgStatusManager#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="44">
-          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-12">
-          <caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="87" lean-forward="true" selection-start-line="87" selection-end-line="87" />
-          <folding>
-            <element signature="method#getConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#addConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#deleteConstructionType#0;class#PgConstructionTypeRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
-          <folding>
-            <element signature="method#getConstructionTypeByType#0;class#PgConstructionTypeManager#0" />
-            <element signature="method#getAllConstructionTypeDto#0;class#PgConstructionTypeManager#0" />
-          </folding>
-        </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="145">
-          <caret line="258" column="9" lean-forward="true" selection-start-line="258" selection-start-column="9" selection-end-line="258" selection-end-column="9" />
-          <folding>
-            <element signature="method#getMonthInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayInPgStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgOverViewRs#0" />
-            <element signature="method#getAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getMonthAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayAlarmStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgOverViewRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="103">
-          <caret line="105" column="50" lean-forward="true" selection-start-line="105" selection-start-column="50" selection-end-line="105" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateBasicDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="99">
-          <caret line="125" selection-start-line="125" selection-end-line="125" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="190">
-          <caret line="24" column="35" lean-forward="true" selection-start-line="24" selection-start-column="35" selection-end-line="24" selection-end-column="35" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="436">
-          <caret line="24" lean-forward="true" selection-start-line="24" selection-end-line="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" lean-forward="true" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="300">
-          <caret line="34" column="31" lean-forward="true" selection-start-line="34" selection-start-column="31" selection-end-line="34" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="42" column="13" lean-forward="true" selection-start-line="42" selection-start-column="13" selection-end-line="42" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="120" column="72" lean-forward="true" selection-start-line="120" selection-start-column="72" selection-end-line="120" selection-end-column="72" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="293">
-          <caret line="58" column="73" lean-forward="true" selection-start-line="58" selection-start-column="73" selection-end-line="58" selection-end-column="73" />
-          <folding>
-            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
-            <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
-          </folding>
-        </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="307">
-          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
+        <state relative-caret-position="758">
+          <caret line="130" column="5" lean-forward="true" selection-start-line="130" selection-start-column="5" selection-end-line="130" selection-end-column="5" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1170">
-          <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
+        <state relative-caret-position="494">
+          <caret line="86" column="62" lean-forward="true" selection-start-line="86" selection-start-column="62" selection-end-line="86" selection-end-column="62" />
           <folding>
-            <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-            <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+            <element signature="method#getAllDevice#0;class#PgDeviceManager#0" />
+            <element signature="method#getAllDev#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="195" column="28" lean-forward="true" selection-start-line="195" selection-start-column="28" selection-end-line="195" selection-end-column="28" />
+        <state relative-caret-position="166">
+          <caret line="174" column="13" lean-forward="true" selection-start-line="174" selection-start-column="13" selection-end-line="174" selection-end-column="13" />
           <folding>
-            <element signature="method#getAlarmByTypeAndTime#0;class#PgAlarmManager#0" />
-            <element signature="method#getAlarmNum#0;class#PgAlarmManager#0" />
             <element signature="method#getDayAlarmStatistic#0;class#PgAlarmManager#0" />
+            <element signature="method#getAlarmList#0;class#PgAlarmManager#0" />
             <element signature="method#createDTO#0;class#PgAlarmManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="364">
+          <caret line="46" column="56" lean-forward="true" selection-start-line="46" selection-start-column="56" selection-end-line="46" selection-end-column="56" />
+          <folding>
+            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
+            <element signature="method#getPgDev#0;class#PgDeviceRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
+            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+        <state relative-caret-position="396">
+          <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
           <folding>
             <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
             <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -1365,52 +1331,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="239">
-          <caret line="21" column="33" lean-forward="true" selection-start-line="21" selection-start-column="33" selection-end-line="21" selection-end-column="33" />
-        </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="352">
-          <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-        </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="99">
-          <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-          </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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-          <folding>
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-            <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>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
index c436c93..e913155 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
@@ -132,7 +132,10 @@
             this.setAlarmType("");
         else
             this.setAlarmType(pgAlarm.getAlarmTypeId().getAlarmType());
-        this.setAlarmValue(pgAlarm.getAlarmValue());
+        if(pgAlarm.getAlarmValue()==null)
+            this.setAlarmValue("");
+        else
+            this.setAlarmValue(pgAlarm.getAlarmValue());
         if (pgAlarm.getAlarmDate() != null)
             this.setAlarmDate(sdf.format(pgAlarm.getAlarmDate()));
         else
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
index a43965c..565cb41 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -159,11 +159,21 @@
     }
 
     //获取历史报警消息列表
-    public List<PgAlarmDto> getAllAlarm(String alarmType,String startDay,String endDay,String isNew,int page,int rows) {
-        try {
+    public  Map<String, Object> getAllAlarm(String alarmType,String partition,String startDay,String endDay,String isNew,int page,int rows) {
 
+        Map<String, Object> resultMap = new HashMap<>();
+        String msg="";
+
+        try {
             Criteria criteria = createCriteria(PgAlarm.class);
 
+            if (StringUtils.isNotBlank(partition)) {
+                DetachedCriteria inCriteria = DetachedCriteria.forClass(PgDevice.class);
+                inCriteria.add(Restrictions.eq("partition", partition));
+                inCriteria.setProjection(Property.forName("id"));
+                criteria.add(Property.forName("alarmDevId").in(inCriteria));
+            }
+
             if (StringUtils.isNotBlank(alarmType)&&!alarmType.contains("全部")&&pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
                 criteria.add(Restrictions.eq("alarmTypeId", pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)));
 
@@ -190,8 +200,16 @@
             for (PgAlarm pgAlarm : pgAlarmList) {
                 pgAlarmDtoList.add(new PgAlarmDto(pgAlarm));
             }
-
-            return pgAlarmDtoList;
+            if(pgAlarmDtoList==null||pgAlarmDtoList.size()==0) {
+                resultMap.put("msg", "没有报警信息");
+                resultMap.put("code","0");
+            }else {
+                resultMap.put("code","200");
+                resultMap.put("msg", "报警信息获取成功");
+            }
+            resultMap.put("count",pg.getTotalCount());
+            resultMap.put("result",pgAlarmDtoList);
+            return resultMap;
         }
         catch(Exception ex){
             ex.printStackTrace();
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index 7547560..654f49e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -24,11 +24,11 @@
 
         Criteria criteria = createCriteria(PgDevice.class);
 
-        if(road!=null)
+        if(StringUtils.isNotBlank(road))
             criteria.add(Restrictions.eq("road",road));
-        if(partition!=null)
+        if(StringUtils.isNotBlank(partition))
             criteria.add(Restrictions.eq("partition",partition));
-        if(devType!=null)
+        if(StringUtils.isNotBlank(devType))
             criteria.add(Restrictions.eq("devType",devType));
 
         criteria.add(Restrictions.eq("active", 1));
@@ -43,6 +43,29 @@
         return pgDeviceDtoList;
     }
 
+    public List<PgDeviceDto> getAllDev(String road,String partition,String devType) {
+
+        Criteria criteria = createCriteria(PgDevice.class);
+
+        if(StringUtils.isNotBlank(road))
+            criteria.add(Restrictions.eq("road",road));
+        if(StringUtils.isNotBlank(partition))
+            criteria.add(Restrictions.eq("partition",partition));
+        if(StringUtils.isNotBlank(devType))
+            criteria.add(Restrictions.like("devType","%"+devType+"%"));
+
+        criteria.add(Restrictions.eq("active", 1));
+        criteria.addOrder(Order.desc("id"));
+        List<PgDevice> pgDeviceList = criteria.list();
+
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
+        for (PgDevice pgDevice : pgDeviceList) {
+            pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
+        }
+
+        return pgDeviceDtoList;
+    }
+
     //根据名字获取当前设备
     public PgDevice getDeviceByAssetCode(String assetCode) {
         Criteria criteria=createCriteria(PgDevice.class);
@@ -56,9 +79,9 @@
     }
 
     //根据类型获取设备列表
-    public List<PgDeviceDto> getDeviceByDevTypee(String devType) {
+    public List<PgDeviceDto> getDeviceByDevType(String devType) {
         Criteria criteria=createCriteria(PgDevice.class);
-        criteria.add(Restrictions.eq("devType",devType));
+        criteria.add(Restrictions.like("devType","%"+devType+"%"));
 
         List<PgDevice> pgDeviceList=criteria.list();
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
@@ -106,7 +129,7 @@
         criteria.add(Restrictions.eq("partition",partition));
 
         List<PgDevice> pgDeviceList=criteria.list();
-        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<PgDeviceDto>();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
 
         for (PgDevice pgDevice : pgDeviceList) {
             pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
index 3a3bccd..595730e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
@@ -1,10 +1,13 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.devTable.domain.PgAlarmType;
 import com.casic.PgInterface.devTable.domain.PgPartition;
 import com.casic.PgInterface.devTable.domain.PgRoad;
 import com.casic.PgInterface.devTable.domain.PipeGallery;
 import com.casic.PgInterface.devTable.dto.PgPartitionDto;
+import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
@@ -12,7 +15,9 @@
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Created by yxw on 2017/11/4.
@@ -21,7 +26,8 @@
 public class PgPartitionManager extends HibernateEntityDao<PgPartition> {
 
     @Resource
-    PgRoadManager pgRoadManager;
+    private PgRoadManager pgRoadManager;
+
 
     public PgPartition getPartitionByParName(String parName) {
         Criteria criteria = getSession().createCriteria(PgPartition.class);
@@ -99,4 +105,5 @@
         return pgPartitionDtoList;
     }
 
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
index f216360..a6928f1 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
@@ -5,6 +5,7 @@
 public class PgPlanResultRe {
 
     private String taskKey;
+    private List<String> pileAcuList;
     private List<PgPlanResult> pgPlanResultList;
 
     public String getTaskKey() {
@@ -15,6 +16,14 @@
         this.taskKey = taskKey;
     }
 
+    public List<String> getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(List<String> pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+
     public List<PgPlanResult> getPgPlanResultList() {
         return pgPlanResultList;
     }
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
index 71ea765..47eea07 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
@@ -54,9 +54,7 @@
 
         List<PgLineHole> pgLineHoleList=criteria.list();
         List<PgLineHoleDTO> pgLineHoleDTOList=new ArrayList<>();
-        if(pgLineHoleList==null||pgLineHoleList.size()==0)
-            return null;
-        else
+        if(pgLineHoleList!=null&&pgLineHoleList.size()!=0)
             pgLineHoleDTOList=PgLineHoleDTO.ConvertToDTOList(pgLineHoleList,pgPileAcuManager,pgRoadManager);
         return pgLineHoleDTOList;
     }
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
index 0fd9e1f..841a386 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
@@ -1,12 +1,15 @@
 package com.casic.PgInterface.intelPlan.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.devTable.domain.PgPartition;
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
 import com.casic.PgInterface.intelPlan.domain.PgLineHole;
 import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
 import com.casic.PgInterface.intelPlan.domain.PgSection;
 import com.casic.PgInterface.intelPlan.dto.PgPlanResult;
 import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
 import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -22,6 +25,9 @@
     @Resource
     private PgLineHoleManager pgLineHoleManager;
 
+    @Resource
+    private PgRoadManager pgRoadManager;
+
     public PgPileAcu getPgPileAcuByCode(String acuCode){
         List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
 
@@ -58,7 +64,9 @@
         for(PgPlanTask pgPlanTask:pgPlanTaskList){
             List<PgPlanResult> pgPlanResultList=getPgPlanResultByPlantask(pgPlanTask);
             PgPlanResultRe pgPlanResultRe=new PgPlanResultRe();
+
             pgPlanResultRe.setTaskKey(pgPlanTask.getTaskKey());
+            pgPlanResultRe.setPileAcuList(pgPlanTask.getPileAcuList());
             pgPlanResultRe.setPgPlanResultList(pgPlanResultList);
 
             pgPlanResultReList.add(pgPlanResultRe);
@@ -142,4 +150,57 @@
         return length;
     }
 
+    private PgPileAcu getPgPileAcuByAcuCode(String acuCode){
+        List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
+
+        if(pgPileAcuList==null||pgPileAcuList.size()==0)
+            return null;
+        else
+            return pgPileAcuList.get(0);
+    }
+
+    public List<PgAcuTask> getACUTask(String pileAcuList){
+        String[] acuArray=pileAcuList.split(",");
+        List<PgAcuTask> pgAcuTaskList=new ArrayList<>();
+
+        for(String acu:acuArray){
+            PgPileAcu pgPileAcu=this.getPgPileAcuByCode(acu);
+            String roadName=pgRoadManager.get(pgPileAcu.getRoadId()).getRoadName();
+
+            if(!containRoad(roadName,pgAcuTaskList))
+            {
+                PgAcuTask pgAcuTask=new PgAcuTask();
+                pgAcuTask.setRoadName(roadName);
+                pgAcuTask.setPileAcuList(acu);
+                pgAcuTaskList.add(pgAcuTask);
+            }
+            else{
+                PgAcuTask pgAcuTask=getIndexRoad(roadName,pgAcuTaskList);
+                if(pgAcuTask!=null)
+                    pgAcuTask.setPileAcuList(pgAcuTask.getPileAcuList()+","+acu);
+            }
+        }
+
+        return pgAcuTaskList;
+    }
+
+    private boolean containRoad(String roadName,List<PgAcuTask> pgAcuTaskList){
+        if(pgAcuTaskList==null||pgAcuTaskList.size()==0) return false;
+        for(PgAcuTask pgAcuTask:pgAcuTaskList){
+            if(pgAcuTask.getRoadName().equals(roadName))
+                return true;
+        }
+
+        return false;
+    }
+
+    private PgAcuTask getIndexRoad(String roadName, List<PgAcuTask> pgAcuTaskList){
+        for(PgAcuTask pgAcuTask:pgAcuTaskList){
+            if(pgAcuTask.getRoadName().equals(roadName))
+                return pgAcuTask;
+        }
+
+        return null;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java
new file mode 100644
index 0000000..323f7ef
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java
@@ -0,0 +1,25 @@
+package com.casic.PgInterface.reservePlan.dto;
+
+import java.util.List;
+
+public class PgAcuTask {
+
+    private String roadName;//道路
+    private String pileAcuList;//acu分区
+
+    public String getRoadName() {
+        return roadName;
+    }
+
+    public void setRoadName(String roadName) {
+        this.roadName = roadName;
+    }
+
+    public String getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(String pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
index c25e926..c7d7693 100644
--- a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
@@ -70,9 +70,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(Long.valueOf(inPgPersonId));
         PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("hostName",pgInPgPerson.getAssetCode());
-//        PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode());
-//        long maxId = pgTagPositionManager.getMaxId(pgTagMac.getTagMac());
-//        PGTagPosition pgTagPosition = pgTagPositionManager.get(maxId);
+
         PGTagPosition pgTagPosition = tagmacRun.GetTagStatus(pgTagMac);
         boolean bExist = false;
         bExist = pgTagPositionManager.findTagPosition(pgTagPosition.getPositionUpdatetime(),pgTagPosition.getHostId());
@@ -104,8 +102,7 @@
         PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(Long.valueOf(inPgPersonId));
         PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pgInPgPersonId",pgInPgPerson);
         System.out.println("time:"+pgInPgStatus.getInTime());
-//        PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pgInPgPersonId",inPgPersonId);
-//        PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode());
+
         PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("hostName",pgInPgPerson.getAssetCode());
 
         Map<Object,Object> mapPosition = new HashMap<>();
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
index 082ba5d..3eed00a 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
@@ -48,6 +48,7 @@
     public Map<String, Object> linkDevice(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         PgDeviceDto pgDeviceDto = null;
         try {
@@ -62,6 +63,7 @@
                     else {
                         pgDeviceDto = new PgDeviceDto(pgDevice);
                         msg = "报警关联设备获取成功";
+                        code="200";
                     }
                 }
             }
@@ -71,6 +73,7 @@
             e.printStackTrace();
             msg = "获取关联设备失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceDto);
 
@@ -86,6 +89,7 @@
     public Map<String, Object> linkPartitionCamera(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
         try {
@@ -106,6 +110,7 @@
 
                         pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(partition,position);
                         msg = "关联设备获取成功";
+                        code="200";
                     }
                 }
             }
@@ -115,6 +120,7 @@
             e.printStackTrace();
             msg = "分区设备关联失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceDtoList);
         return resultMap;
@@ -129,6 +135,7 @@
     public Map<String, Object> linkReservePlan(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgReservePlanDto> pgReservePlanDtoList=new ArrayList<>();
         try{
@@ -139,10 +146,12 @@
                 else {
                     pgReservePlanDtoList = pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
 
-                    if(pgReservePlanDtoList==null||pgReservePlanDtoList.size()==0)
-                        msg="不存在关联的报警预案";
-                    else
+                    if (pgReservePlanDtoList == null || pgReservePlanDtoList.size() == 0)
+                        msg = "不存在关联的报警预案";
+                    else {
                         msg = "关联预案获取成功";
+                        code="200";
+                    }
                 }
             }
             else
@@ -153,6 +162,7 @@
             e.printStackTrace();
             msg="预案关联失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgReservePlanDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
index 0ddbc4d..0ce886b 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
@@ -41,25 +41,19 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getAlarmList(@FormParam("alarmType") String alarmType,
                                             @FormParam("startDay") String startDay,
+                                            @FormParam("partition") String partition,
                                             @FormParam("endDay") String endDay,
                                             @FormParam("isNew") String isNew,
                                             @FormParam("page") int page,
                                             @FormParam("rows") int rows) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
         try {
-            pgAlarmDtoList = pgAlarmManager.getAllAlarm(alarmType,startDay,endDay,isNew,page,rows);
-            if (pgAlarmDtoList==null||pgAlarmDtoList.size() == 0)
-                msg = "没有报警信息";
-            else
-                msg = "报警信息获取成功";
+            resultMap = pgAlarmManager.getAllAlarm(alarmType,partition,startDay,endDay,isNew,page,rows);
+
         } catch (Exception e) {
             e.printStackTrace();
-            msg = "报警信息获取失败";
         }
-        resultMap.put("msg", msg);
-        resultMap.put("result", pgAlarmDtoList);
         return resultMap;
     }
 
@@ -71,9 +65,10 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> clearAlarmList(@FormParam("id") String id) throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        String result = "false";
+        String result = "";
+        String code="0";
 
         try {
             PgAlarm pgAlarm = new PgAlarm();
@@ -86,12 +81,14 @@
                 pgAlarmManager.save(pgAlarm);
                 msg = "报警信息清除成功";
                 result = "true";
+                code = "200";
             }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警信息清除失败";
             result = "false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
@@ -106,21 +103,26 @@
     public Map<String, Object> getAlarmByTypeOrTime(@FormParam("alarmType") String alarmType,
                                                     @FormParam("startTime") String startTime,
                                                     @FormParam("endTime") String endTime) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
-        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<PgAlarmDto>();
+        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
         try {
             pgAlarmDtoList = pgAlarmManager.getAlarmByTypeAndTime(alarmType, startTime, endTime);
             if (pgAlarmDtoList == null || pgAlarmDtoList.size() == 0)
                 msg = "报警信息不存在";
             else
+            {
                 msg = "报警信息获取成功";
+                code="200";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警信息获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
index 29ce8a4..ed0bf34 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
@@ -39,8 +39,8 @@
     public Map<String, Object> getAlarmRule(@FormParam("devType") String devType) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
-        System.out.println("devType:"+devType);
         List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<>();
         try {
             pgAlarmRuleDtoList = pgAlarmRuleManager.getAlarmRuleDto(devType);
@@ -52,6 +52,7 @@
             e.printStackTrace();
             msg = "报警阈值信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmRuleDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
index 24ab894..abef1b1 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
@@ -39,16 +39,21 @@
                                                      @FormParam("endDate") String endDate)throws Exception{
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
+
         List<PgAlarmTjDto> pgAlarmTjDtoList=null;
         try{
             pgAlarmTjDtoList=pgAlarmTjManager.getAlarmTjResultByType(startDate,endDate);
             msg="获取成功";
+            code="200";
         }
         catch(Exception ex) {
             msg = "统计失败";
         }
-        resultMap.put("result",pgAlarmTjDtoList);
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
+        resultMap.put("result",pgAlarmTjDtoList);
+
         return resultMap;
     }
 
@@ -61,23 +66,27 @@
     public Map<String, Object> getAlarmByTime(@FormParam("startTime") String startTime,
                                               @FormParam("endTime") String endTime,
                                               @FormParam("statisticType") String statisticType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code = "0";
 
-        List<PgAlarmTjDto> pgAlarmTjDtoList = new ArrayList<PgAlarmTjDto>();
+        List<PgAlarmTjDto> pgAlarmTjDtoList = new ArrayList<>();
         try {
             pgAlarmTjDtoList = pgAlarmTjManager.getAlarmByTime(startTime, endTime, statisticType);
             if(pgAlarmTjDtoList==null)
                 msg="报警统计信息获取失败";
-            else
-                msg="报警统计信息获取成功";
+            else {
+                msg = "报警统计信息获取成功";
+                code="200";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警统计信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmTjDtoList);
         return resultMap;
     }
 
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
index 28bc811..b6278a9 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
@@ -30,7 +30,6 @@
     @Resource
     private PgAlarmTypeManager pgAlarmTypeManager;
 
-
     /**
      * 获取报警类型
      */
@@ -38,19 +37,24 @@
     @Path("getAlarmType")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getAlarmTypeList()throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
-        List<PgAlarmTypeDto> pgAlarmTypeDtoList=new ArrayList<PgAlarmTypeDto>();
+        String code="";
+
+        List<PgAlarmTypeDto> pgAlarmTypeDtoList=new ArrayList<>();
         try {
             pgAlarmTypeDtoList = pgAlarmTypeManager.getAllAlarmTypeDto();
             if(pgAlarmTypeDtoList.size()==0)
                 msg="没有报警类型信息";
-            else
-                msg="报警类型信息获取成功";
+            else {
+                code="200";
+                msg = "报警类型信息获取成功";
+            }
         }catch(Exception e){
             e.printStackTrace();
             msg="报警类型信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAlarmTypeDtoList);
         return resultMap;
@@ -66,6 +70,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
@@ -83,6 +88,7 @@
                 logger.info("成功保存");
                 result = "true";
                 msg = "保存成功";
+                code="200";
             }
         } catch (Exception e) {
             result = "false";
@@ -90,6 +96,7 @@
             e.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -106,6 +113,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try{
             if(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
@@ -119,6 +127,7 @@
                 pgAlarmTypeManager.save(pgAlarmType);
                 result = "true";
                 msg = "编辑成功";
+                code="200";
             }
         }
         catch(Exception e)
@@ -128,6 +137,7 @@
             e.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("result",result);
         resultMap.put("msg",msg);
 
@@ -146,6 +156,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
         String result="false";
+        String code="0";
 
         try {
             PgAlarmType pgAlarmType=pgAlarmTypeManager.get(Long.valueOf(id));
@@ -157,6 +168,7 @@
             {
                 pgAlarmType.setActive(0);
                 pgAlarmTypeManager.save(pgAlarmType);
+                code="200";
                 msg="报警类型删除成功";
                 result="true";
             }
@@ -165,6 +177,7 @@
             msg="报警类型删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
index 4533e1a..85940bb 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
@@ -33,12 +33,15 @@
                                                  @FormParam("inSpectionPlace") String inSpectionPlace){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
         List<PgAssetPlanDto> pgAssetPlanDtoList=new ArrayList<>();
         try{
             pgAssetPlanDtoList=pgAssetPlanManager.getPgAssetPlanDtoList(startDay,endDay,inSpectionPlace);
-            if(pgAssetPlanDtoList!=null&&pgAssetPlanDtoList.size()!=0)
-                msg="巡检信息获取成功";
+            if(pgAssetPlanDtoList!=null&&pgAssetPlanDtoList.size()!=0) {
+                code="200";
+                msg = "巡检信息获取成功";
+            }
             else
                 msg="不存在巡检信息";
         }
@@ -47,6 +50,7 @@
             msg="巡检信息获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAssetPlanDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
index 47ef9d1..5cbdfcb 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
@@ -30,12 +30,15 @@
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
         String result="";
+        String code="0";
 
         List<PgAssetPlanStatic> pgAssetPlanStaticList = null;
         try{
             pgAssetPlanStaticList=pgAssetPlanManager.getPgAssetPlanStaticLisByTime(startTime,endTime,staticType);
-            if(pgAssetPlanStaticList!=null&&pgAssetPlanStaticList.size()!=0)
-                msg="巡检统计信息获取成功";
+            if(pgAssetPlanStaticList!=null&&pgAssetPlanStaticList.size()!=0) {
+                code = "200";
+                msg = "巡检统计信息获取成功";
+            }
             else
                 msg="统计信息获取失败";
         }
@@ -44,6 +47,7 @@
             msg="统计失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAssetPlanStaticList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
index 26f5d6a..503bfe3 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
@@ -40,6 +40,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="";
 
         try{
             PgAuthority pgAuthority=new PgAuthority();
@@ -50,6 +51,7 @@
 
             pgAuthorityManager.save(pgAuthority);
             msg="用户权限保存成功";
+            code="200";
             result="true";
         }
         catch(Exception e) {
@@ -57,6 +59,7 @@
             msg = "新增权限失败";
             result = "false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -65,22 +68,25 @@
 
     /*
        *编辑角权限信息
-        */
+    */
     @POST
     @Path("editAuthority")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> editAuthority(@FormParam("id") String id,
                                        @FormParam("authority") String authority,
                                        @FormParam("concent") String concent) throws Exception{
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
+
         try {
             PgAuthority pgAuthority=pgAuthorityManager.get(Long.valueOf(id));
             pgAuthority.setAuthority(authority);
             pgAuthority.setConcent(concent);
 
             pgAuthorityManager.save(pgAuthority);
+            code="200";
             msg="权限保存成功";
             result="true";
         }
@@ -90,7 +96,7 @@
             msg="权限编辑失败";
             result="false";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -105,9 +111,10 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> deleteAuthority(@FormParam("id") String id)throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
-        String result="false";
+        String result="";
+        String code="0";
 
         try {
             PgAuthority pgAuthority= pgAuthorityManager.get(Long.valueOf(id));
@@ -119,6 +126,7 @@
             {
                 pgAuthority.setActive(0);
                 pgAuthorityManager.save(pgAuthority);
+                code="200";
                 msg="删除权限成功";
                 result="true";
             }
@@ -127,37 +135,40 @@
             msg="删除权限失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
     }
 
     /*
-* 获取权限信息
- */
+    * 获取权限信息
+    */
     @POST
     @Path("getAuthorityList")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> getAuthorityList() {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgAuthorityDto> pgAuthorityDtoList = new ArrayList<PgAuthorityDto>();
         try {
             pgAuthorityDtoList = pgAuthorityManager.getAuthorityList();
             if (pgAuthorityDtoList == null)
                 msg = "不存在权限信息";
-            else
+            else {
+                code = "200";
                 msg = "权限信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "权限信息获取是失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAuthorityDtoList);
         return resultMap;
     }
 
 
-
-
 }

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 25ded8a..283d7ab 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,20 +7,56 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" 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/construction/manager/PgCsDocumentManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/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/manager/PgAlarmManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/~$说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/~$说明20191207.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.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$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/接口说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明20191207.docx" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
@@ -51,7 +87,7 @@
         <counts>
           <entry key="class" value="4" />
           <entry key="iml" value="2" />
-          <entry key="java" value="707" />
+          <entry key="java" value="820" />
           <entry key="properties" value="14" />
           <entry key="xml" value="7" />
         </counts>
@@ -60,7 +96,7 @@
         <counts>
           <entry key="CLASS" value="4" />
           <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="707" />
+          <entry key="JAVA" value="820" />
           <entry key="Properties" value="14" />
           <entry key="XML" value="7" />
         </counts>
@@ -68,32 +104,32 @@
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
           <entry key="dummy" value="38" />
-          <entry key="java" value="30161" />
+          <entry key="java" value="40859" />
           <entry key="properties" value="100" />
-          <entry key="txt" value="176" />
+          <entry key="txt" value="186" />
           <entry key="xml" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="30161" />
-          <entry key="PLAIN_TEXT" value="214" />
+          <entry key="JAVA" value="40859" />
+          <entry key="PLAIN_TEXT" value="224" />
           <entry key="Properties" value="100" />
           <entry key="XML" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="48" />
+          <entry key="project.closed" value="51" />
           <entry key="project.open.time.1" value="5" />
           <entry key="project.open.time.12" value="2" />
           <entry key="project.open.time.13" value="1" />
           <entry key="project.open.time.15" value="1" />
           <entry key="project.open.time.16" value="1" />
           <entry key="project.open.time.17" value="1" />
-          <entry key="project.open.time.2" value="1" />
+          <entry key="project.open.time.2" value="2" />
           <entry key="project.open.time.20" value="1" />
-          <entry key="project.open.time.23" value="1" />
+          <entry key="project.open.time.23" value="2" />
           <entry key="project.open.time.24" value="2" />
           <entry key="project.open.time.251" value="1" />
           <entry key="project.open.time.27" value="2" />
@@ -106,8 +142,8 @@
           <entry key="project.open.time.36" value="1" />
           <entry key="project.open.time.37" value="1" />
           <entry key="project.open.time.39" value="2" />
-          <entry key="project.open.time.4" value="2" />
-          <entry key="project.open.time.40" value="1" />
+          <entry key="project.open.time.4" value="3" />
+          <entry key="project.open.time.40" value="2" />
           <entry key="project.open.time.41" value="2" />
           <entry key="project.open.time.42" value="2" />
           <entry key="project.open.time.43" value="2" />
@@ -122,23 +158,25 @@
           <entry key="project.open.time.6" value="3" />
           <entry key="project.open.time.63" value="2" />
           <entry key="project.open.time.64" value="1" />
+          <entry key="project.open.time.66" value="1" />
           <entry key="project.open.time.71" value="2" />
+          <entry key="project.open.time.74" value="1" />
           <entry key="project.open.time.76" value="1" />
           <entry key="project.open.time.8" value="2" />
           <entry key="project.open.time.9" value="1" />
           <entry key="project.open.time.97" value="1" />
-          <entry key="project.opened" value="78" />
+          <entry key="project.opened" value="84" />
         </counts>
       </usages-collector>
     </session>
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+            <state relative-caret-position="396">
+              <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
               <folding>
                 <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
                 <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -147,73 +185,6 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <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="99">
-              <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-              <folding>
-                <element signature="imports" expanded="true" />
-                <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-1170">
-              <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state>
-              <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
-              <folding>
-                <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-                <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="true">
-        <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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-              <folding>
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-                <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>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <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="352">
-              <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -225,18 +196,9 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>inCriteria</find>
-      <find>getPgPlanResulList</find>
-      <find>getPileAcuListByPileAcuStr</find>
-      <find>distinct</find>
-      <find>order</find>
-      <find>canPlanLine</find>
-      <find>isExistLine</find>
-      <find>getPlanResult</find>
       <find>pgPipeLine</find>
       <find>getPipeLineBylineName</find>
       <find>StringU</find>
-      <find>getAllAlarm</find>
       <find>getAlarmList</find>
       <find>getPgInPersonListByDay</find>
       <find>getDayInPgStatistic</find>
@@ -254,7 +216,16 @@
       <find>getPgContructionByNameOrType</find>
       <find>&quot;&quot;,&quot;&quot;,</find>
       <find>getPgContructionDtoByNameOrType</find>
+      <find>addConstruction</find>
+      <find>getPgLineAcuHole</find>
+      <find>getPlanResult</find>
       <find>getConstruction</find>
+      <find>addPipeLine</find>
+      <find>未找到入廊数据</find>
+      <find>getCurrentHoleByAcu</find>
+      <find>getAllAlarm</find>
+      <find>getPgDeviceDtoListByPartition</find>
+      <find>getPgDeviceByDevType</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -263,57 +234,57 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlan.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileHoleManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/planData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/PlanData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
       </list>
     </option>
   </component>
@@ -359,7 +330,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -421,53 +391,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="dto" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="manager" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -479,29 +402,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="rs" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -516,6 +416,7 @@
         </subPane>
       </pane>
       <pane id="Scope" />
+      <pane id="PackagesPane" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -710,7 +611,13 @@
       <workItem from="1574902733573" duration="1829000" />
       <workItem from="1574998240004" duration="7016000" />
       <workItem from="1575247959683" duration="6997000" />
-      <workItem from="1575704345590" duration="40473000" />
+      <workItem from="1575704345590" duration="69381000" />
+      <workItem from="1575869479666" duration="721000" />
+      <workItem from="1575947104878" duration="6101000" />
+      <workItem from="1576128264436" duration="3347000" />
+      <workItem from="1576208571543" duration="22000" />
+      <workItem from="1576227513917" duration="862000" />
+      <workItem from="1576293721220" duration="18246000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -817,11 +724,18 @@
       <option name="project" value="LOCAL" />
       <updated>1575775489149</updated>
     </task>
-    <option name="localTasksCounter" value="16" />
+    <task id="LOCAL-00016" summary="整改施工信息">
+      <created>1575791780774</created>
+      <option name="number" value="00016" />
+      <option name="presentableId" value="LOCAL-00016" />
+      <option name="project" value="LOCAL" />
+      <updated>1575791780774</updated>
+    </task>
+    <option name="localTasksCounter" value="17" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="452131000" />
+    <option name="totallyTimeSpent" value="510338000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -834,9 +748,8 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
-    <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.24205749" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2647504" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -847,7 +760,7 @@
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.3295082" />
       <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.4819672" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.65737706" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.3295082" />
@@ -939,7 +852,8 @@
     <MESSAGE value="重新设计智能规划部分" />
     <MESSAGE value="完成智能规划对接" />
     <MESSAGE value="修改报警统计" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改报警统计" />
+    <MESSAGE value="整改施工信息" />
+    <option name="LAST_COMMIT_MESSAGE" value="整改施工信息" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -951,16 +865,10 @@
           <option name="timeStamp" value="3" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java</url>
-          <line>69</line>
+          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java</url>
+          <line>40</line>
           <properties />
-          <option name="timeStamp" value="21" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java</url>
-          <line>96</line>
-          <properties />
-          <option name="timeStamp" value="38" />
+          <option name="timeStamp" value="122" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
@@ -970,394 +878,452 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <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="2068">
-          <caret line="154" column="35" selection-start-line="154" selection-start-column="35" selection-end-line="154" selection-end-column="35" />
-        </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="3300">
-          <caret line="297" column="22" selection-start-line="297" selection-start-column="22" selection-end-line="297" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/StringUtils.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
-          <caret line="13" column="48" lean-forward="true" selection-start-line="13" selection-start-column="48" selection-end-line="13" selection-end-column="48" />
+          <caret line="11" column="5" selection-start-line="11" selection-start-column="5" selection-end-line="11" selection-end-column="5" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="78" lean-forward="true" selection-start-line="78" selection-end-line="78" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="616">
-          <caret line="41" column="1" selection-start-line="41" selection-start-column="1" selection-end-line="41" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="110">
-          <caret line="12" column="23" selection-start-line="12" selection-start-column="23" selection-end-line="12" selection-end-column="23" />
+        <state relative-caret-position="516">
+          <caret line="114" column="12" selection-start-line="114" selection-start-column="12" selection-end-line="114" selection-end-column="12" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="164">
-          <caret line="56" lean-forward="true" selection-start-line="56" selection-end-line="56" />
+        <state relative-caret-position="418">
+          <caret line="33" column="44" selection-start-line="33" selection-start-column="44" selection-end-line="33" selection-end-column="44" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="258">
-          <caret line="27" column="12" lean-forward="true" selection-start-line="27" selection-start-column="12" selection-end-line="27" selection-end-column="12" />
+        <state relative-caret-position="132">
+          <caret line="11" column="20" lean-forward="true" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="20" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.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="-12">
-          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        <state relative-caret-position="516">
+          <caret line="142" column="54" selection-start-line="142" selection-start-column="54" selection-end-line="142" selection-end-column="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="858">
-          <caret line="55" column="27" lean-forward="true" selection-start-line="55" selection-start-column="27" selection-end-line="55" selection-end-column="27" />
+        <state relative-caret-position="66">
+          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="58">
+          <caret line="18" column="28" selection-start-line="18" selection-start-column="19" selection-end-line="18" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="305">
+          <caret line="24" column="31" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="714">
+          <caret line="58" column="5" lean-forward="true" selection-start-line="58" selection-start-column="5" selection-end-line="58" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="924">
+          <caret line="134" column="92" selection-start-line="134" selection-start-column="92" selection-end-line="134" selection-end-column="92" />
+          <folding>
+            <element signature="method#linkDevice#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkPartitionCamera#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkReservePlan#0;class#PgAlarmLinkRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1066">
+          <caret line="90" lean-forward="true" selection-start-line="90" selection-end-line="90" />
+          <folding>
+            <element signature="method#getTjResultByAlarmType#0;class#PgAlarmTjRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="946">
+          <caret line="148" column="11" lean-forward="true" selection-start-line="148" selection-start-column="11" selection-end-line="148" selection-end-column="11" />
+          <folding>
+            <element signature="method#getAlarmTypeList#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#addAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#editAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#deleteAlarmType#0;class#PgAlarmTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="208">
+          <caret line="46" column="23" lean-forward="true" selection-start-line="46" selection-start-column="23" selection-end-line="46" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="113" column="9" lean-forward="true" selection-start-line="113" selection-start-column="9" selection-end-line="113" selection-end-column="9" />
+          <folding>
+            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
+            <element signature="method#getNewestCh4InfoByDev#0;class#PgCh4Rs#0" />
+            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="145" column="6" lean-forward="true" selection-start-line="145" selection-start-column="6" selection-end-line="145" selection-end-column="6" />
+          <folding>
+            <element signature="method#addAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#editAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#deleteAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#getAuthorityList#0;class#PgAuthorityRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="58" column="1" lean-forward="true" selection-start-line="58" selection-start-column="1" selection-end-line="58" selection-end-column="1" />
+          <folding>
+            <element signature="method#getPgAssetPlanList#0;class#PgAssetPlanRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="370">
+          <caret line="371" column="66" selection-start-line="371" selection-start-column="66" selection-end-line="371" selection-end-column="66" />
+          <folding>
+            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#searchConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionDev#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="139" column="13" lean-forward="true" selection-start-line="139" selection-start-column="13" selection-end-line="139" selection-end-column="13" />
+          <folding>
+            <element signature="method#getCoInfoByDevAndDate#0;class#PgCoRs#0" />
+            <element signature="method#getNewestCoInfoByDev#0;class#PgCoRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="540">
+          <caret line="223" column="5" lean-forward="true" selection-start-line="223" selection-start-column="5" selection-end-line="223" selection-end-column="5" />
+          <folding>
+            <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="682">
+          <caret line="100" lean-forward="true" selection-start-line="100" selection-end-line="100" />
+          <folding>
+            <element signature="method#getDeviceTpeyList#0;class#PgDeviceTypeRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="377">
+          <caret line="225" column="35" selection-start-line="225" selection-start-column="35" selection-end-line="225" selection-end-column="35" />
+          <folding>
+            <element signature="method#addEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#addEquipment#1;class#PgEquipmentRs#0" />
+            <element signature="method#getEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#deleteEquipment#0;class#PgEquipmentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="406">
+          <caret line="109" lean-forward="true" selection-start-line="109" selection-end-line="109" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="154">
+          <caret line="28" column="19" selection-start-line="28" selection-start-column="19" selection-end-line="28" selection-end-column="19" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="748">
-          <caret line="49" column="5" lean-forward="true" selection-start-line="49" selection-start-column="5" selection-end-line="49" selection-end-column="5" />
+        <state relative-caret-position="296">
+          <caret line="161" column="35" selection-start-line="161" selection-start-column="35" selection-end-line="161" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="384">
+          <caret line="99" column="5" lean-forward="true" selection-start-line="99" selection-start-column="5" selection-end-line="99" selection-end-column="5" />
+        </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="362">
+          <caret line="340" column="35" selection-start-line="340" selection-start-column="35" selection-end-line="340" selection-end-column="35" />
+          <folding>
+            <element signature="method#addInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPersonInPg#0;class#PgInPgPersonRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-606">
+          <caret line="76" column="20" lean-forward="true" selection-start-line="76" selection-start-column="20" selection-end-line="76" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="65" column="35" selection-start-line="65" selection-start-column="35" selection-end-line="65" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="101" column="35" selection-start-line="101" selection-start-column="35" selection-end-line="101" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="84" column="35" selection-start-line="84" selection-start-column="35" selection-end-line="84" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="59" lean-forward="true" selection-start-line="59" selection-end-line="59" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="60" column="1" lean-forward="true" selection-start-line="60" selection-start-column="1" selection-end-line="60" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="145" column="35" selection-start-line="145" selection-start-column="35" selection-end-line="145" selection-end-column="35" />
+        </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="274">
+          <caret line="350" column="35" selection-start-line="350" selection-start-column="35" selection-end-line="350" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="121" column="39" selection-start-line="121" selection-start-column="39" selection-end-line="121" selection-end-column="39" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="28" column="8" lean-forward="true" selection-start-line="28" selection-start-column="8" selection-end-line="28" selection-end-column="8" />
+        <state relative-caret-position="340">
+          <caret line="103" selection-start-line="103" selection-end-line="103" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="226" column="35" selection-start-line="226" selection-start-column="35" selection-end-line="226" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="203" column="35" selection-start-line="203" selection-start-column="35" selection-end-line="203" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="241" column="35" selection-start-line="241" selection-start-column="35" selection-end-line="241" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="225" column="1" lean-forward="true" selection-start-line="225" selection-start-column="1" selection-end-line="225" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="176" column="5" lean-forward="true" selection-start-line="176" selection-start-column="5" selection-end-line="176" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="178" column="35" lean-forward="true" selection-start-line="178" selection-start-column="35" selection-end-line="178" selection-end-column="35" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="516">
-          <caret line="94" column="53" selection-start-line="94" selection-start-column="53" selection-end-line="94" selection-end-column="53" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="814">
-          <caret line="52" column="9" lean-forward="true" selection-start-line="52" selection-start-column="9" selection-end-line="52" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="182">
-          <caret line="58" column="12" lean-forward="true" selection-start-line="58" selection-start-column="12" selection-end-line="58" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="34" lean-forward="true" selection-start-line="34" selection-end-line="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="32" lean-forward="true" selection-start-line="32" selection-end-line="32" />
-          <folding>
-            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
-            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="185">
-          <caret line="63" column="13" selection-start-line="63" selection-start-column="13" selection-end-line="63" selection-end-column="13" />
-          <folding>
-            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
-            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
-            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="e#6319#6324#0" />
-            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
-          </folding>
+          <caret line="240" lean-forward="true" selection-start-line="240" selection-end-line="240" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
-          <caret line="58" column="28" lean-forward="true" selection-start-line="58" selection-start-column="28" selection-end-line="58" selection-end-column="28" />
-          <folding>
-            <element signature="method#addTempHumData#0;class#PgTempHumRs#0" />
-          </folding>
+        <state relative-caret-position="340">
+          <caret line="148" column="34" selection-start-line="148" selection-start-column="34" selection-end-line="148" selection-end-column="34" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
+        <state relative-caret-position="458">
+          <caret line="99" column="35" selection-start-line="99" selection-start-column="35" selection-end-line="99" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+        <state relative-caret-position="384">
+          <caret line="145" column="32" lean-forward="true" selection-start-line="145" selection-start-column="32" selection-end-line="145" selection-end-column="32" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="414">
-          <caret line="22" column="46" lean-forward="true" selection-start-line="22" selection-start-column="46" selection-end-line="22" selection-end-column="46" />
-        </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="396">
-          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" column="83" selection-start-line="11" selection-start-column="83" selection-end-line="11" selection-end-column="83" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="26">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
-          <folding>
-            <element signature="method#getPgInPgStatusByPerson#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNumByName#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNum#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPersonListByDay#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPgStatusByPgInPgPerson#0;class#PgInPgStatusManager#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="44">
-          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-12">
-          <caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="87" lean-forward="true" selection-start-line="87" selection-end-line="87" />
-          <folding>
-            <element signature="method#getConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#addConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#deleteConstructionType#0;class#PgConstructionTypeRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
-          <folding>
-            <element signature="method#getConstructionTypeByType#0;class#PgConstructionTypeManager#0" />
-            <element signature="method#getAllConstructionTypeDto#0;class#PgConstructionTypeManager#0" />
-          </folding>
-        </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="145">
-          <caret line="258" column="9" lean-forward="true" selection-start-line="258" selection-start-column="9" selection-end-line="258" selection-end-column="9" />
-          <folding>
-            <element signature="method#getMonthInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayInPgStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgOverViewRs#0" />
-            <element signature="method#getAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getMonthAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayAlarmStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgOverViewRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="103">
-          <caret line="105" column="50" lean-forward="true" selection-start-line="105" selection-start-column="50" selection-end-line="105" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateBasicDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="99">
-          <caret line="125" selection-start-line="125" selection-end-line="125" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="190">
-          <caret line="24" column="35" lean-forward="true" selection-start-line="24" selection-start-column="35" selection-end-line="24" selection-end-column="35" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="436">
-          <caret line="24" lean-forward="true" selection-start-line="24" selection-end-line="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" lean-forward="true" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="300">
-          <caret line="34" column="31" lean-forward="true" selection-start-line="34" selection-start-column="31" selection-end-line="34" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="42" column="13" lean-forward="true" selection-start-line="42" selection-start-column="13" selection-end-line="42" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="120" column="72" lean-forward="true" selection-start-line="120" selection-start-column="72" selection-end-line="120" selection-end-column="72" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="293">
-          <caret line="58" column="73" lean-forward="true" selection-start-line="58" selection-start-column="73" selection-end-line="58" selection-end-column="73" />
-          <folding>
-            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
-            <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
-          </folding>
-        </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="307">
-          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
+        <state relative-caret-position="758">
+          <caret line="130" column="5" lean-forward="true" selection-start-line="130" selection-start-column="5" selection-end-line="130" selection-end-column="5" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1170">
-          <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
+        <state relative-caret-position="494">
+          <caret line="86" column="62" lean-forward="true" selection-start-line="86" selection-start-column="62" selection-end-line="86" selection-end-column="62" />
           <folding>
-            <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-            <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+            <element signature="method#getAllDevice#0;class#PgDeviceManager#0" />
+            <element signature="method#getAllDev#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="195" column="28" lean-forward="true" selection-start-line="195" selection-start-column="28" selection-end-line="195" selection-end-column="28" />
+        <state relative-caret-position="166">
+          <caret line="174" column="13" lean-forward="true" selection-start-line="174" selection-start-column="13" selection-end-line="174" selection-end-column="13" />
           <folding>
-            <element signature="method#getAlarmByTypeAndTime#0;class#PgAlarmManager#0" />
-            <element signature="method#getAlarmNum#0;class#PgAlarmManager#0" />
             <element signature="method#getDayAlarmStatistic#0;class#PgAlarmManager#0" />
+            <element signature="method#getAlarmList#0;class#PgAlarmManager#0" />
             <element signature="method#createDTO#0;class#PgAlarmManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="364">
+          <caret line="46" column="56" lean-forward="true" selection-start-line="46" selection-start-column="56" selection-end-line="46" selection-end-column="56" />
+          <folding>
+            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
+            <element signature="method#getPgDev#0;class#PgDeviceRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
+            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+        <state relative-caret-position="396">
+          <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
           <folding>
             <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
             <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -1365,52 +1331,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="239">
-          <caret line="21" column="33" lean-forward="true" selection-start-line="21" selection-start-column="33" selection-end-line="21" selection-end-column="33" />
-        </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="352">
-          <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-        </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="99">
-          <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-          </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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-          <folding>
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-            <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>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
index c436c93..e913155 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
@@ -132,7 +132,10 @@
             this.setAlarmType("");
         else
             this.setAlarmType(pgAlarm.getAlarmTypeId().getAlarmType());
-        this.setAlarmValue(pgAlarm.getAlarmValue());
+        if(pgAlarm.getAlarmValue()==null)
+            this.setAlarmValue("");
+        else
+            this.setAlarmValue(pgAlarm.getAlarmValue());
         if (pgAlarm.getAlarmDate() != null)
             this.setAlarmDate(sdf.format(pgAlarm.getAlarmDate()));
         else
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
index a43965c..565cb41 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -159,11 +159,21 @@
     }
 
     //获取历史报警消息列表
-    public List<PgAlarmDto> getAllAlarm(String alarmType,String startDay,String endDay,String isNew,int page,int rows) {
-        try {
+    public  Map<String, Object> getAllAlarm(String alarmType,String partition,String startDay,String endDay,String isNew,int page,int rows) {
 
+        Map<String, Object> resultMap = new HashMap<>();
+        String msg="";
+
+        try {
             Criteria criteria = createCriteria(PgAlarm.class);
 
+            if (StringUtils.isNotBlank(partition)) {
+                DetachedCriteria inCriteria = DetachedCriteria.forClass(PgDevice.class);
+                inCriteria.add(Restrictions.eq("partition", partition));
+                inCriteria.setProjection(Property.forName("id"));
+                criteria.add(Property.forName("alarmDevId").in(inCriteria));
+            }
+
             if (StringUtils.isNotBlank(alarmType)&&!alarmType.contains("全部")&&pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
                 criteria.add(Restrictions.eq("alarmTypeId", pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)));
 
@@ -190,8 +200,16 @@
             for (PgAlarm pgAlarm : pgAlarmList) {
                 pgAlarmDtoList.add(new PgAlarmDto(pgAlarm));
             }
-
-            return pgAlarmDtoList;
+            if(pgAlarmDtoList==null||pgAlarmDtoList.size()==0) {
+                resultMap.put("msg", "没有报警信息");
+                resultMap.put("code","0");
+            }else {
+                resultMap.put("code","200");
+                resultMap.put("msg", "报警信息获取成功");
+            }
+            resultMap.put("count",pg.getTotalCount());
+            resultMap.put("result",pgAlarmDtoList);
+            return resultMap;
         }
         catch(Exception ex){
             ex.printStackTrace();
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index 7547560..654f49e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -24,11 +24,11 @@
 
         Criteria criteria = createCriteria(PgDevice.class);
 
-        if(road!=null)
+        if(StringUtils.isNotBlank(road))
             criteria.add(Restrictions.eq("road",road));
-        if(partition!=null)
+        if(StringUtils.isNotBlank(partition))
             criteria.add(Restrictions.eq("partition",partition));
-        if(devType!=null)
+        if(StringUtils.isNotBlank(devType))
             criteria.add(Restrictions.eq("devType",devType));
 
         criteria.add(Restrictions.eq("active", 1));
@@ -43,6 +43,29 @@
         return pgDeviceDtoList;
     }
 
+    public List<PgDeviceDto> getAllDev(String road,String partition,String devType) {
+
+        Criteria criteria = createCriteria(PgDevice.class);
+
+        if(StringUtils.isNotBlank(road))
+            criteria.add(Restrictions.eq("road",road));
+        if(StringUtils.isNotBlank(partition))
+            criteria.add(Restrictions.eq("partition",partition));
+        if(StringUtils.isNotBlank(devType))
+            criteria.add(Restrictions.like("devType","%"+devType+"%"));
+
+        criteria.add(Restrictions.eq("active", 1));
+        criteria.addOrder(Order.desc("id"));
+        List<PgDevice> pgDeviceList = criteria.list();
+
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
+        for (PgDevice pgDevice : pgDeviceList) {
+            pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
+        }
+
+        return pgDeviceDtoList;
+    }
+
     //根据名字获取当前设备
     public PgDevice getDeviceByAssetCode(String assetCode) {
         Criteria criteria=createCriteria(PgDevice.class);
@@ -56,9 +79,9 @@
     }
 
     //根据类型获取设备列表
-    public List<PgDeviceDto> getDeviceByDevTypee(String devType) {
+    public List<PgDeviceDto> getDeviceByDevType(String devType) {
         Criteria criteria=createCriteria(PgDevice.class);
-        criteria.add(Restrictions.eq("devType",devType));
+        criteria.add(Restrictions.like("devType","%"+devType+"%"));
 
         List<PgDevice> pgDeviceList=criteria.list();
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
@@ -106,7 +129,7 @@
         criteria.add(Restrictions.eq("partition",partition));
 
         List<PgDevice> pgDeviceList=criteria.list();
-        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<PgDeviceDto>();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
 
         for (PgDevice pgDevice : pgDeviceList) {
             pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
index 3a3bccd..595730e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
@@ -1,10 +1,13 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.devTable.domain.PgAlarmType;
 import com.casic.PgInterface.devTable.domain.PgPartition;
 import com.casic.PgInterface.devTable.domain.PgRoad;
 import com.casic.PgInterface.devTable.domain.PipeGallery;
 import com.casic.PgInterface.devTable.dto.PgPartitionDto;
+import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
@@ -12,7 +15,9 @@
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Created by yxw on 2017/11/4.
@@ -21,7 +26,8 @@
 public class PgPartitionManager extends HibernateEntityDao<PgPartition> {
 
     @Resource
-    PgRoadManager pgRoadManager;
+    private PgRoadManager pgRoadManager;
+
 
     public PgPartition getPartitionByParName(String parName) {
         Criteria criteria = getSession().createCriteria(PgPartition.class);
@@ -99,4 +105,5 @@
         return pgPartitionDtoList;
     }
 
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
index f216360..a6928f1 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
@@ -5,6 +5,7 @@
 public class PgPlanResultRe {
 
     private String taskKey;
+    private List<String> pileAcuList;
     private List<PgPlanResult> pgPlanResultList;
 
     public String getTaskKey() {
@@ -15,6 +16,14 @@
         this.taskKey = taskKey;
     }
 
+    public List<String> getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(List<String> pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+
     public List<PgPlanResult> getPgPlanResultList() {
         return pgPlanResultList;
     }
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
index 71ea765..47eea07 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
@@ -54,9 +54,7 @@
 
         List<PgLineHole> pgLineHoleList=criteria.list();
         List<PgLineHoleDTO> pgLineHoleDTOList=new ArrayList<>();
-        if(pgLineHoleList==null||pgLineHoleList.size()==0)
-            return null;
-        else
+        if(pgLineHoleList!=null&&pgLineHoleList.size()!=0)
             pgLineHoleDTOList=PgLineHoleDTO.ConvertToDTOList(pgLineHoleList,pgPileAcuManager,pgRoadManager);
         return pgLineHoleDTOList;
     }
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
index 0fd9e1f..841a386 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
@@ -1,12 +1,15 @@
 package com.casic.PgInterface.intelPlan.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.devTable.domain.PgPartition;
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
 import com.casic.PgInterface.intelPlan.domain.PgLineHole;
 import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
 import com.casic.PgInterface.intelPlan.domain.PgSection;
 import com.casic.PgInterface.intelPlan.dto.PgPlanResult;
 import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
 import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -22,6 +25,9 @@
     @Resource
     private PgLineHoleManager pgLineHoleManager;
 
+    @Resource
+    private PgRoadManager pgRoadManager;
+
     public PgPileAcu getPgPileAcuByCode(String acuCode){
         List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
 
@@ -58,7 +64,9 @@
         for(PgPlanTask pgPlanTask:pgPlanTaskList){
             List<PgPlanResult> pgPlanResultList=getPgPlanResultByPlantask(pgPlanTask);
             PgPlanResultRe pgPlanResultRe=new PgPlanResultRe();
+
             pgPlanResultRe.setTaskKey(pgPlanTask.getTaskKey());
+            pgPlanResultRe.setPileAcuList(pgPlanTask.getPileAcuList());
             pgPlanResultRe.setPgPlanResultList(pgPlanResultList);
 
             pgPlanResultReList.add(pgPlanResultRe);
@@ -142,4 +150,57 @@
         return length;
     }
 
+    private PgPileAcu getPgPileAcuByAcuCode(String acuCode){
+        List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
+
+        if(pgPileAcuList==null||pgPileAcuList.size()==0)
+            return null;
+        else
+            return pgPileAcuList.get(0);
+    }
+
+    public List<PgAcuTask> getACUTask(String pileAcuList){
+        String[] acuArray=pileAcuList.split(",");
+        List<PgAcuTask> pgAcuTaskList=new ArrayList<>();
+
+        for(String acu:acuArray){
+            PgPileAcu pgPileAcu=this.getPgPileAcuByCode(acu);
+            String roadName=pgRoadManager.get(pgPileAcu.getRoadId()).getRoadName();
+
+            if(!containRoad(roadName,pgAcuTaskList))
+            {
+                PgAcuTask pgAcuTask=new PgAcuTask();
+                pgAcuTask.setRoadName(roadName);
+                pgAcuTask.setPileAcuList(acu);
+                pgAcuTaskList.add(pgAcuTask);
+            }
+            else{
+                PgAcuTask pgAcuTask=getIndexRoad(roadName,pgAcuTaskList);
+                if(pgAcuTask!=null)
+                    pgAcuTask.setPileAcuList(pgAcuTask.getPileAcuList()+","+acu);
+            }
+        }
+
+        return pgAcuTaskList;
+    }
+
+    private boolean containRoad(String roadName,List<PgAcuTask> pgAcuTaskList){
+        if(pgAcuTaskList==null||pgAcuTaskList.size()==0) return false;
+        for(PgAcuTask pgAcuTask:pgAcuTaskList){
+            if(pgAcuTask.getRoadName().equals(roadName))
+                return true;
+        }
+
+        return false;
+    }
+
+    private PgAcuTask getIndexRoad(String roadName, List<PgAcuTask> pgAcuTaskList){
+        for(PgAcuTask pgAcuTask:pgAcuTaskList){
+            if(pgAcuTask.getRoadName().equals(roadName))
+                return pgAcuTask;
+        }
+
+        return null;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java
new file mode 100644
index 0000000..323f7ef
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java
@@ -0,0 +1,25 @@
+package com.casic.PgInterface.reservePlan.dto;
+
+import java.util.List;
+
+public class PgAcuTask {
+
+    private String roadName;//道路
+    private String pileAcuList;//acu分区
+
+    public String getRoadName() {
+        return roadName;
+    }
+
+    public void setRoadName(String roadName) {
+        this.roadName = roadName;
+    }
+
+    public String getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(String pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
index c25e926..c7d7693 100644
--- a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
@@ -70,9 +70,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(Long.valueOf(inPgPersonId));
         PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("hostName",pgInPgPerson.getAssetCode());
-//        PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode());
-//        long maxId = pgTagPositionManager.getMaxId(pgTagMac.getTagMac());
-//        PGTagPosition pgTagPosition = pgTagPositionManager.get(maxId);
+
         PGTagPosition pgTagPosition = tagmacRun.GetTagStatus(pgTagMac);
         boolean bExist = false;
         bExist = pgTagPositionManager.findTagPosition(pgTagPosition.getPositionUpdatetime(),pgTagPosition.getHostId());
@@ -104,8 +102,7 @@
         PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(Long.valueOf(inPgPersonId));
         PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pgInPgPersonId",pgInPgPerson);
         System.out.println("time:"+pgInPgStatus.getInTime());
-//        PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pgInPgPersonId",inPgPersonId);
-//        PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode());
+
         PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("hostName",pgInPgPerson.getAssetCode());
 
         Map<Object,Object> mapPosition = new HashMap<>();
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
index 082ba5d..3eed00a 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
@@ -48,6 +48,7 @@
     public Map<String, Object> linkDevice(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         PgDeviceDto pgDeviceDto = null;
         try {
@@ -62,6 +63,7 @@
                     else {
                         pgDeviceDto = new PgDeviceDto(pgDevice);
                         msg = "报警关联设备获取成功";
+                        code="200";
                     }
                 }
             }
@@ -71,6 +73,7 @@
             e.printStackTrace();
             msg = "获取关联设备失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceDto);
 
@@ -86,6 +89,7 @@
     public Map<String, Object> linkPartitionCamera(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
         try {
@@ -106,6 +110,7 @@
 
                         pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(partition,position);
                         msg = "关联设备获取成功";
+                        code="200";
                     }
                 }
             }
@@ -115,6 +120,7 @@
             e.printStackTrace();
             msg = "分区设备关联失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceDtoList);
         return resultMap;
@@ -129,6 +135,7 @@
     public Map<String, Object> linkReservePlan(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgReservePlanDto> pgReservePlanDtoList=new ArrayList<>();
         try{
@@ -139,10 +146,12 @@
                 else {
                     pgReservePlanDtoList = pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
 
-                    if(pgReservePlanDtoList==null||pgReservePlanDtoList.size()==0)
-                        msg="不存在关联的报警预案";
-                    else
+                    if (pgReservePlanDtoList == null || pgReservePlanDtoList.size() == 0)
+                        msg = "不存在关联的报警预案";
+                    else {
                         msg = "关联预案获取成功";
+                        code="200";
+                    }
                 }
             }
             else
@@ -153,6 +162,7 @@
             e.printStackTrace();
             msg="预案关联失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgReservePlanDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
index 0ddbc4d..0ce886b 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
@@ -41,25 +41,19 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getAlarmList(@FormParam("alarmType") String alarmType,
                                             @FormParam("startDay") String startDay,
+                                            @FormParam("partition") String partition,
                                             @FormParam("endDay") String endDay,
                                             @FormParam("isNew") String isNew,
                                             @FormParam("page") int page,
                                             @FormParam("rows") int rows) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
         try {
-            pgAlarmDtoList = pgAlarmManager.getAllAlarm(alarmType,startDay,endDay,isNew,page,rows);
-            if (pgAlarmDtoList==null||pgAlarmDtoList.size() == 0)
-                msg = "没有报警信息";
-            else
-                msg = "报警信息获取成功";
+            resultMap = pgAlarmManager.getAllAlarm(alarmType,partition,startDay,endDay,isNew,page,rows);
+
         } catch (Exception e) {
             e.printStackTrace();
-            msg = "报警信息获取失败";
         }
-        resultMap.put("msg", msg);
-        resultMap.put("result", pgAlarmDtoList);
         return resultMap;
     }
 
@@ -71,9 +65,10 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> clearAlarmList(@FormParam("id") String id) throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        String result = "false";
+        String result = "";
+        String code="0";
 
         try {
             PgAlarm pgAlarm = new PgAlarm();
@@ -86,12 +81,14 @@
                 pgAlarmManager.save(pgAlarm);
                 msg = "报警信息清除成功";
                 result = "true";
+                code = "200";
             }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警信息清除失败";
             result = "false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
@@ -106,21 +103,26 @@
     public Map<String, Object> getAlarmByTypeOrTime(@FormParam("alarmType") String alarmType,
                                                     @FormParam("startTime") String startTime,
                                                     @FormParam("endTime") String endTime) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
-        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<PgAlarmDto>();
+        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
         try {
             pgAlarmDtoList = pgAlarmManager.getAlarmByTypeAndTime(alarmType, startTime, endTime);
             if (pgAlarmDtoList == null || pgAlarmDtoList.size() == 0)
                 msg = "报警信息不存在";
             else
+            {
                 msg = "报警信息获取成功";
+                code="200";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警信息获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
index 29ce8a4..ed0bf34 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
@@ -39,8 +39,8 @@
     public Map<String, Object> getAlarmRule(@FormParam("devType") String devType) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
-        System.out.println("devType:"+devType);
         List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<>();
         try {
             pgAlarmRuleDtoList = pgAlarmRuleManager.getAlarmRuleDto(devType);
@@ -52,6 +52,7 @@
             e.printStackTrace();
             msg = "报警阈值信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmRuleDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
index 24ab894..abef1b1 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
@@ -39,16 +39,21 @@
                                                      @FormParam("endDate") String endDate)throws Exception{
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
+
         List<PgAlarmTjDto> pgAlarmTjDtoList=null;
         try{
             pgAlarmTjDtoList=pgAlarmTjManager.getAlarmTjResultByType(startDate,endDate);
             msg="获取成功";
+            code="200";
         }
         catch(Exception ex) {
             msg = "统计失败";
         }
-        resultMap.put("result",pgAlarmTjDtoList);
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
+        resultMap.put("result",pgAlarmTjDtoList);
+
         return resultMap;
     }
 
@@ -61,23 +66,27 @@
     public Map<String, Object> getAlarmByTime(@FormParam("startTime") String startTime,
                                               @FormParam("endTime") String endTime,
                                               @FormParam("statisticType") String statisticType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code = "0";
 
-        List<PgAlarmTjDto> pgAlarmTjDtoList = new ArrayList<PgAlarmTjDto>();
+        List<PgAlarmTjDto> pgAlarmTjDtoList = new ArrayList<>();
         try {
             pgAlarmTjDtoList = pgAlarmTjManager.getAlarmByTime(startTime, endTime, statisticType);
             if(pgAlarmTjDtoList==null)
                 msg="报警统计信息获取失败";
-            else
-                msg="报警统计信息获取成功";
+            else {
+                msg = "报警统计信息获取成功";
+                code="200";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警统计信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmTjDtoList);
         return resultMap;
     }
 
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
index 28bc811..b6278a9 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
@@ -30,7 +30,6 @@
     @Resource
     private PgAlarmTypeManager pgAlarmTypeManager;
 
-
     /**
      * 获取报警类型
      */
@@ -38,19 +37,24 @@
     @Path("getAlarmType")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getAlarmTypeList()throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
-        List<PgAlarmTypeDto> pgAlarmTypeDtoList=new ArrayList<PgAlarmTypeDto>();
+        String code="";
+
+        List<PgAlarmTypeDto> pgAlarmTypeDtoList=new ArrayList<>();
         try {
             pgAlarmTypeDtoList = pgAlarmTypeManager.getAllAlarmTypeDto();
             if(pgAlarmTypeDtoList.size()==0)
                 msg="没有报警类型信息";
-            else
-                msg="报警类型信息获取成功";
+            else {
+                code="200";
+                msg = "报警类型信息获取成功";
+            }
         }catch(Exception e){
             e.printStackTrace();
             msg="报警类型信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAlarmTypeDtoList);
         return resultMap;
@@ -66,6 +70,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
@@ -83,6 +88,7 @@
                 logger.info("成功保存");
                 result = "true";
                 msg = "保存成功";
+                code="200";
             }
         } catch (Exception e) {
             result = "false";
@@ -90,6 +96,7 @@
             e.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -106,6 +113,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try{
             if(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
@@ -119,6 +127,7 @@
                 pgAlarmTypeManager.save(pgAlarmType);
                 result = "true";
                 msg = "编辑成功";
+                code="200";
             }
         }
         catch(Exception e)
@@ -128,6 +137,7 @@
             e.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("result",result);
         resultMap.put("msg",msg);
 
@@ -146,6 +156,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
         String result="false";
+        String code="0";
 
         try {
             PgAlarmType pgAlarmType=pgAlarmTypeManager.get(Long.valueOf(id));
@@ -157,6 +168,7 @@
             {
                 pgAlarmType.setActive(0);
                 pgAlarmTypeManager.save(pgAlarmType);
+                code="200";
                 msg="报警类型删除成功";
                 result="true";
             }
@@ -165,6 +177,7 @@
             msg="报警类型删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
index 4533e1a..85940bb 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
@@ -33,12 +33,15 @@
                                                  @FormParam("inSpectionPlace") String inSpectionPlace){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
         List<PgAssetPlanDto> pgAssetPlanDtoList=new ArrayList<>();
         try{
             pgAssetPlanDtoList=pgAssetPlanManager.getPgAssetPlanDtoList(startDay,endDay,inSpectionPlace);
-            if(pgAssetPlanDtoList!=null&&pgAssetPlanDtoList.size()!=0)
-                msg="巡检信息获取成功";
+            if(pgAssetPlanDtoList!=null&&pgAssetPlanDtoList.size()!=0) {
+                code="200";
+                msg = "巡检信息获取成功";
+            }
             else
                 msg="不存在巡检信息";
         }
@@ -47,6 +50,7 @@
             msg="巡检信息获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAssetPlanDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
index 47ef9d1..5cbdfcb 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
@@ -30,12 +30,15 @@
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
         String result="";
+        String code="0";
 
         List<PgAssetPlanStatic> pgAssetPlanStaticList = null;
         try{
             pgAssetPlanStaticList=pgAssetPlanManager.getPgAssetPlanStaticLisByTime(startTime,endTime,staticType);
-            if(pgAssetPlanStaticList!=null&&pgAssetPlanStaticList.size()!=0)
-                msg="巡检统计信息获取成功";
+            if(pgAssetPlanStaticList!=null&&pgAssetPlanStaticList.size()!=0) {
+                code = "200";
+                msg = "巡检统计信息获取成功";
+            }
             else
                 msg="统计信息获取失败";
         }
@@ -44,6 +47,7 @@
             msg="统计失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAssetPlanStaticList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
index 26f5d6a..503bfe3 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
@@ -40,6 +40,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="";
 
         try{
             PgAuthority pgAuthority=new PgAuthority();
@@ -50,6 +51,7 @@
 
             pgAuthorityManager.save(pgAuthority);
             msg="用户权限保存成功";
+            code="200";
             result="true";
         }
         catch(Exception e) {
@@ -57,6 +59,7 @@
             msg = "新增权限失败";
             result = "false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -65,22 +68,25 @@
 
     /*
        *编辑角权限信息
-        */
+    */
     @POST
     @Path("editAuthority")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> editAuthority(@FormParam("id") String id,
                                        @FormParam("authority") String authority,
                                        @FormParam("concent") String concent) throws Exception{
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
+
         try {
             PgAuthority pgAuthority=pgAuthorityManager.get(Long.valueOf(id));
             pgAuthority.setAuthority(authority);
             pgAuthority.setConcent(concent);
 
             pgAuthorityManager.save(pgAuthority);
+            code="200";
             msg="权限保存成功";
             result="true";
         }
@@ -90,7 +96,7 @@
             msg="权限编辑失败";
             result="false";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -105,9 +111,10 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> deleteAuthority(@FormParam("id") String id)throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
-        String result="false";
+        String result="";
+        String code="0";
 
         try {
             PgAuthority pgAuthority= pgAuthorityManager.get(Long.valueOf(id));
@@ -119,6 +126,7 @@
             {
                 pgAuthority.setActive(0);
                 pgAuthorityManager.save(pgAuthority);
+                code="200";
                 msg="删除权限成功";
                 result="true";
             }
@@ -127,37 +135,40 @@
             msg="删除权限失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
     }
 
     /*
-* 获取权限信息
- */
+    * 获取权限信息
+    */
     @POST
     @Path("getAuthorityList")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> getAuthorityList() {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgAuthorityDto> pgAuthorityDtoList = new ArrayList<PgAuthorityDto>();
         try {
             pgAuthorityDtoList = pgAuthorityManager.getAuthorityList();
             if (pgAuthorityDtoList == null)
                 msg = "不存在权限信息";
-            else
+            else {
+                code = "200";
                 msg = "权限信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "权限信息获取是失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAuthorityDtoList);
         return resultMap;
     }
 
 
-
-
 }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
index a9ef521..a74ecc7 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
@@ -45,6 +45,7 @@
                                                @FormParam("endDate") String endDate)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgHistoryDataDto> pgHistoryDataDtoList=new ArrayList<>();
 
         try {
@@ -55,13 +56,16 @@
                 pgHistoryDataDtoList=pgCh4Manager.getAllCH4Data(pgDevice,startDate,endDate);
                 if(pgHistoryDataDtoList==null)
                     msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+                else {
+                    code = "200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgHistoryDataDtoList);
         return resultMap;
@@ -75,8 +79,9 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getNewestCh4InfoByDev(@FormParam("assetCode") String assetCode)throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
+        String code="0";
         PgCh4Dto pgCh4Dto=new PgCh4Dto(null);
 
         try {
@@ -87,13 +92,17 @@
                 pgCh4Dto=pgCh4Manager.getNewestCH4Data(pgDevice);
                 if(pgCh4Dto==null)
                     msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgCh4Dto);
         return resultMap;
@@ -111,6 +120,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
@@ -127,6 +137,7 @@
                 pgCh4.setPgDeviceId(pgDevice);
 
                 pgCh4Manager.save(pgCh4);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -135,7 +146,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 25ded8a..283d7ab 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,20 +7,56 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" 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/construction/manager/PgCsDocumentManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/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/manager/PgAlarmManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/~$说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/~$说明20191207.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.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$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/接口说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明20191207.docx" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
@@ -51,7 +87,7 @@
         <counts>
           <entry key="class" value="4" />
           <entry key="iml" value="2" />
-          <entry key="java" value="707" />
+          <entry key="java" value="820" />
           <entry key="properties" value="14" />
           <entry key="xml" value="7" />
         </counts>
@@ -60,7 +96,7 @@
         <counts>
           <entry key="CLASS" value="4" />
           <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="707" />
+          <entry key="JAVA" value="820" />
           <entry key="Properties" value="14" />
           <entry key="XML" value="7" />
         </counts>
@@ -68,32 +104,32 @@
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
           <entry key="dummy" value="38" />
-          <entry key="java" value="30161" />
+          <entry key="java" value="40859" />
           <entry key="properties" value="100" />
-          <entry key="txt" value="176" />
+          <entry key="txt" value="186" />
           <entry key="xml" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="30161" />
-          <entry key="PLAIN_TEXT" value="214" />
+          <entry key="JAVA" value="40859" />
+          <entry key="PLAIN_TEXT" value="224" />
           <entry key="Properties" value="100" />
           <entry key="XML" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="48" />
+          <entry key="project.closed" value="51" />
           <entry key="project.open.time.1" value="5" />
           <entry key="project.open.time.12" value="2" />
           <entry key="project.open.time.13" value="1" />
           <entry key="project.open.time.15" value="1" />
           <entry key="project.open.time.16" value="1" />
           <entry key="project.open.time.17" value="1" />
-          <entry key="project.open.time.2" value="1" />
+          <entry key="project.open.time.2" value="2" />
           <entry key="project.open.time.20" value="1" />
-          <entry key="project.open.time.23" value="1" />
+          <entry key="project.open.time.23" value="2" />
           <entry key="project.open.time.24" value="2" />
           <entry key="project.open.time.251" value="1" />
           <entry key="project.open.time.27" value="2" />
@@ -106,8 +142,8 @@
           <entry key="project.open.time.36" value="1" />
           <entry key="project.open.time.37" value="1" />
           <entry key="project.open.time.39" value="2" />
-          <entry key="project.open.time.4" value="2" />
-          <entry key="project.open.time.40" value="1" />
+          <entry key="project.open.time.4" value="3" />
+          <entry key="project.open.time.40" value="2" />
           <entry key="project.open.time.41" value="2" />
           <entry key="project.open.time.42" value="2" />
           <entry key="project.open.time.43" value="2" />
@@ -122,23 +158,25 @@
           <entry key="project.open.time.6" value="3" />
           <entry key="project.open.time.63" value="2" />
           <entry key="project.open.time.64" value="1" />
+          <entry key="project.open.time.66" value="1" />
           <entry key="project.open.time.71" value="2" />
+          <entry key="project.open.time.74" value="1" />
           <entry key="project.open.time.76" value="1" />
           <entry key="project.open.time.8" value="2" />
           <entry key="project.open.time.9" value="1" />
           <entry key="project.open.time.97" value="1" />
-          <entry key="project.opened" value="78" />
+          <entry key="project.opened" value="84" />
         </counts>
       </usages-collector>
     </session>
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+            <state relative-caret-position="396">
+              <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
               <folding>
                 <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
                 <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -147,73 +185,6 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <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="99">
-              <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-              <folding>
-                <element signature="imports" expanded="true" />
-                <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-1170">
-              <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state>
-              <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
-              <folding>
-                <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-                <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="true">
-        <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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-              <folding>
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-                <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>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <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="352">
-              <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -225,18 +196,9 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>inCriteria</find>
-      <find>getPgPlanResulList</find>
-      <find>getPileAcuListByPileAcuStr</find>
-      <find>distinct</find>
-      <find>order</find>
-      <find>canPlanLine</find>
-      <find>isExistLine</find>
-      <find>getPlanResult</find>
       <find>pgPipeLine</find>
       <find>getPipeLineBylineName</find>
       <find>StringU</find>
-      <find>getAllAlarm</find>
       <find>getAlarmList</find>
       <find>getPgInPersonListByDay</find>
       <find>getDayInPgStatistic</find>
@@ -254,7 +216,16 @@
       <find>getPgContructionByNameOrType</find>
       <find>&quot;&quot;,&quot;&quot;,</find>
       <find>getPgContructionDtoByNameOrType</find>
+      <find>addConstruction</find>
+      <find>getPgLineAcuHole</find>
+      <find>getPlanResult</find>
       <find>getConstruction</find>
+      <find>addPipeLine</find>
+      <find>未找到入廊数据</find>
+      <find>getCurrentHoleByAcu</find>
+      <find>getAllAlarm</find>
+      <find>getPgDeviceDtoListByPartition</find>
+      <find>getPgDeviceByDevType</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -263,57 +234,57 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlan.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileHoleManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/planData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/PlanData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
       </list>
     </option>
   </component>
@@ -359,7 +330,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -421,53 +391,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="dto" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="manager" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -479,29 +402,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="rs" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -516,6 +416,7 @@
         </subPane>
       </pane>
       <pane id="Scope" />
+      <pane id="PackagesPane" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -710,7 +611,13 @@
       <workItem from="1574902733573" duration="1829000" />
       <workItem from="1574998240004" duration="7016000" />
       <workItem from="1575247959683" duration="6997000" />
-      <workItem from="1575704345590" duration="40473000" />
+      <workItem from="1575704345590" duration="69381000" />
+      <workItem from="1575869479666" duration="721000" />
+      <workItem from="1575947104878" duration="6101000" />
+      <workItem from="1576128264436" duration="3347000" />
+      <workItem from="1576208571543" duration="22000" />
+      <workItem from="1576227513917" duration="862000" />
+      <workItem from="1576293721220" duration="18246000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -817,11 +724,18 @@
       <option name="project" value="LOCAL" />
       <updated>1575775489149</updated>
     </task>
-    <option name="localTasksCounter" value="16" />
+    <task id="LOCAL-00016" summary="整改施工信息">
+      <created>1575791780774</created>
+      <option name="number" value="00016" />
+      <option name="presentableId" value="LOCAL-00016" />
+      <option name="project" value="LOCAL" />
+      <updated>1575791780774</updated>
+    </task>
+    <option name="localTasksCounter" value="17" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="452131000" />
+    <option name="totallyTimeSpent" value="510338000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -834,9 +748,8 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
-    <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.24205749" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2647504" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -847,7 +760,7 @@
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.3295082" />
       <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.4819672" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.65737706" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.3295082" />
@@ -939,7 +852,8 @@
     <MESSAGE value="重新设计智能规划部分" />
     <MESSAGE value="完成智能规划对接" />
     <MESSAGE value="修改报警统计" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改报警统计" />
+    <MESSAGE value="整改施工信息" />
+    <option name="LAST_COMMIT_MESSAGE" value="整改施工信息" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -951,16 +865,10 @@
           <option name="timeStamp" value="3" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java</url>
-          <line>69</line>
+          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java</url>
+          <line>40</line>
           <properties />
-          <option name="timeStamp" value="21" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java</url>
-          <line>96</line>
-          <properties />
-          <option name="timeStamp" value="38" />
+          <option name="timeStamp" value="122" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
@@ -970,394 +878,452 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <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="2068">
-          <caret line="154" column="35" selection-start-line="154" selection-start-column="35" selection-end-line="154" selection-end-column="35" />
-        </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="3300">
-          <caret line="297" column="22" selection-start-line="297" selection-start-column="22" selection-end-line="297" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/StringUtils.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
-          <caret line="13" column="48" lean-forward="true" selection-start-line="13" selection-start-column="48" selection-end-line="13" selection-end-column="48" />
+          <caret line="11" column="5" selection-start-line="11" selection-start-column="5" selection-end-line="11" selection-end-column="5" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="78" lean-forward="true" selection-start-line="78" selection-end-line="78" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="616">
-          <caret line="41" column="1" selection-start-line="41" selection-start-column="1" selection-end-line="41" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="110">
-          <caret line="12" column="23" selection-start-line="12" selection-start-column="23" selection-end-line="12" selection-end-column="23" />
+        <state relative-caret-position="516">
+          <caret line="114" column="12" selection-start-line="114" selection-start-column="12" selection-end-line="114" selection-end-column="12" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="164">
-          <caret line="56" lean-forward="true" selection-start-line="56" selection-end-line="56" />
+        <state relative-caret-position="418">
+          <caret line="33" column="44" selection-start-line="33" selection-start-column="44" selection-end-line="33" selection-end-column="44" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="258">
-          <caret line="27" column="12" lean-forward="true" selection-start-line="27" selection-start-column="12" selection-end-line="27" selection-end-column="12" />
+        <state relative-caret-position="132">
+          <caret line="11" column="20" lean-forward="true" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="20" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.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="-12">
-          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        <state relative-caret-position="516">
+          <caret line="142" column="54" selection-start-line="142" selection-start-column="54" selection-end-line="142" selection-end-column="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="858">
-          <caret line="55" column="27" lean-forward="true" selection-start-line="55" selection-start-column="27" selection-end-line="55" selection-end-column="27" />
+        <state relative-caret-position="66">
+          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="58">
+          <caret line="18" column="28" selection-start-line="18" selection-start-column="19" selection-end-line="18" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="305">
+          <caret line="24" column="31" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="714">
+          <caret line="58" column="5" lean-forward="true" selection-start-line="58" selection-start-column="5" selection-end-line="58" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="924">
+          <caret line="134" column="92" selection-start-line="134" selection-start-column="92" selection-end-line="134" selection-end-column="92" />
+          <folding>
+            <element signature="method#linkDevice#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkPartitionCamera#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkReservePlan#0;class#PgAlarmLinkRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1066">
+          <caret line="90" lean-forward="true" selection-start-line="90" selection-end-line="90" />
+          <folding>
+            <element signature="method#getTjResultByAlarmType#0;class#PgAlarmTjRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="946">
+          <caret line="148" column="11" lean-forward="true" selection-start-line="148" selection-start-column="11" selection-end-line="148" selection-end-column="11" />
+          <folding>
+            <element signature="method#getAlarmTypeList#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#addAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#editAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#deleteAlarmType#0;class#PgAlarmTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="208">
+          <caret line="46" column="23" lean-forward="true" selection-start-line="46" selection-start-column="23" selection-end-line="46" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="113" column="9" lean-forward="true" selection-start-line="113" selection-start-column="9" selection-end-line="113" selection-end-column="9" />
+          <folding>
+            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
+            <element signature="method#getNewestCh4InfoByDev#0;class#PgCh4Rs#0" />
+            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="145" column="6" lean-forward="true" selection-start-line="145" selection-start-column="6" selection-end-line="145" selection-end-column="6" />
+          <folding>
+            <element signature="method#addAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#editAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#deleteAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#getAuthorityList#0;class#PgAuthorityRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="58" column="1" lean-forward="true" selection-start-line="58" selection-start-column="1" selection-end-line="58" selection-end-column="1" />
+          <folding>
+            <element signature="method#getPgAssetPlanList#0;class#PgAssetPlanRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="370">
+          <caret line="371" column="66" selection-start-line="371" selection-start-column="66" selection-end-line="371" selection-end-column="66" />
+          <folding>
+            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#searchConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionDev#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="139" column="13" lean-forward="true" selection-start-line="139" selection-start-column="13" selection-end-line="139" selection-end-column="13" />
+          <folding>
+            <element signature="method#getCoInfoByDevAndDate#0;class#PgCoRs#0" />
+            <element signature="method#getNewestCoInfoByDev#0;class#PgCoRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="540">
+          <caret line="223" column="5" lean-forward="true" selection-start-line="223" selection-start-column="5" selection-end-line="223" selection-end-column="5" />
+          <folding>
+            <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="682">
+          <caret line="100" lean-forward="true" selection-start-line="100" selection-end-line="100" />
+          <folding>
+            <element signature="method#getDeviceTpeyList#0;class#PgDeviceTypeRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="377">
+          <caret line="225" column="35" selection-start-line="225" selection-start-column="35" selection-end-line="225" selection-end-column="35" />
+          <folding>
+            <element signature="method#addEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#addEquipment#1;class#PgEquipmentRs#0" />
+            <element signature="method#getEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#deleteEquipment#0;class#PgEquipmentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="406">
+          <caret line="109" lean-forward="true" selection-start-line="109" selection-end-line="109" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="154">
+          <caret line="28" column="19" selection-start-line="28" selection-start-column="19" selection-end-line="28" selection-end-column="19" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="748">
-          <caret line="49" column="5" lean-forward="true" selection-start-line="49" selection-start-column="5" selection-end-line="49" selection-end-column="5" />
+        <state relative-caret-position="296">
+          <caret line="161" column="35" selection-start-line="161" selection-start-column="35" selection-end-line="161" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="384">
+          <caret line="99" column="5" lean-forward="true" selection-start-line="99" selection-start-column="5" selection-end-line="99" selection-end-column="5" />
+        </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="362">
+          <caret line="340" column="35" selection-start-line="340" selection-start-column="35" selection-end-line="340" selection-end-column="35" />
+          <folding>
+            <element signature="method#addInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPersonInPg#0;class#PgInPgPersonRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-606">
+          <caret line="76" column="20" lean-forward="true" selection-start-line="76" selection-start-column="20" selection-end-line="76" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="65" column="35" selection-start-line="65" selection-start-column="35" selection-end-line="65" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="101" column="35" selection-start-line="101" selection-start-column="35" selection-end-line="101" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="84" column="35" selection-start-line="84" selection-start-column="35" selection-end-line="84" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="59" lean-forward="true" selection-start-line="59" selection-end-line="59" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="60" column="1" lean-forward="true" selection-start-line="60" selection-start-column="1" selection-end-line="60" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="145" column="35" selection-start-line="145" selection-start-column="35" selection-end-line="145" selection-end-column="35" />
+        </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="274">
+          <caret line="350" column="35" selection-start-line="350" selection-start-column="35" selection-end-line="350" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="121" column="39" selection-start-line="121" selection-start-column="39" selection-end-line="121" selection-end-column="39" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="28" column="8" lean-forward="true" selection-start-line="28" selection-start-column="8" selection-end-line="28" selection-end-column="8" />
+        <state relative-caret-position="340">
+          <caret line="103" selection-start-line="103" selection-end-line="103" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="226" column="35" selection-start-line="226" selection-start-column="35" selection-end-line="226" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="203" column="35" selection-start-line="203" selection-start-column="35" selection-end-line="203" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="241" column="35" selection-start-line="241" selection-start-column="35" selection-end-line="241" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="225" column="1" lean-forward="true" selection-start-line="225" selection-start-column="1" selection-end-line="225" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="176" column="5" lean-forward="true" selection-start-line="176" selection-start-column="5" selection-end-line="176" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="178" column="35" lean-forward="true" selection-start-line="178" selection-start-column="35" selection-end-line="178" selection-end-column="35" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="516">
-          <caret line="94" column="53" selection-start-line="94" selection-start-column="53" selection-end-line="94" selection-end-column="53" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="814">
-          <caret line="52" column="9" lean-forward="true" selection-start-line="52" selection-start-column="9" selection-end-line="52" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="182">
-          <caret line="58" column="12" lean-forward="true" selection-start-line="58" selection-start-column="12" selection-end-line="58" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="34" lean-forward="true" selection-start-line="34" selection-end-line="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="32" lean-forward="true" selection-start-line="32" selection-end-line="32" />
-          <folding>
-            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
-            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="185">
-          <caret line="63" column="13" selection-start-line="63" selection-start-column="13" selection-end-line="63" selection-end-column="13" />
-          <folding>
-            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
-            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
-            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="e#6319#6324#0" />
-            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
-          </folding>
+          <caret line="240" lean-forward="true" selection-start-line="240" selection-end-line="240" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
-          <caret line="58" column="28" lean-forward="true" selection-start-line="58" selection-start-column="28" selection-end-line="58" selection-end-column="28" />
-          <folding>
-            <element signature="method#addTempHumData#0;class#PgTempHumRs#0" />
-          </folding>
+        <state relative-caret-position="340">
+          <caret line="148" column="34" selection-start-line="148" selection-start-column="34" selection-end-line="148" selection-end-column="34" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
+        <state relative-caret-position="458">
+          <caret line="99" column="35" selection-start-line="99" selection-start-column="35" selection-end-line="99" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+        <state relative-caret-position="384">
+          <caret line="145" column="32" lean-forward="true" selection-start-line="145" selection-start-column="32" selection-end-line="145" selection-end-column="32" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="414">
-          <caret line="22" column="46" lean-forward="true" selection-start-line="22" selection-start-column="46" selection-end-line="22" selection-end-column="46" />
-        </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="396">
-          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" column="83" selection-start-line="11" selection-start-column="83" selection-end-line="11" selection-end-column="83" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="26">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
-          <folding>
-            <element signature="method#getPgInPgStatusByPerson#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNumByName#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNum#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPersonListByDay#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPgStatusByPgInPgPerson#0;class#PgInPgStatusManager#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="44">
-          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-12">
-          <caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="87" lean-forward="true" selection-start-line="87" selection-end-line="87" />
-          <folding>
-            <element signature="method#getConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#addConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#deleteConstructionType#0;class#PgConstructionTypeRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
-          <folding>
-            <element signature="method#getConstructionTypeByType#0;class#PgConstructionTypeManager#0" />
-            <element signature="method#getAllConstructionTypeDto#0;class#PgConstructionTypeManager#0" />
-          </folding>
-        </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="145">
-          <caret line="258" column="9" lean-forward="true" selection-start-line="258" selection-start-column="9" selection-end-line="258" selection-end-column="9" />
-          <folding>
-            <element signature="method#getMonthInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayInPgStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgOverViewRs#0" />
-            <element signature="method#getAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getMonthAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayAlarmStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgOverViewRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="103">
-          <caret line="105" column="50" lean-forward="true" selection-start-line="105" selection-start-column="50" selection-end-line="105" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateBasicDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="99">
-          <caret line="125" selection-start-line="125" selection-end-line="125" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="190">
-          <caret line="24" column="35" lean-forward="true" selection-start-line="24" selection-start-column="35" selection-end-line="24" selection-end-column="35" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="436">
-          <caret line="24" lean-forward="true" selection-start-line="24" selection-end-line="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" lean-forward="true" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="300">
-          <caret line="34" column="31" lean-forward="true" selection-start-line="34" selection-start-column="31" selection-end-line="34" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="42" column="13" lean-forward="true" selection-start-line="42" selection-start-column="13" selection-end-line="42" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="120" column="72" lean-forward="true" selection-start-line="120" selection-start-column="72" selection-end-line="120" selection-end-column="72" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="293">
-          <caret line="58" column="73" lean-forward="true" selection-start-line="58" selection-start-column="73" selection-end-line="58" selection-end-column="73" />
-          <folding>
-            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
-            <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
-          </folding>
-        </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="307">
-          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
+        <state relative-caret-position="758">
+          <caret line="130" column="5" lean-forward="true" selection-start-line="130" selection-start-column="5" selection-end-line="130" selection-end-column="5" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1170">
-          <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
+        <state relative-caret-position="494">
+          <caret line="86" column="62" lean-forward="true" selection-start-line="86" selection-start-column="62" selection-end-line="86" selection-end-column="62" />
           <folding>
-            <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-            <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+            <element signature="method#getAllDevice#0;class#PgDeviceManager#0" />
+            <element signature="method#getAllDev#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="195" column="28" lean-forward="true" selection-start-line="195" selection-start-column="28" selection-end-line="195" selection-end-column="28" />
+        <state relative-caret-position="166">
+          <caret line="174" column="13" lean-forward="true" selection-start-line="174" selection-start-column="13" selection-end-line="174" selection-end-column="13" />
           <folding>
-            <element signature="method#getAlarmByTypeAndTime#0;class#PgAlarmManager#0" />
-            <element signature="method#getAlarmNum#0;class#PgAlarmManager#0" />
             <element signature="method#getDayAlarmStatistic#0;class#PgAlarmManager#0" />
+            <element signature="method#getAlarmList#0;class#PgAlarmManager#0" />
             <element signature="method#createDTO#0;class#PgAlarmManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="364">
+          <caret line="46" column="56" lean-forward="true" selection-start-line="46" selection-start-column="56" selection-end-line="46" selection-end-column="56" />
+          <folding>
+            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
+            <element signature="method#getPgDev#0;class#PgDeviceRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
+            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+        <state relative-caret-position="396">
+          <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
           <folding>
             <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
             <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -1365,52 +1331,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="239">
-          <caret line="21" column="33" lean-forward="true" selection-start-line="21" selection-start-column="33" selection-end-line="21" selection-end-column="33" />
-        </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="352">
-          <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-        </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="99">
-          <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-          </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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-          <folding>
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-            <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>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
index c436c93..e913155 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
@@ -132,7 +132,10 @@
             this.setAlarmType("");
         else
             this.setAlarmType(pgAlarm.getAlarmTypeId().getAlarmType());
-        this.setAlarmValue(pgAlarm.getAlarmValue());
+        if(pgAlarm.getAlarmValue()==null)
+            this.setAlarmValue("");
+        else
+            this.setAlarmValue(pgAlarm.getAlarmValue());
         if (pgAlarm.getAlarmDate() != null)
             this.setAlarmDate(sdf.format(pgAlarm.getAlarmDate()));
         else
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
index a43965c..565cb41 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -159,11 +159,21 @@
     }
 
     //获取历史报警消息列表
-    public List<PgAlarmDto> getAllAlarm(String alarmType,String startDay,String endDay,String isNew,int page,int rows) {
-        try {
+    public  Map<String, Object> getAllAlarm(String alarmType,String partition,String startDay,String endDay,String isNew,int page,int rows) {
 
+        Map<String, Object> resultMap = new HashMap<>();
+        String msg="";
+
+        try {
             Criteria criteria = createCriteria(PgAlarm.class);
 
+            if (StringUtils.isNotBlank(partition)) {
+                DetachedCriteria inCriteria = DetachedCriteria.forClass(PgDevice.class);
+                inCriteria.add(Restrictions.eq("partition", partition));
+                inCriteria.setProjection(Property.forName("id"));
+                criteria.add(Property.forName("alarmDevId").in(inCriteria));
+            }
+
             if (StringUtils.isNotBlank(alarmType)&&!alarmType.contains("全部")&&pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
                 criteria.add(Restrictions.eq("alarmTypeId", pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)));
 
@@ -190,8 +200,16 @@
             for (PgAlarm pgAlarm : pgAlarmList) {
                 pgAlarmDtoList.add(new PgAlarmDto(pgAlarm));
             }
-
-            return pgAlarmDtoList;
+            if(pgAlarmDtoList==null||pgAlarmDtoList.size()==0) {
+                resultMap.put("msg", "没有报警信息");
+                resultMap.put("code","0");
+            }else {
+                resultMap.put("code","200");
+                resultMap.put("msg", "报警信息获取成功");
+            }
+            resultMap.put("count",pg.getTotalCount());
+            resultMap.put("result",pgAlarmDtoList);
+            return resultMap;
         }
         catch(Exception ex){
             ex.printStackTrace();
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index 7547560..654f49e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -24,11 +24,11 @@
 
         Criteria criteria = createCriteria(PgDevice.class);
 
-        if(road!=null)
+        if(StringUtils.isNotBlank(road))
             criteria.add(Restrictions.eq("road",road));
-        if(partition!=null)
+        if(StringUtils.isNotBlank(partition))
             criteria.add(Restrictions.eq("partition",partition));
-        if(devType!=null)
+        if(StringUtils.isNotBlank(devType))
             criteria.add(Restrictions.eq("devType",devType));
 
         criteria.add(Restrictions.eq("active", 1));
@@ -43,6 +43,29 @@
         return pgDeviceDtoList;
     }
 
+    public List<PgDeviceDto> getAllDev(String road,String partition,String devType) {
+
+        Criteria criteria = createCriteria(PgDevice.class);
+
+        if(StringUtils.isNotBlank(road))
+            criteria.add(Restrictions.eq("road",road));
+        if(StringUtils.isNotBlank(partition))
+            criteria.add(Restrictions.eq("partition",partition));
+        if(StringUtils.isNotBlank(devType))
+            criteria.add(Restrictions.like("devType","%"+devType+"%"));
+
+        criteria.add(Restrictions.eq("active", 1));
+        criteria.addOrder(Order.desc("id"));
+        List<PgDevice> pgDeviceList = criteria.list();
+
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
+        for (PgDevice pgDevice : pgDeviceList) {
+            pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
+        }
+
+        return pgDeviceDtoList;
+    }
+
     //根据名字获取当前设备
     public PgDevice getDeviceByAssetCode(String assetCode) {
         Criteria criteria=createCriteria(PgDevice.class);
@@ -56,9 +79,9 @@
     }
 
     //根据类型获取设备列表
-    public List<PgDeviceDto> getDeviceByDevTypee(String devType) {
+    public List<PgDeviceDto> getDeviceByDevType(String devType) {
         Criteria criteria=createCriteria(PgDevice.class);
-        criteria.add(Restrictions.eq("devType",devType));
+        criteria.add(Restrictions.like("devType","%"+devType+"%"));
 
         List<PgDevice> pgDeviceList=criteria.list();
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
@@ -106,7 +129,7 @@
         criteria.add(Restrictions.eq("partition",partition));
 
         List<PgDevice> pgDeviceList=criteria.list();
-        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<PgDeviceDto>();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
 
         for (PgDevice pgDevice : pgDeviceList) {
             pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
index 3a3bccd..595730e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
@@ -1,10 +1,13 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.devTable.domain.PgAlarmType;
 import com.casic.PgInterface.devTable.domain.PgPartition;
 import com.casic.PgInterface.devTable.domain.PgRoad;
 import com.casic.PgInterface.devTable.domain.PipeGallery;
 import com.casic.PgInterface.devTable.dto.PgPartitionDto;
+import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
@@ -12,7 +15,9 @@
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Created by yxw on 2017/11/4.
@@ -21,7 +26,8 @@
 public class PgPartitionManager extends HibernateEntityDao<PgPartition> {
 
     @Resource
-    PgRoadManager pgRoadManager;
+    private PgRoadManager pgRoadManager;
+
 
     public PgPartition getPartitionByParName(String parName) {
         Criteria criteria = getSession().createCriteria(PgPartition.class);
@@ -99,4 +105,5 @@
         return pgPartitionDtoList;
     }
 
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
index f216360..a6928f1 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
@@ -5,6 +5,7 @@
 public class PgPlanResultRe {
 
     private String taskKey;
+    private List<String> pileAcuList;
     private List<PgPlanResult> pgPlanResultList;
 
     public String getTaskKey() {
@@ -15,6 +16,14 @@
         this.taskKey = taskKey;
     }
 
+    public List<String> getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(List<String> pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+
     public List<PgPlanResult> getPgPlanResultList() {
         return pgPlanResultList;
     }
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
index 71ea765..47eea07 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
@@ -54,9 +54,7 @@
 
         List<PgLineHole> pgLineHoleList=criteria.list();
         List<PgLineHoleDTO> pgLineHoleDTOList=new ArrayList<>();
-        if(pgLineHoleList==null||pgLineHoleList.size()==0)
-            return null;
-        else
+        if(pgLineHoleList!=null&&pgLineHoleList.size()!=0)
             pgLineHoleDTOList=PgLineHoleDTO.ConvertToDTOList(pgLineHoleList,pgPileAcuManager,pgRoadManager);
         return pgLineHoleDTOList;
     }
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
index 0fd9e1f..841a386 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
@@ -1,12 +1,15 @@
 package com.casic.PgInterface.intelPlan.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.devTable.domain.PgPartition;
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
 import com.casic.PgInterface.intelPlan.domain.PgLineHole;
 import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
 import com.casic.PgInterface.intelPlan.domain.PgSection;
 import com.casic.PgInterface.intelPlan.dto.PgPlanResult;
 import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
 import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -22,6 +25,9 @@
     @Resource
     private PgLineHoleManager pgLineHoleManager;
 
+    @Resource
+    private PgRoadManager pgRoadManager;
+
     public PgPileAcu getPgPileAcuByCode(String acuCode){
         List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
 
@@ -58,7 +64,9 @@
         for(PgPlanTask pgPlanTask:pgPlanTaskList){
             List<PgPlanResult> pgPlanResultList=getPgPlanResultByPlantask(pgPlanTask);
             PgPlanResultRe pgPlanResultRe=new PgPlanResultRe();
+
             pgPlanResultRe.setTaskKey(pgPlanTask.getTaskKey());
+            pgPlanResultRe.setPileAcuList(pgPlanTask.getPileAcuList());
             pgPlanResultRe.setPgPlanResultList(pgPlanResultList);
 
             pgPlanResultReList.add(pgPlanResultRe);
@@ -142,4 +150,57 @@
         return length;
     }
 
+    private PgPileAcu getPgPileAcuByAcuCode(String acuCode){
+        List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
+
+        if(pgPileAcuList==null||pgPileAcuList.size()==0)
+            return null;
+        else
+            return pgPileAcuList.get(0);
+    }
+
+    public List<PgAcuTask> getACUTask(String pileAcuList){
+        String[] acuArray=pileAcuList.split(",");
+        List<PgAcuTask> pgAcuTaskList=new ArrayList<>();
+
+        for(String acu:acuArray){
+            PgPileAcu pgPileAcu=this.getPgPileAcuByCode(acu);
+            String roadName=pgRoadManager.get(pgPileAcu.getRoadId()).getRoadName();
+
+            if(!containRoad(roadName,pgAcuTaskList))
+            {
+                PgAcuTask pgAcuTask=new PgAcuTask();
+                pgAcuTask.setRoadName(roadName);
+                pgAcuTask.setPileAcuList(acu);
+                pgAcuTaskList.add(pgAcuTask);
+            }
+            else{
+                PgAcuTask pgAcuTask=getIndexRoad(roadName,pgAcuTaskList);
+                if(pgAcuTask!=null)
+                    pgAcuTask.setPileAcuList(pgAcuTask.getPileAcuList()+","+acu);
+            }
+        }
+
+        return pgAcuTaskList;
+    }
+
+    private boolean containRoad(String roadName,List<PgAcuTask> pgAcuTaskList){
+        if(pgAcuTaskList==null||pgAcuTaskList.size()==0) return false;
+        for(PgAcuTask pgAcuTask:pgAcuTaskList){
+            if(pgAcuTask.getRoadName().equals(roadName))
+                return true;
+        }
+
+        return false;
+    }
+
+    private PgAcuTask getIndexRoad(String roadName, List<PgAcuTask> pgAcuTaskList){
+        for(PgAcuTask pgAcuTask:pgAcuTaskList){
+            if(pgAcuTask.getRoadName().equals(roadName))
+                return pgAcuTask;
+        }
+
+        return null;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java
new file mode 100644
index 0000000..323f7ef
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java
@@ -0,0 +1,25 @@
+package com.casic.PgInterface.reservePlan.dto;
+
+import java.util.List;
+
+public class PgAcuTask {
+
+    private String roadName;//道路
+    private String pileAcuList;//acu分区
+
+    public String getRoadName() {
+        return roadName;
+    }
+
+    public void setRoadName(String roadName) {
+        this.roadName = roadName;
+    }
+
+    public String getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(String pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
index c25e926..c7d7693 100644
--- a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
@@ -70,9 +70,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(Long.valueOf(inPgPersonId));
         PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("hostName",pgInPgPerson.getAssetCode());
-//        PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode());
-//        long maxId = pgTagPositionManager.getMaxId(pgTagMac.getTagMac());
-//        PGTagPosition pgTagPosition = pgTagPositionManager.get(maxId);
+
         PGTagPosition pgTagPosition = tagmacRun.GetTagStatus(pgTagMac);
         boolean bExist = false;
         bExist = pgTagPositionManager.findTagPosition(pgTagPosition.getPositionUpdatetime(),pgTagPosition.getHostId());
@@ -104,8 +102,7 @@
         PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(Long.valueOf(inPgPersonId));
         PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pgInPgPersonId",pgInPgPerson);
         System.out.println("time:"+pgInPgStatus.getInTime());
-//        PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pgInPgPersonId",inPgPersonId);
-//        PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode());
+
         PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("hostName",pgInPgPerson.getAssetCode());
 
         Map<Object,Object> mapPosition = new HashMap<>();
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
index 082ba5d..3eed00a 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
@@ -48,6 +48,7 @@
     public Map<String, Object> linkDevice(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         PgDeviceDto pgDeviceDto = null;
         try {
@@ -62,6 +63,7 @@
                     else {
                         pgDeviceDto = new PgDeviceDto(pgDevice);
                         msg = "报警关联设备获取成功";
+                        code="200";
                     }
                 }
             }
@@ -71,6 +73,7 @@
             e.printStackTrace();
             msg = "获取关联设备失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceDto);
 
@@ -86,6 +89,7 @@
     public Map<String, Object> linkPartitionCamera(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
         try {
@@ -106,6 +110,7 @@
 
                         pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(partition,position);
                         msg = "关联设备获取成功";
+                        code="200";
                     }
                 }
             }
@@ -115,6 +120,7 @@
             e.printStackTrace();
             msg = "分区设备关联失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceDtoList);
         return resultMap;
@@ -129,6 +135,7 @@
     public Map<String, Object> linkReservePlan(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgReservePlanDto> pgReservePlanDtoList=new ArrayList<>();
         try{
@@ -139,10 +146,12 @@
                 else {
                     pgReservePlanDtoList = pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
 
-                    if(pgReservePlanDtoList==null||pgReservePlanDtoList.size()==0)
-                        msg="不存在关联的报警预案";
-                    else
+                    if (pgReservePlanDtoList == null || pgReservePlanDtoList.size() == 0)
+                        msg = "不存在关联的报警预案";
+                    else {
                         msg = "关联预案获取成功";
+                        code="200";
+                    }
                 }
             }
             else
@@ -153,6 +162,7 @@
             e.printStackTrace();
             msg="预案关联失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgReservePlanDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
index 0ddbc4d..0ce886b 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
@@ -41,25 +41,19 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getAlarmList(@FormParam("alarmType") String alarmType,
                                             @FormParam("startDay") String startDay,
+                                            @FormParam("partition") String partition,
                                             @FormParam("endDay") String endDay,
                                             @FormParam("isNew") String isNew,
                                             @FormParam("page") int page,
                                             @FormParam("rows") int rows) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
         try {
-            pgAlarmDtoList = pgAlarmManager.getAllAlarm(alarmType,startDay,endDay,isNew,page,rows);
-            if (pgAlarmDtoList==null||pgAlarmDtoList.size() == 0)
-                msg = "没有报警信息";
-            else
-                msg = "报警信息获取成功";
+            resultMap = pgAlarmManager.getAllAlarm(alarmType,partition,startDay,endDay,isNew,page,rows);
+
         } catch (Exception e) {
             e.printStackTrace();
-            msg = "报警信息获取失败";
         }
-        resultMap.put("msg", msg);
-        resultMap.put("result", pgAlarmDtoList);
         return resultMap;
     }
 
@@ -71,9 +65,10 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> clearAlarmList(@FormParam("id") String id) throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        String result = "false";
+        String result = "";
+        String code="0";
 
         try {
             PgAlarm pgAlarm = new PgAlarm();
@@ -86,12 +81,14 @@
                 pgAlarmManager.save(pgAlarm);
                 msg = "报警信息清除成功";
                 result = "true";
+                code = "200";
             }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警信息清除失败";
             result = "false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
@@ -106,21 +103,26 @@
     public Map<String, Object> getAlarmByTypeOrTime(@FormParam("alarmType") String alarmType,
                                                     @FormParam("startTime") String startTime,
                                                     @FormParam("endTime") String endTime) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
-        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<PgAlarmDto>();
+        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
         try {
             pgAlarmDtoList = pgAlarmManager.getAlarmByTypeAndTime(alarmType, startTime, endTime);
             if (pgAlarmDtoList == null || pgAlarmDtoList.size() == 0)
                 msg = "报警信息不存在";
             else
+            {
                 msg = "报警信息获取成功";
+                code="200";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警信息获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
index 29ce8a4..ed0bf34 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
@@ -39,8 +39,8 @@
     public Map<String, Object> getAlarmRule(@FormParam("devType") String devType) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
-        System.out.println("devType:"+devType);
         List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<>();
         try {
             pgAlarmRuleDtoList = pgAlarmRuleManager.getAlarmRuleDto(devType);
@@ -52,6 +52,7 @@
             e.printStackTrace();
             msg = "报警阈值信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmRuleDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
index 24ab894..abef1b1 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
@@ -39,16 +39,21 @@
                                                      @FormParam("endDate") String endDate)throws Exception{
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
+
         List<PgAlarmTjDto> pgAlarmTjDtoList=null;
         try{
             pgAlarmTjDtoList=pgAlarmTjManager.getAlarmTjResultByType(startDate,endDate);
             msg="获取成功";
+            code="200";
         }
         catch(Exception ex) {
             msg = "统计失败";
         }
-        resultMap.put("result",pgAlarmTjDtoList);
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
+        resultMap.put("result",pgAlarmTjDtoList);
+
         return resultMap;
     }
 
@@ -61,23 +66,27 @@
     public Map<String, Object> getAlarmByTime(@FormParam("startTime") String startTime,
                                               @FormParam("endTime") String endTime,
                                               @FormParam("statisticType") String statisticType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code = "0";
 
-        List<PgAlarmTjDto> pgAlarmTjDtoList = new ArrayList<PgAlarmTjDto>();
+        List<PgAlarmTjDto> pgAlarmTjDtoList = new ArrayList<>();
         try {
             pgAlarmTjDtoList = pgAlarmTjManager.getAlarmByTime(startTime, endTime, statisticType);
             if(pgAlarmTjDtoList==null)
                 msg="报警统计信息获取失败";
-            else
-                msg="报警统计信息获取成功";
+            else {
+                msg = "报警统计信息获取成功";
+                code="200";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警统计信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmTjDtoList);
         return resultMap;
     }
 
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
index 28bc811..b6278a9 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
@@ -30,7 +30,6 @@
     @Resource
     private PgAlarmTypeManager pgAlarmTypeManager;
 
-
     /**
      * 获取报警类型
      */
@@ -38,19 +37,24 @@
     @Path("getAlarmType")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getAlarmTypeList()throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
-        List<PgAlarmTypeDto> pgAlarmTypeDtoList=new ArrayList<PgAlarmTypeDto>();
+        String code="";
+
+        List<PgAlarmTypeDto> pgAlarmTypeDtoList=new ArrayList<>();
         try {
             pgAlarmTypeDtoList = pgAlarmTypeManager.getAllAlarmTypeDto();
             if(pgAlarmTypeDtoList.size()==0)
                 msg="没有报警类型信息";
-            else
-                msg="报警类型信息获取成功";
+            else {
+                code="200";
+                msg = "报警类型信息获取成功";
+            }
         }catch(Exception e){
             e.printStackTrace();
             msg="报警类型信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAlarmTypeDtoList);
         return resultMap;
@@ -66,6 +70,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
@@ -83,6 +88,7 @@
                 logger.info("成功保存");
                 result = "true";
                 msg = "保存成功";
+                code="200";
             }
         } catch (Exception e) {
             result = "false";
@@ -90,6 +96,7 @@
             e.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -106,6 +113,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try{
             if(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
@@ -119,6 +127,7 @@
                 pgAlarmTypeManager.save(pgAlarmType);
                 result = "true";
                 msg = "编辑成功";
+                code="200";
             }
         }
         catch(Exception e)
@@ -128,6 +137,7 @@
             e.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("result",result);
         resultMap.put("msg",msg);
 
@@ -146,6 +156,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
         String result="false";
+        String code="0";
 
         try {
             PgAlarmType pgAlarmType=pgAlarmTypeManager.get(Long.valueOf(id));
@@ -157,6 +168,7 @@
             {
                 pgAlarmType.setActive(0);
                 pgAlarmTypeManager.save(pgAlarmType);
+                code="200";
                 msg="报警类型删除成功";
                 result="true";
             }
@@ -165,6 +177,7 @@
             msg="报警类型删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
index 4533e1a..85940bb 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
@@ -33,12 +33,15 @@
                                                  @FormParam("inSpectionPlace") String inSpectionPlace){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
         List<PgAssetPlanDto> pgAssetPlanDtoList=new ArrayList<>();
         try{
             pgAssetPlanDtoList=pgAssetPlanManager.getPgAssetPlanDtoList(startDay,endDay,inSpectionPlace);
-            if(pgAssetPlanDtoList!=null&&pgAssetPlanDtoList.size()!=0)
-                msg="巡检信息获取成功";
+            if(pgAssetPlanDtoList!=null&&pgAssetPlanDtoList.size()!=0) {
+                code="200";
+                msg = "巡检信息获取成功";
+            }
             else
                 msg="不存在巡检信息";
         }
@@ -47,6 +50,7 @@
             msg="巡检信息获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAssetPlanDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
index 47ef9d1..5cbdfcb 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
@@ -30,12 +30,15 @@
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
         String result="";
+        String code="0";
 
         List<PgAssetPlanStatic> pgAssetPlanStaticList = null;
         try{
             pgAssetPlanStaticList=pgAssetPlanManager.getPgAssetPlanStaticLisByTime(startTime,endTime,staticType);
-            if(pgAssetPlanStaticList!=null&&pgAssetPlanStaticList.size()!=0)
-                msg="巡检统计信息获取成功";
+            if(pgAssetPlanStaticList!=null&&pgAssetPlanStaticList.size()!=0) {
+                code = "200";
+                msg = "巡检统计信息获取成功";
+            }
             else
                 msg="统计信息获取失败";
         }
@@ -44,6 +47,7 @@
             msg="统计失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAssetPlanStaticList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
index 26f5d6a..503bfe3 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
@@ -40,6 +40,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="";
 
         try{
             PgAuthority pgAuthority=new PgAuthority();
@@ -50,6 +51,7 @@
 
             pgAuthorityManager.save(pgAuthority);
             msg="用户权限保存成功";
+            code="200";
             result="true";
         }
         catch(Exception e) {
@@ -57,6 +59,7 @@
             msg = "新增权限失败";
             result = "false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -65,22 +68,25 @@
 
     /*
        *编辑角权限信息
-        */
+    */
     @POST
     @Path("editAuthority")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> editAuthority(@FormParam("id") String id,
                                        @FormParam("authority") String authority,
                                        @FormParam("concent") String concent) throws Exception{
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
+
         try {
             PgAuthority pgAuthority=pgAuthorityManager.get(Long.valueOf(id));
             pgAuthority.setAuthority(authority);
             pgAuthority.setConcent(concent);
 
             pgAuthorityManager.save(pgAuthority);
+            code="200";
             msg="权限保存成功";
             result="true";
         }
@@ -90,7 +96,7 @@
             msg="权限编辑失败";
             result="false";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -105,9 +111,10 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> deleteAuthority(@FormParam("id") String id)throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
-        String result="false";
+        String result="";
+        String code="0";
 
         try {
             PgAuthority pgAuthority= pgAuthorityManager.get(Long.valueOf(id));
@@ -119,6 +126,7 @@
             {
                 pgAuthority.setActive(0);
                 pgAuthorityManager.save(pgAuthority);
+                code="200";
                 msg="删除权限成功";
                 result="true";
             }
@@ -127,37 +135,40 @@
             msg="删除权限失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
     }
 
     /*
-* 获取权限信息
- */
+    * 获取权限信息
+    */
     @POST
     @Path("getAuthorityList")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> getAuthorityList() {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgAuthorityDto> pgAuthorityDtoList = new ArrayList<PgAuthorityDto>();
         try {
             pgAuthorityDtoList = pgAuthorityManager.getAuthorityList();
             if (pgAuthorityDtoList == null)
                 msg = "不存在权限信息";
-            else
+            else {
+                code = "200";
                 msg = "权限信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "权限信息获取是失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAuthorityDtoList);
         return resultMap;
     }
 
 
-
-
 }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
index a9ef521..a74ecc7 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
@@ -45,6 +45,7 @@
                                                @FormParam("endDate") String endDate)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgHistoryDataDto> pgHistoryDataDtoList=new ArrayList<>();
 
         try {
@@ -55,13 +56,16 @@
                 pgHistoryDataDtoList=pgCh4Manager.getAllCH4Data(pgDevice,startDate,endDate);
                 if(pgHistoryDataDtoList==null)
                     msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+                else {
+                    code = "200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgHistoryDataDtoList);
         return resultMap;
@@ -75,8 +79,9 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getNewestCh4InfoByDev(@FormParam("assetCode") String assetCode)throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
+        String code="0";
         PgCh4Dto pgCh4Dto=new PgCh4Dto(null);
 
         try {
@@ -87,13 +92,17 @@
                 pgCh4Dto=pgCh4Manager.getNewestCH4Data(pgDevice);
                 if(pgCh4Dto==null)
                     msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgCh4Dto);
         return resultMap;
@@ -111,6 +120,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
@@ -127,6 +137,7 @@
                 pgCh4.setPgDeviceId(pgDevice);
 
                 pgCh4Manager.save(pgCh4);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -135,7 +146,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
index a7eac39..dfc8ca5 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
@@ -43,23 +43,27 @@
                                                       @FormParam("endDate") String endDate)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgHistoryDataDto> pgHistoryDataDtoList=new ArrayList<>();
 
         try {
             PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
                 msg="设备不存在";
-            else{
-                pgHistoryDataDtoList=pgCoManager.getAllCoData(pgDevice, startDate, endDate);
-                if(pgHistoryDataDtoList==null)
-                    msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+            else {
+                pgHistoryDataDtoList = pgCoManager.getAllCoData(pgDevice, startDate, endDate);
+                if (pgHistoryDataDtoList == null)
+                    msg = "没有满足要求的数据";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgHistoryDataDtoList);
         return resultMap;
@@ -75,6 +79,7 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         PgCoDto pgCoDto=new PgCoDto(null);
 
         try {
@@ -85,13 +90,16 @@
                 pgCoDto=pgCoManager.getNewestCoData(pgDevice);
                 if(pgCoDto==null)
                     msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgCoDto);
         return resultMap;
@@ -110,6 +118,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         try {
@@ -126,6 +135,7 @@
 
                 pgCoManager.save(pgCo);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
         } catch (Exception e) {
@@ -133,7 +143,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 25ded8a..283d7ab 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,20 +7,56 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" 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/construction/manager/PgCsDocumentManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/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/manager/PgAlarmManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/~$说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/~$说明20191207.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.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$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/接口说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明20191207.docx" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
@@ -51,7 +87,7 @@
         <counts>
           <entry key="class" value="4" />
           <entry key="iml" value="2" />
-          <entry key="java" value="707" />
+          <entry key="java" value="820" />
           <entry key="properties" value="14" />
           <entry key="xml" value="7" />
         </counts>
@@ -60,7 +96,7 @@
         <counts>
           <entry key="CLASS" value="4" />
           <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="707" />
+          <entry key="JAVA" value="820" />
           <entry key="Properties" value="14" />
           <entry key="XML" value="7" />
         </counts>
@@ -68,32 +104,32 @@
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
           <entry key="dummy" value="38" />
-          <entry key="java" value="30161" />
+          <entry key="java" value="40859" />
           <entry key="properties" value="100" />
-          <entry key="txt" value="176" />
+          <entry key="txt" value="186" />
           <entry key="xml" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="30161" />
-          <entry key="PLAIN_TEXT" value="214" />
+          <entry key="JAVA" value="40859" />
+          <entry key="PLAIN_TEXT" value="224" />
           <entry key="Properties" value="100" />
           <entry key="XML" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="48" />
+          <entry key="project.closed" value="51" />
           <entry key="project.open.time.1" value="5" />
           <entry key="project.open.time.12" value="2" />
           <entry key="project.open.time.13" value="1" />
           <entry key="project.open.time.15" value="1" />
           <entry key="project.open.time.16" value="1" />
           <entry key="project.open.time.17" value="1" />
-          <entry key="project.open.time.2" value="1" />
+          <entry key="project.open.time.2" value="2" />
           <entry key="project.open.time.20" value="1" />
-          <entry key="project.open.time.23" value="1" />
+          <entry key="project.open.time.23" value="2" />
           <entry key="project.open.time.24" value="2" />
           <entry key="project.open.time.251" value="1" />
           <entry key="project.open.time.27" value="2" />
@@ -106,8 +142,8 @@
           <entry key="project.open.time.36" value="1" />
           <entry key="project.open.time.37" value="1" />
           <entry key="project.open.time.39" value="2" />
-          <entry key="project.open.time.4" value="2" />
-          <entry key="project.open.time.40" value="1" />
+          <entry key="project.open.time.4" value="3" />
+          <entry key="project.open.time.40" value="2" />
           <entry key="project.open.time.41" value="2" />
           <entry key="project.open.time.42" value="2" />
           <entry key="project.open.time.43" value="2" />
@@ -122,23 +158,25 @@
           <entry key="project.open.time.6" value="3" />
           <entry key="project.open.time.63" value="2" />
           <entry key="project.open.time.64" value="1" />
+          <entry key="project.open.time.66" value="1" />
           <entry key="project.open.time.71" value="2" />
+          <entry key="project.open.time.74" value="1" />
           <entry key="project.open.time.76" value="1" />
           <entry key="project.open.time.8" value="2" />
           <entry key="project.open.time.9" value="1" />
           <entry key="project.open.time.97" value="1" />
-          <entry key="project.opened" value="78" />
+          <entry key="project.opened" value="84" />
         </counts>
       </usages-collector>
     </session>
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+            <state relative-caret-position="396">
+              <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
               <folding>
                 <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
                 <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -147,73 +185,6 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <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="99">
-              <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-              <folding>
-                <element signature="imports" expanded="true" />
-                <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-1170">
-              <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state>
-              <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
-              <folding>
-                <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-                <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="true">
-        <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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-              <folding>
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-                <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>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <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="352">
-              <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -225,18 +196,9 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>inCriteria</find>
-      <find>getPgPlanResulList</find>
-      <find>getPileAcuListByPileAcuStr</find>
-      <find>distinct</find>
-      <find>order</find>
-      <find>canPlanLine</find>
-      <find>isExistLine</find>
-      <find>getPlanResult</find>
       <find>pgPipeLine</find>
       <find>getPipeLineBylineName</find>
       <find>StringU</find>
-      <find>getAllAlarm</find>
       <find>getAlarmList</find>
       <find>getPgInPersonListByDay</find>
       <find>getDayInPgStatistic</find>
@@ -254,7 +216,16 @@
       <find>getPgContructionByNameOrType</find>
       <find>&quot;&quot;,&quot;&quot;,</find>
       <find>getPgContructionDtoByNameOrType</find>
+      <find>addConstruction</find>
+      <find>getPgLineAcuHole</find>
+      <find>getPlanResult</find>
       <find>getConstruction</find>
+      <find>addPipeLine</find>
+      <find>未找到入廊数据</find>
+      <find>getCurrentHoleByAcu</find>
+      <find>getAllAlarm</find>
+      <find>getPgDeviceDtoListByPartition</find>
+      <find>getPgDeviceByDevType</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -263,57 +234,57 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlan.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileHoleManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/planData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/PlanData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
       </list>
     </option>
   </component>
@@ -359,7 +330,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -421,53 +391,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="dto" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="manager" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -479,29 +402,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="rs" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -516,6 +416,7 @@
         </subPane>
       </pane>
       <pane id="Scope" />
+      <pane id="PackagesPane" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -710,7 +611,13 @@
       <workItem from="1574902733573" duration="1829000" />
       <workItem from="1574998240004" duration="7016000" />
       <workItem from="1575247959683" duration="6997000" />
-      <workItem from="1575704345590" duration="40473000" />
+      <workItem from="1575704345590" duration="69381000" />
+      <workItem from="1575869479666" duration="721000" />
+      <workItem from="1575947104878" duration="6101000" />
+      <workItem from="1576128264436" duration="3347000" />
+      <workItem from="1576208571543" duration="22000" />
+      <workItem from="1576227513917" duration="862000" />
+      <workItem from="1576293721220" duration="18246000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -817,11 +724,18 @@
       <option name="project" value="LOCAL" />
       <updated>1575775489149</updated>
     </task>
-    <option name="localTasksCounter" value="16" />
+    <task id="LOCAL-00016" summary="整改施工信息">
+      <created>1575791780774</created>
+      <option name="number" value="00016" />
+      <option name="presentableId" value="LOCAL-00016" />
+      <option name="project" value="LOCAL" />
+      <updated>1575791780774</updated>
+    </task>
+    <option name="localTasksCounter" value="17" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="452131000" />
+    <option name="totallyTimeSpent" value="510338000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -834,9 +748,8 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
-    <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.24205749" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2647504" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -847,7 +760,7 @@
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.3295082" />
       <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.4819672" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.65737706" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.3295082" />
@@ -939,7 +852,8 @@
     <MESSAGE value="重新设计智能规划部分" />
     <MESSAGE value="完成智能规划对接" />
     <MESSAGE value="修改报警统计" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改报警统计" />
+    <MESSAGE value="整改施工信息" />
+    <option name="LAST_COMMIT_MESSAGE" value="整改施工信息" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -951,16 +865,10 @@
           <option name="timeStamp" value="3" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java</url>
-          <line>69</line>
+          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java</url>
+          <line>40</line>
           <properties />
-          <option name="timeStamp" value="21" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java</url>
-          <line>96</line>
-          <properties />
-          <option name="timeStamp" value="38" />
+          <option name="timeStamp" value="122" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
@@ -970,394 +878,452 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <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="2068">
-          <caret line="154" column="35" selection-start-line="154" selection-start-column="35" selection-end-line="154" selection-end-column="35" />
-        </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="3300">
-          <caret line="297" column="22" selection-start-line="297" selection-start-column="22" selection-end-line="297" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/StringUtils.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
-          <caret line="13" column="48" lean-forward="true" selection-start-line="13" selection-start-column="48" selection-end-line="13" selection-end-column="48" />
+          <caret line="11" column="5" selection-start-line="11" selection-start-column="5" selection-end-line="11" selection-end-column="5" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="78" lean-forward="true" selection-start-line="78" selection-end-line="78" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="616">
-          <caret line="41" column="1" selection-start-line="41" selection-start-column="1" selection-end-line="41" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="110">
-          <caret line="12" column="23" selection-start-line="12" selection-start-column="23" selection-end-line="12" selection-end-column="23" />
+        <state relative-caret-position="516">
+          <caret line="114" column="12" selection-start-line="114" selection-start-column="12" selection-end-line="114" selection-end-column="12" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="164">
-          <caret line="56" lean-forward="true" selection-start-line="56" selection-end-line="56" />
+        <state relative-caret-position="418">
+          <caret line="33" column="44" selection-start-line="33" selection-start-column="44" selection-end-line="33" selection-end-column="44" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="258">
-          <caret line="27" column="12" lean-forward="true" selection-start-line="27" selection-start-column="12" selection-end-line="27" selection-end-column="12" />
+        <state relative-caret-position="132">
+          <caret line="11" column="20" lean-forward="true" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="20" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.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="-12">
-          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        <state relative-caret-position="516">
+          <caret line="142" column="54" selection-start-line="142" selection-start-column="54" selection-end-line="142" selection-end-column="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="858">
-          <caret line="55" column="27" lean-forward="true" selection-start-line="55" selection-start-column="27" selection-end-line="55" selection-end-column="27" />
+        <state relative-caret-position="66">
+          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="58">
+          <caret line="18" column="28" selection-start-line="18" selection-start-column="19" selection-end-line="18" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="305">
+          <caret line="24" column="31" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="714">
+          <caret line="58" column="5" lean-forward="true" selection-start-line="58" selection-start-column="5" selection-end-line="58" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="924">
+          <caret line="134" column="92" selection-start-line="134" selection-start-column="92" selection-end-line="134" selection-end-column="92" />
+          <folding>
+            <element signature="method#linkDevice#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkPartitionCamera#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkReservePlan#0;class#PgAlarmLinkRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1066">
+          <caret line="90" lean-forward="true" selection-start-line="90" selection-end-line="90" />
+          <folding>
+            <element signature="method#getTjResultByAlarmType#0;class#PgAlarmTjRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="946">
+          <caret line="148" column="11" lean-forward="true" selection-start-line="148" selection-start-column="11" selection-end-line="148" selection-end-column="11" />
+          <folding>
+            <element signature="method#getAlarmTypeList#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#addAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#editAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#deleteAlarmType#0;class#PgAlarmTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="208">
+          <caret line="46" column="23" lean-forward="true" selection-start-line="46" selection-start-column="23" selection-end-line="46" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="113" column="9" lean-forward="true" selection-start-line="113" selection-start-column="9" selection-end-line="113" selection-end-column="9" />
+          <folding>
+            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
+            <element signature="method#getNewestCh4InfoByDev#0;class#PgCh4Rs#0" />
+            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="145" column="6" lean-forward="true" selection-start-line="145" selection-start-column="6" selection-end-line="145" selection-end-column="6" />
+          <folding>
+            <element signature="method#addAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#editAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#deleteAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#getAuthorityList#0;class#PgAuthorityRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="58" column="1" lean-forward="true" selection-start-line="58" selection-start-column="1" selection-end-line="58" selection-end-column="1" />
+          <folding>
+            <element signature="method#getPgAssetPlanList#0;class#PgAssetPlanRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="370">
+          <caret line="371" column="66" selection-start-line="371" selection-start-column="66" selection-end-line="371" selection-end-column="66" />
+          <folding>
+            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#searchConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionDev#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="139" column="13" lean-forward="true" selection-start-line="139" selection-start-column="13" selection-end-line="139" selection-end-column="13" />
+          <folding>
+            <element signature="method#getCoInfoByDevAndDate#0;class#PgCoRs#0" />
+            <element signature="method#getNewestCoInfoByDev#0;class#PgCoRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="540">
+          <caret line="223" column="5" lean-forward="true" selection-start-line="223" selection-start-column="5" selection-end-line="223" selection-end-column="5" />
+          <folding>
+            <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="682">
+          <caret line="100" lean-forward="true" selection-start-line="100" selection-end-line="100" />
+          <folding>
+            <element signature="method#getDeviceTpeyList#0;class#PgDeviceTypeRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="377">
+          <caret line="225" column="35" selection-start-line="225" selection-start-column="35" selection-end-line="225" selection-end-column="35" />
+          <folding>
+            <element signature="method#addEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#addEquipment#1;class#PgEquipmentRs#0" />
+            <element signature="method#getEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#deleteEquipment#0;class#PgEquipmentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="406">
+          <caret line="109" lean-forward="true" selection-start-line="109" selection-end-line="109" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="154">
+          <caret line="28" column="19" selection-start-line="28" selection-start-column="19" selection-end-line="28" selection-end-column="19" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="748">
-          <caret line="49" column="5" lean-forward="true" selection-start-line="49" selection-start-column="5" selection-end-line="49" selection-end-column="5" />
+        <state relative-caret-position="296">
+          <caret line="161" column="35" selection-start-line="161" selection-start-column="35" selection-end-line="161" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="384">
+          <caret line="99" column="5" lean-forward="true" selection-start-line="99" selection-start-column="5" selection-end-line="99" selection-end-column="5" />
+        </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="362">
+          <caret line="340" column="35" selection-start-line="340" selection-start-column="35" selection-end-line="340" selection-end-column="35" />
+          <folding>
+            <element signature="method#addInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPersonInPg#0;class#PgInPgPersonRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-606">
+          <caret line="76" column="20" lean-forward="true" selection-start-line="76" selection-start-column="20" selection-end-line="76" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="65" column="35" selection-start-line="65" selection-start-column="35" selection-end-line="65" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="101" column="35" selection-start-line="101" selection-start-column="35" selection-end-line="101" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="84" column="35" selection-start-line="84" selection-start-column="35" selection-end-line="84" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="59" lean-forward="true" selection-start-line="59" selection-end-line="59" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="60" column="1" lean-forward="true" selection-start-line="60" selection-start-column="1" selection-end-line="60" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="145" column="35" selection-start-line="145" selection-start-column="35" selection-end-line="145" selection-end-column="35" />
+        </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="274">
+          <caret line="350" column="35" selection-start-line="350" selection-start-column="35" selection-end-line="350" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="121" column="39" selection-start-line="121" selection-start-column="39" selection-end-line="121" selection-end-column="39" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="28" column="8" lean-forward="true" selection-start-line="28" selection-start-column="8" selection-end-line="28" selection-end-column="8" />
+        <state relative-caret-position="340">
+          <caret line="103" selection-start-line="103" selection-end-line="103" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="226" column="35" selection-start-line="226" selection-start-column="35" selection-end-line="226" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="203" column="35" selection-start-line="203" selection-start-column="35" selection-end-line="203" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="241" column="35" selection-start-line="241" selection-start-column="35" selection-end-line="241" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="225" column="1" lean-forward="true" selection-start-line="225" selection-start-column="1" selection-end-line="225" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="176" column="5" lean-forward="true" selection-start-line="176" selection-start-column="5" selection-end-line="176" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="178" column="35" lean-forward="true" selection-start-line="178" selection-start-column="35" selection-end-line="178" selection-end-column="35" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="516">
-          <caret line="94" column="53" selection-start-line="94" selection-start-column="53" selection-end-line="94" selection-end-column="53" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="814">
-          <caret line="52" column="9" lean-forward="true" selection-start-line="52" selection-start-column="9" selection-end-line="52" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="182">
-          <caret line="58" column="12" lean-forward="true" selection-start-line="58" selection-start-column="12" selection-end-line="58" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="34" lean-forward="true" selection-start-line="34" selection-end-line="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="32" lean-forward="true" selection-start-line="32" selection-end-line="32" />
-          <folding>
-            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
-            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="185">
-          <caret line="63" column="13" selection-start-line="63" selection-start-column="13" selection-end-line="63" selection-end-column="13" />
-          <folding>
-            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
-            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
-            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="e#6319#6324#0" />
-            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
-          </folding>
+          <caret line="240" lean-forward="true" selection-start-line="240" selection-end-line="240" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
-          <caret line="58" column="28" lean-forward="true" selection-start-line="58" selection-start-column="28" selection-end-line="58" selection-end-column="28" />
-          <folding>
-            <element signature="method#addTempHumData#0;class#PgTempHumRs#0" />
-          </folding>
+        <state relative-caret-position="340">
+          <caret line="148" column="34" selection-start-line="148" selection-start-column="34" selection-end-line="148" selection-end-column="34" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
+        <state relative-caret-position="458">
+          <caret line="99" column="35" selection-start-line="99" selection-start-column="35" selection-end-line="99" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+        <state relative-caret-position="384">
+          <caret line="145" column="32" lean-forward="true" selection-start-line="145" selection-start-column="32" selection-end-line="145" selection-end-column="32" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="414">
-          <caret line="22" column="46" lean-forward="true" selection-start-line="22" selection-start-column="46" selection-end-line="22" selection-end-column="46" />
-        </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="396">
-          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" column="83" selection-start-line="11" selection-start-column="83" selection-end-line="11" selection-end-column="83" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="26">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
-          <folding>
-            <element signature="method#getPgInPgStatusByPerson#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNumByName#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNum#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPersonListByDay#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPgStatusByPgInPgPerson#0;class#PgInPgStatusManager#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="44">
-          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-12">
-          <caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="87" lean-forward="true" selection-start-line="87" selection-end-line="87" />
-          <folding>
-            <element signature="method#getConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#addConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#deleteConstructionType#0;class#PgConstructionTypeRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
-          <folding>
-            <element signature="method#getConstructionTypeByType#0;class#PgConstructionTypeManager#0" />
-            <element signature="method#getAllConstructionTypeDto#0;class#PgConstructionTypeManager#0" />
-          </folding>
-        </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="145">
-          <caret line="258" column="9" lean-forward="true" selection-start-line="258" selection-start-column="9" selection-end-line="258" selection-end-column="9" />
-          <folding>
-            <element signature="method#getMonthInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayInPgStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgOverViewRs#0" />
-            <element signature="method#getAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getMonthAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayAlarmStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgOverViewRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="103">
-          <caret line="105" column="50" lean-forward="true" selection-start-line="105" selection-start-column="50" selection-end-line="105" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateBasicDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="99">
-          <caret line="125" selection-start-line="125" selection-end-line="125" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="190">
-          <caret line="24" column="35" lean-forward="true" selection-start-line="24" selection-start-column="35" selection-end-line="24" selection-end-column="35" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="436">
-          <caret line="24" lean-forward="true" selection-start-line="24" selection-end-line="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" lean-forward="true" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="300">
-          <caret line="34" column="31" lean-forward="true" selection-start-line="34" selection-start-column="31" selection-end-line="34" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="42" column="13" lean-forward="true" selection-start-line="42" selection-start-column="13" selection-end-line="42" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="120" column="72" lean-forward="true" selection-start-line="120" selection-start-column="72" selection-end-line="120" selection-end-column="72" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="293">
-          <caret line="58" column="73" lean-forward="true" selection-start-line="58" selection-start-column="73" selection-end-line="58" selection-end-column="73" />
-          <folding>
-            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
-            <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
-          </folding>
-        </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="307">
-          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
+        <state relative-caret-position="758">
+          <caret line="130" column="5" lean-forward="true" selection-start-line="130" selection-start-column="5" selection-end-line="130" selection-end-column="5" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1170">
-          <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
+        <state relative-caret-position="494">
+          <caret line="86" column="62" lean-forward="true" selection-start-line="86" selection-start-column="62" selection-end-line="86" selection-end-column="62" />
           <folding>
-            <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-            <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+            <element signature="method#getAllDevice#0;class#PgDeviceManager#0" />
+            <element signature="method#getAllDev#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="195" column="28" lean-forward="true" selection-start-line="195" selection-start-column="28" selection-end-line="195" selection-end-column="28" />
+        <state relative-caret-position="166">
+          <caret line="174" column="13" lean-forward="true" selection-start-line="174" selection-start-column="13" selection-end-line="174" selection-end-column="13" />
           <folding>
-            <element signature="method#getAlarmByTypeAndTime#0;class#PgAlarmManager#0" />
-            <element signature="method#getAlarmNum#0;class#PgAlarmManager#0" />
             <element signature="method#getDayAlarmStatistic#0;class#PgAlarmManager#0" />
+            <element signature="method#getAlarmList#0;class#PgAlarmManager#0" />
             <element signature="method#createDTO#0;class#PgAlarmManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="364">
+          <caret line="46" column="56" lean-forward="true" selection-start-line="46" selection-start-column="56" selection-end-line="46" selection-end-column="56" />
+          <folding>
+            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
+            <element signature="method#getPgDev#0;class#PgDeviceRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
+            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+        <state relative-caret-position="396">
+          <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
           <folding>
             <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
             <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -1365,52 +1331,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="239">
-          <caret line="21" column="33" lean-forward="true" selection-start-line="21" selection-start-column="33" selection-end-line="21" selection-end-column="33" />
-        </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="352">
-          <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-        </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="99">
-          <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-          </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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-          <folding>
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-            <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>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
index c436c93..e913155 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
@@ -132,7 +132,10 @@
             this.setAlarmType("");
         else
             this.setAlarmType(pgAlarm.getAlarmTypeId().getAlarmType());
-        this.setAlarmValue(pgAlarm.getAlarmValue());
+        if(pgAlarm.getAlarmValue()==null)
+            this.setAlarmValue("");
+        else
+            this.setAlarmValue(pgAlarm.getAlarmValue());
         if (pgAlarm.getAlarmDate() != null)
             this.setAlarmDate(sdf.format(pgAlarm.getAlarmDate()));
         else
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
index a43965c..565cb41 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -159,11 +159,21 @@
     }
 
     //获取历史报警消息列表
-    public List<PgAlarmDto> getAllAlarm(String alarmType,String startDay,String endDay,String isNew,int page,int rows) {
-        try {
+    public  Map<String, Object> getAllAlarm(String alarmType,String partition,String startDay,String endDay,String isNew,int page,int rows) {
 
+        Map<String, Object> resultMap = new HashMap<>();
+        String msg="";
+
+        try {
             Criteria criteria = createCriteria(PgAlarm.class);
 
+            if (StringUtils.isNotBlank(partition)) {
+                DetachedCriteria inCriteria = DetachedCriteria.forClass(PgDevice.class);
+                inCriteria.add(Restrictions.eq("partition", partition));
+                inCriteria.setProjection(Property.forName("id"));
+                criteria.add(Property.forName("alarmDevId").in(inCriteria));
+            }
+
             if (StringUtils.isNotBlank(alarmType)&&!alarmType.contains("全部")&&pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
                 criteria.add(Restrictions.eq("alarmTypeId", pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)));
 
@@ -190,8 +200,16 @@
             for (PgAlarm pgAlarm : pgAlarmList) {
                 pgAlarmDtoList.add(new PgAlarmDto(pgAlarm));
             }
-
-            return pgAlarmDtoList;
+            if(pgAlarmDtoList==null||pgAlarmDtoList.size()==0) {
+                resultMap.put("msg", "没有报警信息");
+                resultMap.put("code","0");
+            }else {
+                resultMap.put("code","200");
+                resultMap.put("msg", "报警信息获取成功");
+            }
+            resultMap.put("count",pg.getTotalCount());
+            resultMap.put("result",pgAlarmDtoList);
+            return resultMap;
         }
         catch(Exception ex){
             ex.printStackTrace();
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index 7547560..654f49e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -24,11 +24,11 @@
 
         Criteria criteria = createCriteria(PgDevice.class);
 
-        if(road!=null)
+        if(StringUtils.isNotBlank(road))
             criteria.add(Restrictions.eq("road",road));
-        if(partition!=null)
+        if(StringUtils.isNotBlank(partition))
             criteria.add(Restrictions.eq("partition",partition));
-        if(devType!=null)
+        if(StringUtils.isNotBlank(devType))
             criteria.add(Restrictions.eq("devType",devType));
 
         criteria.add(Restrictions.eq("active", 1));
@@ -43,6 +43,29 @@
         return pgDeviceDtoList;
     }
 
+    public List<PgDeviceDto> getAllDev(String road,String partition,String devType) {
+
+        Criteria criteria = createCriteria(PgDevice.class);
+
+        if(StringUtils.isNotBlank(road))
+            criteria.add(Restrictions.eq("road",road));
+        if(StringUtils.isNotBlank(partition))
+            criteria.add(Restrictions.eq("partition",partition));
+        if(StringUtils.isNotBlank(devType))
+            criteria.add(Restrictions.like("devType","%"+devType+"%"));
+
+        criteria.add(Restrictions.eq("active", 1));
+        criteria.addOrder(Order.desc("id"));
+        List<PgDevice> pgDeviceList = criteria.list();
+
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
+        for (PgDevice pgDevice : pgDeviceList) {
+            pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
+        }
+
+        return pgDeviceDtoList;
+    }
+
     //根据名字获取当前设备
     public PgDevice getDeviceByAssetCode(String assetCode) {
         Criteria criteria=createCriteria(PgDevice.class);
@@ -56,9 +79,9 @@
     }
 
     //根据类型获取设备列表
-    public List<PgDeviceDto> getDeviceByDevTypee(String devType) {
+    public List<PgDeviceDto> getDeviceByDevType(String devType) {
         Criteria criteria=createCriteria(PgDevice.class);
-        criteria.add(Restrictions.eq("devType",devType));
+        criteria.add(Restrictions.like("devType","%"+devType+"%"));
 
         List<PgDevice> pgDeviceList=criteria.list();
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
@@ -106,7 +129,7 @@
         criteria.add(Restrictions.eq("partition",partition));
 
         List<PgDevice> pgDeviceList=criteria.list();
-        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<PgDeviceDto>();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
 
         for (PgDevice pgDevice : pgDeviceList) {
             pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
index 3a3bccd..595730e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
@@ -1,10 +1,13 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.devTable.domain.PgAlarmType;
 import com.casic.PgInterface.devTable.domain.PgPartition;
 import com.casic.PgInterface.devTable.domain.PgRoad;
 import com.casic.PgInterface.devTable.domain.PipeGallery;
 import com.casic.PgInterface.devTable.dto.PgPartitionDto;
+import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
@@ -12,7 +15,9 @@
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Created by yxw on 2017/11/4.
@@ -21,7 +26,8 @@
 public class PgPartitionManager extends HibernateEntityDao<PgPartition> {
 
     @Resource
-    PgRoadManager pgRoadManager;
+    private PgRoadManager pgRoadManager;
+
 
     public PgPartition getPartitionByParName(String parName) {
         Criteria criteria = getSession().createCriteria(PgPartition.class);
@@ -99,4 +105,5 @@
         return pgPartitionDtoList;
     }
 
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
index f216360..a6928f1 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
@@ -5,6 +5,7 @@
 public class PgPlanResultRe {
 
     private String taskKey;
+    private List<String> pileAcuList;
     private List<PgPlanResult> pgPlanResultList;
 
     public String getTaskKey() {
@@ -15,6 +16,14 @@
         this.taskKey = taskKey;
     }
 
+    public List<String> getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(List<String> pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+
     public List<PgPlanResult> getPgPlanResultList() {
         return pgPlanResultList;
     }
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
index 71ea765..47eea07 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
@@ -54,9 +54,7 @@
 
         List<PgLineHole> pgLineHoleList=criteria.list();
         List<PgLineHoleDTO> pgLineHoleDTOList=new ArrayList<>();
-        if(pgLineHoleList==null||pgLineHoleList.size()==0)
-            return null;
-        else
+        if(pgLineHoleList!=null&&pgLineHoleList.size()!=0)
             pgLineHoleDTOList=PgLineHoleDTO.ConvertToDTOList(pgLineHoleList,pgPileAcuManager,pgRoadManager);
         return pgLineHoleDTOList;
     }
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
index 0fd9e1f..841a386 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
@@ -1,12 +1,15 @@
 package com.casic.PgInterface.intelPlan.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.devTable.domain.PgPartition;
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
 import com.casic.PgInterface.intelPlan.domain.PgLineHole;
 import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
 import com.casic.PgInterface.intelPlan.domain.PgSection;
 import com.casic.PgInterface.intelPlan.dto.PgPlanResult;
 import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
 import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -22,6 +25,9 @@
     @Resource
     private PgLineHoleManager pgLineHoleManager;
 
+    @Resource
+    private PgRoadManager pgRoadManager;
+
     public PgPileAcu getPgPileAcuByCode(String acuCode){
         List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
 
@@ -58,7 +64,9 @@
         for(PgPlanTask pgPlanTask:pgPlanTaskList){
             List<PgPlanResult> pgPlanResultList=getPgPlanResultByPlantask(pgPlanTask);
             PgPlanResultRe pgPlanResultRe=new PgPlanResultRe();
+
             pgPlanResultRe.setTaskKey(pgPlanTask.getTaskKey());
+            pgPlanResultRe.setPileAcuList(pgPlanTask.getPileAcuList());
             pgPlanResultRe.setPgPlanResultList(pgPlanResultList);
 
             pgPlanResultReList.add(pgPlanResultRe);
@@ -142,4 +150,57 @@
         return length;
     }
 
+    private PgPileAcu getPgPileAcuByAcuCode(String acuCode){
+        List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
+
+        if(pgPileAcuList==null||pgPileAcuList.size()==0)
+            return null;
+        else
+            return pgPileAcuList.get(0);
+    }
+
+    public List<PgAcuTask> getACUTask(String pileAcuList){
+        String[] acuArray=pileAcuList.split(",");
+        List<PgAcuTask> pgAcuTaskList=new ArrayList<>();
+
+        for(String acu:acuArray){
+            PgPileAcu pgPileAcu=this.getPgPileAcuByCode(acu);
+            String roadName=pgRoadManager.get(pgPileAcu.getRoadId()).getRoadName();
+
+            if(!containRoad(roadName,pgAcuTaskList))
+            {
+                PgAcuTask pgAcuTask=new PgAcuTask();
+                pgAcuTask.setRoadName(roadName);
+                pgAcuTask.setPileAcuList(acu);
+                pgAcuTaskList.add(pgAcuTask);
+            }
+            else{
+                PgAcuTask pgAcuTask=getIndexRoad(roadName,pgAcuTaskList);
+                if(pgAcuTask!=null)
+                    pgAcuTask.setPileAcuList(pgAcuTask.getPileAcuList()+","+acu);
+            }
+        }
+
+        return pgAcuTaskList;
+    }
+
+    private boolean containRoad(String roadName,List<PgAcuTask> pgAcuTaskList){
+        if(pgAcuTaskList==null||pgAcuTaskList.size()==0) return false;
+        for(PgAcuTask pgAcuTask:pgAcuTaskList){
+            if(pgAcuTask.getRoadName().equals(roadName))
+                return true;
+        }
+
+        return false;
+    }
+
+    private PgAcuTask getIndexRoad(String roadName, List<PgAcuTask> pgAcuTaskList){
+        for(PgAcuTask pgAcuTask:pgAcuTaskList){
+            if(pgAcuTask.getRoadName().equals(roadName))
+                return pgAcuTask;
+        }
+
+        return null;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java
new file mode 100644
index 0000000..323f7ef
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java
@@ -0,0 +1,25 @@
+package com.casic.PgInterface.reservePlan.dto;
+
+import java.util.List;
+
+public class PgAcuTask {
+
+    private String roadName;//道路
+    private String pileAcuList;//acu分区
+
+    public String getRoadName() {
+        return roadName;
+    }
+
+    public void setRoadName(String roadName) {
+        this.roadName = roadName;
+    }
+
+    public String getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(String pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
index c25e926..c7d7693 100644
--- a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
@@ -70,9 +70,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(Long.valueOf(inPgPersonId));
         PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("hostName",pgInPgPerson.getAssetCode());
-//        PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode());
-//        long maxId = pgTagPositionManager.getMaxId(pgTagMac.getTagMac());
-//        PGTagPosition pgTagPosition = pgTagPositionManager.get(maxId);
+
         PGTagPosition pgTagPosition = tagmacRun.GetTagStatus(pgTagMac);
         boolean bExist = false;
         bExist = pgTagPositionManager.findTagPosition(pgTagPosition.getPositionUpdatetime(),pgTagPosition.getHostId());
@@ -104,8 +102,7 @@
         PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(Long.valueOf(inPgPersonId));
         PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pgInPgPersonId",pgInPgPerson);
         System.out.println("time:"+pgInPgStatus.getInTime());
-//        PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pgInPgPersonId",inPgPersonId);
-//        PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode());
+
         PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("hostName",pgInPgPerson.getAssetCode());
 
         Map<Object,Object> mapPosition = new HashMap<>();
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
index 082ba5d..3eed00a 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
@@ -48,6 +48,7 @@
     public Map<String, Object> linkDevice(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         PgDeviceDto pgDeviceDto = null;
         try {
@@ -62,6 +63,7 @@
                     else {
                         pgDeviceDto = new PgDeviceDto(pgDevice);
                         msg = "报警关联设备获取成功";
+                        code="200";
                     }
                 }
             }
@@ -71,6 +73,7 @@
             e.printStackTrace();
             msg = "获取关联设备失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceDto);
 
@@ -86,6 +89,7 @@
     public Map<String, Object> linkPartitionCamera(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
         try {
@@ -106,6 +110,7 @@
 
                         pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(partition,position);
                         msg = "关联设备获取成功";
+                        code="200";
                     }
                 }
             }
@@ -115,6 +120,7 @@
             e.printStackTrace();
             msg = "分区设备关联失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceDtoList);
         return resultMap;
@@ -129,6 +135,7 @@
     public Map<String, Object> linkReservePlan(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgReservePlanDto> pgReservePlanDtoList=new ArrayList<>();
         try{
@@ -139,10 +146,12 @@
                 else {
                     pgReservePlanDtoList = pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
 
-                    if(pgReservePlanDtoList==null||pgReservePlanDtoList.size()==0)
-                        msg="不存在关联的报警预案";
-                    else
+                    if (pgReservePlanDtoList == null || pgReservePlanDtoList.size() == 0)
+                        msg = "不存在关联的报警预案";
+                    else {
                         msg = "关联预案获取成功";
+                        code="200";
+                    }
                 }
             }
             else
@@ -153,6 +162,7 @@
             e.printStackTrace();
             msg="预案关联失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgReservePlanDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
index 0ddbc4d..0ce886b 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
@@ -41,25 +41,19 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getAlarmList(@FormParam("alarmType") String alarmType,
                                             @FormParam("startDay") String startDay,
+                                            @FormParam("partition") String partition,
                                             @FormParam("endDay") String endDay,
                                             @FormParam("isNew") String isNew,
                                             @FormParam("page") int page,
                                             @FormParam("rows") int rows) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
         try {
-            pgAlarmDtoList = pgAlarmManager.getAllAlarm(alarmType,startDay,endDay,isNew,page,rows);
-            if (pgAlarmDtoList==null||pgAlarmDtoList.size() == 0)
-                msg = "没有报警信息";
-            else
-                msg = "报警信息获取成功";
+            resultMap = pgAlarmManager.getAllAlarm(alarmType,partition,startDay,endDay,isNew,page,rows);
+
         } catch (Exception e) {
             e.printStackTrace();
-            msg = "报警信息获取失败";
         }
-        resultMap.put("msg", msg);
-        resultMap.put("result", pgAlarmDtoList);
         return resultMap;
     }
 
@@ -71,9 +65,10 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> clearAlarmList(@FormParam("id") String id) throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        String result = "false";
+        String result = "";
+        String code="0";
 
         try {
             PgAlarm pgAlarm = new PgAlarm();
@@ -86,12 +81,14 @@
                 pgAlarmManager.save(pgAlarm);
                 msg = "报警信息清除成功";
                 result = "true";
+                code = "200";
             }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警信息清除失败";
             result = "false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
@@ -106,21 +103,26 @@
     public Map<String, Object> getAlarmByTypeOrTime(@FormParam("alarmType") String alarmType,
                                                     @FormParam("startTime") String startTime,
                                                     @FormParam("endTime") String endTime) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
-        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<PgAlarmDto>();
+        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
         try {
             pgAlarmDtoList = pgAlarmManager.getAlarmByTypeAndTime(alarmType, startTime, endTime);
             if (pgAlarmDtoList == null || pgAlarmDtoList.size() == 0)
                 msg = "报警信息不存在";
             else
+            {
                 msg = "报警信息获取成功";
+                code="200";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警信息获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
index 29ce8a4..ed0bf34 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
@@ -39,8 +39,8 @@
     public Map<String, Object> getAlarmRule(@FormParam("devType") String devType) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
-        System.out.println("devType:"+devType);
         List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<>();
         try {
             pgAlarmRuleDtoList = pgAlarmRuleManager.getAlarmRuleDto(devType);
@@ -52,6 +52,7 @@
             e.printStackTrace();
             msg = "报警阈值信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmRuleDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
index 24ab894..abef1b1 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
@@ -39,16 +39,21 @@
                                                      @FormParam("endDate") String endDate)throws Exception{
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
+
         List<PgAlarmTjDto> pgAlarmTjDtoList=null;
         try{
             pgAlarmTjDtoList=pgAlarmTjManager.getAlarmTjResultByType(startDate,endDate);
             msg="获取成功";
+            code="200";
         }
         catch(Exception ex) {
             msg = "统计失败";
         }
-        resultMap.put("result",pgAlarmTjDtoList);
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
+        resultMap.put("result",pgAlarmTjDtoList);
+
         return resultMap;
     }
 
@@ -61,23 +66,27 @@
     public Map<String, Object> getAlarmByTime(@FormParam("startTime") String startTime,
                                               @FormParam("endTime") String endTime,
                                               @FormParam("statisticType") String statisticType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code = "0";
 
-        List<PgAlarmTjDto> pgAlarmTjDtoList = new ArrayList<PgAlarmTjDto>();
+        List<PgAlarmTjDto> pgAlarmTjDtoList = new ArrayList<>();
         try {
             pgAlarmTjDtoList = pgAlarmTjManager.getAlarmByTime(startTime, endTime, statisticType);
             if(pgAlarmTjDtoList==null)
                 msg="报警统计信息获取失败";
-            else
-                msg="报警统计信息获取成功";
+            else {
+                msg = "报警统计信息获取成功";
+                code="200";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警统计信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmTjDtoList);
         return resultMap;
     }
 
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
index 28bc811..b6278a9 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
@@ -30,7 +30,6 @@
     @Resource
     private PgAlarmTypeManager pgAlarmTypeManager;
 
-
     /**
      * 获取报警类型
      */
@@ -38,19 +37,24 @@
     @Path("getAlarmType")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getAlarmTypeList()throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
-        List<PgAlarmTypeDto> pgAlarmTypeDtoList=new ArrayList<PgAlarmTypeDto>();
+        String code="";
+
+        List<PgAlarmTypeDto> pgAlarmTypeDtoList=new ArrayList<>();
         try {
             pgAlarmTypeDtoList = pgAlarmTypeManager.getAllAlarmTypeDto();
             if(pgAlarmTypeDtoList.size()==0)
                 msg="没有报警类型信息";
-            else
-                msg="报警类型信息获取成功";
+            else {
+                code="200";
+                msg = "报警类型信息获取成功";
+            }
         }catch(Exception e){
             e.printStackTrace();
             msg="报警类型信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAlarmTypeDtoList);
         return resultMap;
@@ -66,6 +70,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
@@ -83,6 +88,7 @@
                 logger.info("成功保存");
                 result = "true";
                 msg = "保存成功";
+                code="200";
             }
         } catch (Exception e) {
             result = "false";
@@ -90,6 +96,7 @@
             e.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -106,6 +113,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try{
             if(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
@@ -119,6 +127,7 @@
                 pgAlarmTypeManager.save(pgAlarmType);
                 result = "true";
                 msg = "编辑成功";
+                code="200";
             }
         }
         catch(Exception e)
@@ -128,6 +137,7 @@
             e.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("result",result);
         resultMap.put("msg",msg);
 
@@ -146,6 +156,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
         String result="false";
+        String code="0";
 
         try {
             PgAlarmType pgAlarmType=pgAlarmTypeManager.get(Long.valueOf(id));
@@ -157,6 +168,7 @@
             {
                 pgAlarmType.setActive(0);
                 pgAlarmTypeManager.save(pgAlarmType);
+                code="200";
                 msg="报警类型删除成功";
                 result="true";
             }
@@ -165,6 +177,7 @@
             msg="报警类型删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
index 4533e1a..85940bb 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
@@ -33,12 +33,15 @@
                                                  @FormParam("inSpectionPlace") String inSpectionPlace){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
         List<PgAssetPlanDto> pgAssetPlanDtoList=new ArrayList<>();
         try{
             pgAssetPlanDtoList=pgAssetPlanManager.getPgAssetPlanDtoList(startDay,endDay,inSpectionPlace);
-            if(pgAssetPlanDtoList!=null&&pgAssetPlanDtoList.size()!=0)
-                msg="巡检信息获取成功";
+            if(pgAssetPlanDtoList!=null&&pgAssetPlanDtoList.size()!=0) {
+                code="200";
+                msg = "巡检信息获取成功";
+            }
             else
                 msg="不存在巡检信息";
         }
@@ -47,6 +50,7 @@
             msg="巡检信息获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAssetPlanDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
index 47ef9d1..5cbdfcb 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
@@ -30,12 +30,15 @@
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
         String result="";
+        String code="0";
 
         List<PgAssetPlanStatic> pgAssetPlanStaticList = null;
         try{
             pgAssetPlanStaticList=pgAssetPlanManager.getPgAssetPlanStaticLisByTime(startTime,endTime,staticType);
-            if(pgAssetPlanStaticList!=null&&pgAssetPlanStaticList.size()!=0)
-                msg="巡检统计信息获取成功";
+            if(pgAssetPlanStaticList!=null&&pgAssetPlanStaticList.size()!=0) {
+                code = "200";
+                msg = "巡检统计信息获取成功";
+            }
             else
                 msg="统计信息获取失败";
         }
@@ -44,6 +47,7 @@
             msg="统计失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAssetPlanStaticList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
index 26f5d6a..503bfe3 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
@@ -40,6 +40,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="";
 
         try{
             PgAuthority pgAuthority=new PgAuthority();
@@ -50,6 +51,7 @@
 
             pgAuthorityManager.save(pgAuthority);
             msg="用户权限保存成功";
+            code="200";
             result="true";
         }
         catch(Exception e) {
@@ -57,6 +59,7 @@
             msg = "新增权限失败";
             result = "false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -65,22 +68,25 @@
 
     /*
        *编辑角权限信息
-        */
+    */
     @POST
     @Path("editAuthority")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> editAuthority(@FormParam("id") String id,
                                        @FormParam("authority") String authority,
                                        @FormParam("concent") String concent) throws Exception{
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
+
         try {
             PgAuthority pgAuthority=pgAuthorityManager.get(Long.valueOf(id));
             pgAuthority.setAuthority(authority);
             pgAuthority.setConcent(concent);
 
             pgAuthorityManager.save(pgAuthority);
+            code="200";
             msg="权限保存成功";
             result="true";
         }
@@ -90,7 +96,7 @@
             msg="权限编辑失败";
             result="false";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -105,9 +111,10 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> deleteAuthority(@FormParam("id") String id)throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
-        String result="false";
+        String result="";
+        String code="0";
 
         try {
             PgAuthority pgAuthority= pgAuthorityManager.get(Long.valueOf(id));
@@ -119,6 +126,7 @@
             {
                 pgAuthority.setActive(0);
                 pgAuthorityManager.save(pgAuthority);
+                code="200";
                 msg="删除权限成功";
                 result="true";
             }
@@ -127,37 +135,40 @@
             msg="删除权限失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
     }
 
     /*
-* 获取权限信息
- */
+    * 获取权限信息
+    */
     @POST
     @Path("getAuthorityList")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> getAuthorityList() {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgAuthorityDto> pgAuthorityDtoList = new ArrayList<PgAuthorityDto>();
         try {
             pgAuthorityDtoList = pgAuthorityManager.getAuthorityList();
             if (pgAuthorityDtoList == null)
                 msg = "不存在权限信息";
-            else
+            else {
+                code = "200";
                 msg = "权限信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "权限信息获取是失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAuthorityDtoList);
         return resultMap;
     }
 
 
-
-
 }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
index a9ef521..a74ecc7 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
@@ -45,6 +45,7 @@
                                                @FormParam("endDate") String endDate)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgHistoryDataDto> pgHistoryDataDtoList=new ArrayList<>();
 
         try {
@@ -55,13 +56,16 @@
                 pgHistoryDataDtoList=pgCh4Manager.getAllCH4Data(pgDevice,startDate,endDate);
                 if(pgHistoryDataDtoList==null)
                     msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+                else {
+                    code = "200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgHistoryDataDtoList);
         return resultMap;
@@ -75,8 +79,9 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getNewestCh4InfoByDev(@FormParam("assetCode") String assetCode)throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
+        String code="0";
         PgCh4Dto pgCh4Dto=new PgCh4Dto(null);
 
         try {
@@ -87,13 +92,17 @@
                 pgCh4Dto=pgCh4Manager.getNewestCH4Data(pgDevice);
                 if(pgCh4Dto==null)
                     msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgCh4Dto);
         return resultMap;
@@ -111,6 +120,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
@@ -127,6 +137,7 @@
                 pgCh4.setPgDeviceId(pgDevice);
 
                 pgCh4Manager.save(pgCh4);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -135,7 +146,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
index a7eac39..dfc8ca5 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
@@ -43,23 +43,27 @@
                                                       @FormParam("endDate") String endDate)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgHistoryDataDto> pgHistoryDataDtoList=new ArrayList<>();
 
         try {
             PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
                 msg="设备不存在";
-            else{
-                pgHistoryDataDtoList=pgCoManager.getAllCoData(pgDevice, startDate, endDate);
-                if(pgHistoryDataDtoList==null)
-                    msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+            else {
+                pgHistoryDataDtoList = pgCoManager.getAllCoData(pgDevice, startDate, endDate);
+                if (pgHistoryDataDtoList == null)
+                    msg = "没有满足要求的数据";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgHistoryDataDtoList);
         return resultMap;
@@ -75,6 +79,7 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         PgCoDto pgCoDto=new PgCoDto(null);
 
         try {
@@ -85,13 +90,16 @@
                 pgCoDto=pgCoManager.getNewestCoData(pgDevice);
                 if(pgCoDto==null)
                     msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgCoDto);
         return resultMap;
@@ -110,6 +118,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         try {
@@ -126,6 +135,7 @@
 
                 pgCoManager.save(pgCo);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
         } catch (Exception e) {
@@ -133,7 +143,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
index b4b826e..9af98a3 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
@@ -60,6 +60,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         try {
 
@@ -80,8 +81,8 @@
                 pgConstruction.setPgConstructionTypeId(pgConstructionType.getId());
                 pgConstruction.setActive(1);
                 pgConstruction.setParName(parName);
-                logger.info("保存成功");
                 pgConstructionManager.save(pgConstruction);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -90,6 +91,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("success", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -116,6 +118,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
@@ -140,6 +143,7 @@
                 pgConstruction.setParName(parName);
 
                 pgConstructionManager.save(pgConstruction);
+                code="200";
                 result = "true";
                 msg = "编辑成功";
             }
@@ -150,7 +154,7 @@
             e.printStackTrace();
 
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -167,6 +171,8 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
+
         try {
             PgConstruction pgConstruction = pgConstructionManager.get(Long.valueOf(id));
             if (pgConstruction == null)
@@ -177,6 +183,7 @@
             {
                 pgConstruction.setActive(0);
                 pgConstructionManager.save(pgConstruction);
+                code="200";
                 result = "true";
                 msg = "成功删除信息";
             }
@@ -185,6 +192,7 @@
             result = "false";
             msg = "删除失败";
         }
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -204,9 +212,11 @@
                                                   @FormParam("rows") int rows)throws Exception{
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
         List<PgConstructionDto> pgConstructionDtoList=new ArrayList<>();
         try{
             pgConstructionDtoList=pgConstructionManager.getPgContructionDto(cs_name,cs_type,startTime,endTime,page,rows);
+            code="200";
             msg="信息获取成功";
         }
         catch(Exception e)
@@ -214,6 +224,7 @@
             e.printStackTrace();
             msg="查询失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
 
@@ -231,18 +242,22 @@
                                                               @FormParam("statisticType") String statisticType) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgConstructionStiatistic> pgConstructionStiatisticList=new ArrayList<>();
         try {
             pgConstructionStiatisticList = pgConstructionManager.getConstructionByTimeAndStatus(startTime, endTime, statisticType);
             if(pgConstructionStiatisticList==null)
                 msg="施工统计信息获取失败";
-            else
-                msg="施工统计信息获取成功";
+            else {
+                code="200";
+                msg = "施工统计信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "施工统计信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgConstructionStiatisticList);
         return resultMap;
@@ -257,6 +272,7 @@
     public Map<String, Object> getConstructionByType(@FormParam("statisticType") String statisticType){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
         List<PgConstructionStiatistic> pgConstructionStiatisticList=new ArrayList<>();
 
         try{
@@ -268,6 +284,7 @@
                 resultMap.put("result",null);
             }
             else {
+                code="200";
                 msg = "统计信息获取成功";
                 resultMap.put("result", pgConstructionStiatisticList);
             }
@@ -278,6 +295,7 @@
             msg="统计失败";
             resultMap.put("result",null);
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         return resultMap;
     }
@@ -291,9 +309,11 @@
     public Map<String, Object> getConstructionToday() throws Exception{
         Map<String,Object> resultMap=new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgConstructionDto> pgConstructionDtoList=new ArrayList<PgConstructionDto>();
         try {
             pgConstructionDtoList = pgConstructionManager.getConstructionToday();
+            code="200";
             msg = "当天施工信息获取成功";
         }
         catch(Exception e)
@@ -301,7 +321,7 @@
             e.printStackTrace();
             msg="获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
         return resultMap;
@@ -316,6 +336,7 @@
     public Map<String, Object> getConstructionDev(@FormParam("id") String id) throws Exception{
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
         List<PgDeviceDto> pgDeviceDtoList =new ArrayList<>();
         try{
@@ -325,14 +346,17 @@
 
             if(pgDeviceDtoList==null)
                 msg="信息获取失败";
-            else
-                msg="信息获取成功";
+            else {
+                code="200";
+                msg = "信息获取成功";
+            }
         }
         catch(Exception e)
         {
             e.printStackTrace();
-            msg="设备信息获取成功";
+            msg="信息获取是被";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgDeviceDtoList);
 
@@ -346,17 +370,21 @@
     @Path("getConstruction")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getConstruction() throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
-        List<PgConstructionDto> pgConstructionDtoList=new ArrayList<PgConstructionDto>();
+        String code="0";
+
+        List<PgConstructionDto> pgConstructionDtoList=new ArrayList<>();
 
         try{
             pgConstructionDtoList=pgConstructionManager.getPgConstructionList();
             if(pgConstructionDtoList==null||pgConstructionDtoList.size()==0)
                 msg="不存在施工记录";
-            else
-                msg="施工信息获取成功";
+            else {
+                code = "200";
+                msg = "施工信息获取成功";
+            }
         }
         catch(Exception e)
         {
@@ -364,6 +392,7 @@
             msg="施工信息获取失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
 

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 25ded8a..283d7ab 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,20 +7,56 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" 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/construction/manager/PgCsDocumentManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/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/manager/PgAlarmManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/~$说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/~$说明20191207.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.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$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/接口说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明20191207.docx" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
@@ -51,7 +87,7 @@
         <counts>
           <entry key="class" value="4" />
           <entry key="iml" value="2" />
-          <entry key="java" value="707" />
+          <entry key="java" value="820" />
           <entry key="properties" value="14" />
           <entry key="xml" value="7" />
         </counts>
@@ -60,7 +96,7 @@
         <counts>
           <entry key="CLASS" value="4" />
           <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="707" />
+          <entry key="JAVA" value="820" />
           <entry key="Properties" value="14" />
           <entry key="XML" value="7" />
         </counts>
@@ -68,32 +104,32 @@
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
           <entry key="dummy" value="38" />
-          <entry key="java" value="30161" />
+          <entry key="java" value="40859" />
           <entry key="properties" value="100" />
-          <entry key="txt" value="176" />
+          <entry key="txt" value="186" />
           <entry key="xml" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="30161" />
-          <entry key="PLAIN_TEXT" value="214" />
+          <entry key="JAVA" value="40859" />
+          <entry key="PLAIN_TEXT" value="224" />
           <entry key="Properties" value="100" />
           <entry key="XML" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="48" />
+          <entry key="project.closed" value="51" />
           <entry key="project.open.time.1" value="5" />
           <entry key="project.open.time.12" value="2" />
           <entry key="project.open.time.13" value="1" />
           <entry key="project.open.time.15" value="1" />
           <entry key="project.open.time.16" value="1" />
           <entry key="project.open.time.17" value="1" />
-          <entry key="project.open.time.2" value="1" />
+          <entry key="project.open.time.2" value="2" />
           <entry key="project.open.time.20" value="1" />
-          <entry key="project.open.time.23" value="1" />
+          <entry key="project.open.time.23" value="2" />
           <entry key="project.open.time.24" value="2" />
           <entry key="project.open.time.251" value="1" />
           <entry key="project.open.time.27" value="2" />
@@ -106,8 +142,8 @@
           <entry key="project.open.time.36" value="1" />
           <entry key="project.open.time.37" value="1" />
           <entry key="project.open.time.39" value="2" />
-          <entry key="project.open.time.4" value="2" />
-          <entry key="project.open.time.40" value="1" />
+          <entry key="project.open.time.4" value="3" />
+          <entry key="project.open.time.40" value="2" />
           <entry key="project.open.time.41" value="2" />
           <entry key="project.open.time.42" value="2" />
           <entry key="project.open.time.43" value="2" />
@@ -122,23 +158,25 @@
           <entry key="project.open.time.6" value="3" />
           <entry key="project.open.time.63" value="2" />
           <entry key="project.open.time.64" value="1" />
+          <entry key="project.open.time.66" value="1" />
           <entry key="project.open.time.71" value="2" />
+          <entry key="project.open.time.74" value="1" />
           <entry key="project.open.time.76" value="1" />
           <entry key="project.open.time.8" value="2" />
           <entry key="project.open.time.9" value="1" />
           <entry key="project.open.time.97" value="1" />
-          <entry key="project.opened" value="78" />
+          <entry key="project.opened" value="84" />
         </counts>
       </usages-collector>
     </session>
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+            <state relative-caret-position="396">
+              <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
               <folding>
                 <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
                 <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -147,73 +185,6 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <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="99">
-              <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-              <folding>
-                <element signature="imports" expanded="true" />
-                <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-1170">
-              <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state>
-              <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
-              <folding>
-                <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-                <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="true">
-        <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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-              <folding>
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-                <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>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <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="352">
-              <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -225,18 +196,9 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>inCriteria</find>
-      <find>getPgPlanResulList</find>
-      <find>getPileAcuListByPileAcuStr</find>
-      <find>distinct</find>
-      <find>order</find>
-      <find>canPlanLine</find>
-      <find>isExistLine</find>
-      <find>getPlanResult</find>
       <find>pgPipeLine</find>
       <find>getPipeLineBylineName</find>
       <find>StringU</find>
-      <find>getAllAlarm</find>
       <find>getAlarmList</find>
       <find>getPgInPersonListByDay</find>
       <find>getDayInPgStatistic</find>
@@ -254,7 +216,16 @@
       <find>getPgContructionByNameOrType</find>
       <find>&quot;&quot;,&quot;&quot;,</find>
       <find>getPgContructionDtoByNameOrType</find>
+      <find>addConstruction</find>
+      <find>getPgLineAcuHole</find>
+      <find>getPlanResult</find>
       <find>getConstruction</find>
+      <find>addPipeLine</find>
+      <find>未找到入廊数据</find>
+      <find>getCurrentHoleByAcu</find>
+      <find>getAllAlarm</find>
+      <find>getPgDeviceDtoListByPartition</find>
+      <find>getPgDeviceByDevType</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -263,57 +234,57 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlan.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileHoleManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/planData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/PlanData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
       </list>
     </option>
   </component>
@@ -359,7 +330,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -421,53 +391,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="dto" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="manager" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -479,29 +402,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="rs" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -516,6 +416,7 @@
         </subPane>
       </pane>
       <pane id="Scope" />
+      <pane id="PackagesPane" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -710,7 +611,13 @@
       <workItem from="1574902733573" duration="1829000" />
       <workItem from="1574998240004" duration="7016000" />
       <workItem from="1575247959683" duration="6997000" />
-      <workItem from="1575704345590" duration="40473000" />
+      <workItem from="1575704345590" duration="69381000" />
+      <workItem from="1575869479666" duration="721000" />
+      <workItem from="1575947104878" duration="6101000" />
+      <workItem from="1576128264436" duration="3347000" />
+      <workItem from="1576208571543" duration="22000" />
+      <workItem from="1576227513917" duration="862000" />
+      <workItem from="1576293721220" duration="18246000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -817,11 +724,18 @@
       <option name="project" value="LOCAL" />
       <updated>1575775489149</updated>
     </task>
-    <option name="localTasksCounter" value="16" />
+    <task id="LOCAL-00016" summary="整改施工信息">
+      <created>1575791780774</created>
+      <option name="number" value="00016" />
+      <option name="presentableId" value="LOCAL-00016" />
+      <option name="project" value="LOCAL" />
+      <updated>1575791780774</updated>
+    </task>
+    <option name="localTasksCounter" value="17" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="452131000" />
+    <option name="totallyTimeSpent" value="510338000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -834,9 +748,8 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
-    <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.24205749" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2647504" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -847,7 +760,7 @@
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.3295082" />
       <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.4819672" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.65737706" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.3295082" />
@@ -939,7 +852,8 @@
     <MESSAGE value="重新设计智能规划部分" />
     <MESSAGE value="完成智能规划对接" />
     <MESSAGE value="修改报警统计" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改报警统计" />
+    <MESSAGE value="整改施工信息" />
+    <option name="LAST_COMMIT_MESSAGE" value="整改施工信息" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -951,16 +865,10 @@
           <option name="timeStamp" value="3" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java</url>
-          <line>69</line>
+          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java</url>
+          <line>40</line>
           <properties />
-          <option name="timeStamp" value="21" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java</url>
-          <line>96</line>
-          <properties />
-          <option name="timeStamp" value="38" />
+          <option name="timeStamp" value="122" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
@@ -970,394 +878,452 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <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="2068">
-          <caret line="154" column="35" selection-start-line="154" selection-start-column="35" selection-end-line="154" selection-end-column="35" />
-        </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="3300">
-          <caret line="297" column="22" selection-start-line="297" selection-start-column="22" selection-end-line="297" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/StringUtils.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
-          <caret line="13" column="48" lean-forward="true" selection-start-line="13" selection-start-column="48" selection-end-line="13" selection-end-column="48" />
+          <caret line="11" column="5" selection-start-line="11" selection-start-column="5" selection-end-line="11" selection-end-column="5" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="78" lean-forward="true" selection-start-line="78" selection-end-line="78" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="616">
-          <caret line="41" column="1" selection-start-line="41" selection-start-column="1" selection-end-line="41" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="110">
-          <caret line="12" column="23" selection-start-line="12" selection-start-column="23" selection-end-line="12" selection-end-column="23" />
+        <state relative-caret-position="516">
+          <caret line="114" column="12" selection-start-line="114" selection-start-column="12" selection-end-line="114" selection-end-column="12" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="164">
-          <caret line="56" lean-forward="true" selection-start-line="56" selection-end-line="56" />
+        <state relative-caret-position="418">
+          <caret line="33" column="44" selection-start-line="33" selection-start-column="44" selection-end-line="33" selection-end-column="44" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="258">
-          <caret line="27" column="12" lean-forward="true" selection-start-line="27" selection-start-column="12" selection-end-line="27" selection-end-column="12" />
+        <state relative-caret-position="132">
+          <caret line="11" column="20" lean-forward="true" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="20" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.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="-12">
-          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        <state relative-caret-position="516">
+          <caret line="142" column="54" selection-start-line="142" selection-start-column="54" selection-end-line="142" selection-end-column="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="858">
-          <caret line="55" column="27" lean-forward="true" selection-start-line="55" selection-start-column="27" selection-end-line="55" selection-end-column="27" />
+        <state relative-caret-position="66">
+          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="58">
+          <caret line="18" column="28" selection-start-line="18" selection-start-column="19" selection-end-line="18" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="305">
+          <caret line="24" column="31" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="714">
+          <caret line="58" column="5" lean-forward="true" selection-start-line="58" selection-start-column="5" selection-end-line="58" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="924">
+          <caret line="134" column="92" selection-start-line="134" selection-start-column="92" selection-end-line="134" selection-end-column="92" />
+          <folding>
+            <element signature="method#linkDevice#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkPartitionCamera#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkReservePlan#0;class#PgAlarmLinkRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1066">
+          <caret line="90" lean-forward="true" selection-start-line="90" selection-end-line="90" />
+          <folding>
+            <element signature="method#getTjResultByAlarmType#0;class#PgAlarmTjRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="946">
+          <caret line="148" column="11" lean-forward="true" selection-start-line="148" selection-start-column="11" selection-end-line="148" selection-end-column="11" />
+          <folding>
+            <element signature="method#getAlarmTypeList#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#addAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#editAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#deleteAlarmType#0;class#PgAlarmTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="208">
+          <caret line="46" column="23" lean-forward="true" selection-start-line="46" selection-start-column="23" selection-end-line="46" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="113" column="9" lean-forward="true" selection-start-line="113" selection-start-column="9" selection-end-line="113" selection-end-column="9" />
+          <folding>
+            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
+            <element signature="method#getNewestCh4InfoByDev#0;class#PgCh4Rs#0" />
+            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="145" column="6" lean-forward="true" selection-start-line="145" selection-start-column="6" selection-end-line="145" selection-end-column="6" />
+          <folding>
+            <element signature="method#addAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#editAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#deleteAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#getAuthorityList#0;class#PgAuthorityRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="58" column="1" lean-forward="true" selection-start-line="58" selection-start-column="1" selection-end-line="58" selection-end-column="1" />
+          <folding>
+            <element signature="method#getPgAssetPlanList#0;class#PgAssetPlanRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="370">
+          <caret line="371" column="66" selection-start-line="371" selection-start-column="66" selection-end-line="371" selection-end-column="66" />
+          <folding>
+            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#searchConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionDev#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="139" column="13" lean-forward="true" selection-start-line="139" selection-start-column="13" selection-end-line="139" selection-end-column="13" />
+          <folding>
+            <element signature="method#getCoInfoByDevAndDate#0;class#PgCoRs#0" />
+            <element signature="method#getNewestCoInfoByDev#0;class#PgCoRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="540">
+          <caret line="223" column="5" lean-forward="true" selection-start-line="223" selection-start-column="5" selection-end-line="223" selection-end-column="5" />
+          <folding>
+            <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="682">
+          <caret line="100" lean-forward="true" selection-start-line="100" selection-end-line="100" />
+          <folding>
+            <element signature="method#getDeviceTpeyList#0;class#PgDeviceTypeRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="377">
+          <caret line="225" column="35" selection-start-line="225" selection-start-column="35" selection-end-line="225" selection-end-column="35" />
+          <folding>
+            <element signature="method#addEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#addEquipment#1;class#PgEquipmentRs#0" />
+            <element signature="method#getEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#deleteEquipment#0;class#PgEquipmentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="406">
+          <caret line="109" lean-forward="true" selection-start-line="109" selection-end-line="109" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="154">
+          <caret line="28" column="19" selection-start-line="28" selection-start-column="19" selection-end-line="28" selection-end-column="19" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="748">
-          <caret line="49" column="5" lean-forward="true" selection-start-line="49" selection-start-column="5" selection-end-line="49" selection-end-column="5" />
+        <state relative-caret-position="296">
+          <caret line="161" column="35" selection-start-line="161" selection-start-column="35" selection-end-line="161" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="384">
+          <caret line="99" column="5" lean-forward="true" selection-start-line="99" selection-start-column="5" selection-end-line="99" selection-end-column="5" />
+        </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="362">
+          <caret line="340" column="35" selection-start-line="340" selection-start-column="35" selection-end-line="340" selection-end-column="35" />
+          <folding>
+            <element signature="method#addInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPersonInPg#0;class#PgInPgPersonRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-606">
+          <caret line="76" column="20" lean-forward="true" selection-start-line="76" selection-start-column="20" selection-end-line="76" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="65" column="35" selection-start-line="65" selection-start-column="35" selection-end-line="65" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="101" column="35" selection-start-line="101" selection-start-column="35" selection-end-line="101" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="84" column="35" selection-start-line="84" selection-start-column="35" selection-end-line="84" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="59" lean-forward="true" selection-start-line="59" selection-end-line="59" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="60" column="1" lean-forward="true" selection-start-line="60" selection-start-column="1" selection-end-line="60" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="145" column="35" selection-start-line="145" selection-start-column="35" selection-end-line="145" selection-end-column="35" />
+        </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="274">
+          <caret line="350" column="35" selection-start-line="350" selection-start-column="35" selection-end-line="350" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="121" column="39" selection-start-line="121" selection-start-column="39" selection-end-line="121" selection-end-column="39" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="28" column="8" lean-forward="true" selection-start-line="28" selection-start-column="8" selection-end-line="28" selection-end-column="8" />
+        <state relative-caret-position="340">
+          <caret line="103" selection-start-line="103" selection-end-line="103" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="226" column="35" selection-start-line="226" selection-start-column="35" selection-end-line="226" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="203" column="35" selection-start-line="203" selection-start-column="35" selection-end-line="203" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="241" column="35" selection-start-line="241" selection-start-column="35" selection-end-line="241" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="225" column="1" lean-forward="true" selection-start-line="225" selection-start-column="1" selection-end-line="225" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="176" column="5" lean-forward="true" selection-start-line="176" selection-start-column="5" selection-end-line="176" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="178" column="35" lean-forward="true" selection-start-line="178" selection-start-column="35" selection-end-line="178" selection-end-column="35" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="516">
-          <caret line="94" column="53" selection-start-line="94" selection-start-column="53" selection-end-line="94" selection-end-column="53" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="814">
-          <caret line="52" column="9" lean-forward="true" selection-start-line="52" selection-start-column="9" selection-end-line="52" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="182">
-          <caret line="58" column="12" lean-forward="true" selection-start-line="58" selection-start-column="12" selection-end-line="58" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="34" lean-forward="true" selection-start-line="34" selection-end-line="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="32" lean-forward="true" selection-start-line="32" selection-end-line="32" />
-          <folding>
-            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
-            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="185">
-          <caret line="63" column="13" selection-start-line="63" selection-start-column="13" selection-end-line="63" selection-end-column="13" />
-          <folding>
-            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
-            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
-            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="e#6319#6324#0" />
-            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
-          </folding>
+          <caret line="240" lean-forward="true" selection-start-line="240" selection-end-line="240" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
-          <caret line="58" column="28" lean-forward="true" selection-start-line="58" selection-start-column="28" selection-end-line="58" selection-end-column="28" />
-          <folding>
-            <element signature="method#addTempHumData#0;class#PgTempHumRs#0" />
-          </folding>
+        <state relative-caret-position="340">
+          <caret line="148" column="34" selection-start-line="148" selection-start-column="34" selection-end-line="148" selection-end-column="34" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
+        <state relative-caret-position="458">
+          <caret line="99" column="35" selection-start-line="99" selection-start-column="35" selection-end-line="99" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+        <state relative-caret-position="384">
+          <caret line="145" column="32" lean-forward="true" selection-start-line="145" selection-start-column="32" selection-end-line="145" selection-end-column="32" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="414">
-          <caret line="22" column="46" lean-forward="true" selection-start-line="22" selection-start-column="46" selection-end-line="22" selection-end-column="46" />
-        </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="396">
-          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" column="83" selection-start-line="11" selection-start-column="83" selection-end-line="11" selection-end-column="83" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="26">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
-          <folding>
-            <element signature="method#getPgInPgStatusByPerson#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNumByName#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNum#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPersonListByDay#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPgStatusByPgInPgPerson#0;class#PgInPgStatusManager#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="44">
-          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-12">
-          <caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="87" lean-forward="true" selection-start-line="87" selection-end-line="87" />
-          <folding>
-            <element signature="method#getConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#addConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#deleteConstructionType#0;class#PgConstructionTypeRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
-          <folding>
-            <element signature="method#getConstructionTypeByType#0;class#PgConstructionTypeManager#0" />
-            <element signature="method#getAllConstructionTypeDto#0;class#PgConstructionTypeManager#0" />
-          </folding>
-        </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="145">
-          <caret line="258" column="9" lean-forward="true" selection-start-line="258" selection-start-column="9" selection-end-line="258" selection-end-column="9" />
-          <folding>
-            <element signature="method#getMonthInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayInPgStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgOverViewRs#0" />
-            <element signature="method#getAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getMonthAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayAlarmStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgOverViewRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="103">
-          <caret line="105" column="50" lean-forward="true" selection-start-line="105" selection-start-column="50" selection-end-line="105" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateBasicDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="99">
-          <caret line="125" selection-start-line="125" selection-end-line="125" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="190">
-          <caret line="24" column="35" lean-forward="true" selection-start-line="24" selection-start-column="35" selection-end-line="24" selection-end-column="35" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="436">
-          <caret line="24" lean-forward="true" selection-start-line="24" selection-end-line="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" lean-forward="true" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="300">
-          <caret line="34" column="31" lean-forward="true" selection-start-line="34" selection-start-column="31" selection-end-line="34" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="42" column="13" lean-forward="true" selection-start-line="42" selection-start-column="13" selection-end-line="42" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="120" column="72" lean-forward="true" selection-start-line="120" selection-start-column="72" selection-end-line="120" selection-end-column="72" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="293">
-          <caret line="58" column="73" lean-forward="true" selection-start-line="58" selection-start-column="73" selection-end-line="58" selection-end-column="73" />
-          <folding>
-            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
-            <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
-          </folding>
-        </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="307">
-          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
+        <state relative-caret-position="758">
+          <caret line="130" column="5" lean-forward="true" selection-start-line="130" selection-start-column="5" selection-end-line="130" selection-end-column="5" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1170">
-          <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
+        <state relative-caret-position="494">
+          <caret line="86" column="62" lean-forward="true" selection-start-line="86" selection-start-column="62" selection-end-line="86" selection-end-column="62" />
           <folding>
-            <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-            <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+            <element signature="method#getAllDevice#0;class#PgDeviceManager#0" />
+            <element signature="method#getAllDev#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="195" column="28" lean-forward="true" selection-start-line="195" selection-start-column="28" selection-end-line="195" selection-end-column="28" />
+        <state relative-caret-position="166">
+          <caret line="174" column="13" lean-forward="true" selection-start-line="174" selection-start-column="13" selection-end-line="174" selection-end-column="13" />
           <folding>
-            <element signature="method#getAlarmByTypeAndTime#0;class#PgAlarmManager#0" />
-            <element signature="method#getAlarmNum#0;class#PgAlarmManager#0" />
             <element signature="method#getDayAlarmStatistic#0;class#PgAlarmManager#0" />
+            <element signature="method#getAlarmList#0;class#PgAlarmManager#0" />
             <element signature="method#createDTO#0;class#PgAlarmManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="364">
+          <caret line="46" column="56" lean-forward="true" selection-start-line="46" selection-start-column="56" selection-end-line="46" selection-end-column="56" />
+          <folding>
+            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
+            <element signature="method#getPgDev#0;class#PgDeviceRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
+            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+        <state relative-caret-position="396">
+          <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
           <folding>
             <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
             <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -1365,52 +1331,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="239">
-          <caret line="21" column="33" lean-forward="true" selection-start-line="21" selection-start-column="33" selection-end-line="21" selection-end-column="33" />
-        </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="352">
-          <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-        </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="99">
-          <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-          </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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-          <folding>
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-            <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>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
index c436c93..e913155 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
@@ -132,7 +132,10 @@
             this.setAlarmType("");
         else
             this.setAlarmType(pgAlarm.getAlarmTypeId().getAlarmType());
-        this.setAlarmValue(pgAlarm.getAlarmValue());
+        if(pgAlarm.getAlarmValue()==null)
+            this.setAlarmValue("");
+        else
+            this.setAlarmValue(pgAlarm.getAlarmValue());
         if (pgAlarm.getAlarmDate() != null)
             this.setAlarmDate(sdf.format(pgAlarm.getAlarmDate()));
         else
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
index a43965c..565cb41 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -159,11 +159,21 @@
     }
 
     //获取历史报警消息列表
-    public List<PgAlarmDto> getAllAlarm(String alarmType,String startDay,String endDay,String isNew,int page,int rows) {
-        try {
+    public  Map<String, Object> getAllAlarm(String alarmType,String partition,String startDay,String endDay,String isNew,int page,int rows) {
 
+        Map<String, Object> resultMap = new HashMap<>();
+        String msg="";
+
+        try {
             Criteria criteria = createCriteria(PgAlarm.class);
 
+            if (StringUtils.isNotBlank(partition)) {
+                DetachedCriteria inCriteria = DetachedCriteria.forClass(PgDevice.class);
+                inCriteria.add(Restrictions.eq("partition", partition));
+                inCriteria.setProjection(Property.forName("id"));
+                criteria.add(Property.forName("alarmDevId").in(inCriteria));
+            }
+
             if (StringUtils.isNotBlank(alarmType)&&!alarmType.contains("全部")&&pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
                 criteria.add(Restrictions.eq("alarmTypeId", pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)));
 
@@ -190,8 +200,16 @@
             for (PgAlarm pgAlarm : pgAlarmList) {
                 pgAlarmDtoList.add(new PgAlarmDto(pgAlarm));
             }
-
-            return pgAlarmDtoList;
+            if(pgAlarmDtoList==null||pgAlarmDtoList.size()==0) {
+                resultMap.put("msg", "没有报警信息");
+                resultMap.put("code","0");
+            }else {
+                resultMap.put("code","200");
+                resultMap.put("msg", "报警信息获取成功");
+            }
+            resultMap.put("count",pg.getTotalCount());
+            resultMap.put("result",pgAlarmDtoList);
+            return resultMap;
         }
         catch(Exception ex){
             ex.printStackTrace();
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index 7547560..654f49e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -24,11 +24,11 @@
 
         Criteria criteria = createCriteria(PgDevice.class);
 
-        if(road!=null)
+        if(StringUtils.isNotBlank(road))
             criteria.add(Restrictions.eq("road",road));
-        if(partition!=null)
+        if(StringUtils.isNotBlank(partition))
             criteria.add(Restrictions.eq("partition",partition));
-        if(devType!=null)
+        if(StringUtils.isNotBlank(devType))
             criteria.add(Restrictions.eq("devType",devType));
 
         criteria.add(Restrictions.eq("active", 1));
@@ -43,6 +43,29 @@
         return pgDeviceDtoList;
     }
 
+    public List<PgDeviceDto> getAllDev(String road,String partition,String devType) {
+
+        Criteria criteria = createCriteria(PgDevice.class);
+
+        if(StringUtils.isNotBlank(road))
+            criteria.add(Restrictions.eq("road",road));
+        if(StringUtils.isNotBlank(partition))
+            criteria.add(Restrictions.eq("partition",partition));
+        if(StringUtils.isNotBlank(devType))
+            criteria.add(Restrictions.like("devType","%"+devType+"%"));
+
+        criteria.add(Restrictions.eq("active", 1));
+        criteria.addOrder(Order.desc("id"));
+        List<PgDevice> pgDeviceList = criteria.list();
+
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
+        for (PgDevice pgDevice : pgDeviceList) {
+            pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
+        }
+
+        return pgDeviceDtoList;
+    }
+
     //根据名字获取当前设备
     public PgDevice getDeviceByAssetCode(String assetCode) {
         Criteria criteria=createCriteria(PgDevice.class);
@@ -56,9 +79,9 @@
     }
 
     //根据类型获取设备列表
-    public List<PgDeviceDto> getDeviceByDevTypee(String devType) {
+    public List<PgDeviceDto> getDeviceByDevType(String devType) {
         Criteria criteria=createCriteria(PgDevice.class);
-        criteria.add(Restrictions.eq("devType",devType));
+        criteria.add(Restrictions.like("devType","%"+devType+"%"));
 
         List<PgDevice> pgDeviceList=criteria.list();
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
@@ -106,7 +129,7 @@
         criteria.add(Restrictions.eq("partition",partition));
 
         List<PgDevice> pgDeviceList=criteria.list();
-        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<PgDeviceDto>();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
 
         for (PgDevice pgDevice : pgDeviceList) {
             pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
index 3a3bccd..595730e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
@@ -1,10 +1,13 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.devTable.domain.PgAlarmType;
 import com.casic.PgInterface.devTable.domain.PgPartition;
 import com.casic.PgInterface.devTable.domain.PgRoad;
 import com.casic.PgInterface.devTable.domain.PipeGallery;
 import com.casic.PgInterface.devTable.dto.PgPartitionDto;
+import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
@@ -12,7 +15,9 @@
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Created by yxw on 2017/11/4.
@@ -21,7 +26,8 @@
 public class PgPartitionManager extends HibernateEntityDao<PgPartition> {
 
     @Resource
-    PgRoadManager pgRoadManager;
+    private PgRoadManager pgRoadManager;
+
 
     public PgPartition getPartitionByParName(String parName) {
         Criteria criteria = getSession().createCriteria(PgPartition.class);
@@ -99,4 +105,5 @@
         return pgPartitionDtoList;
     }
 
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
index f216360..a6928f1 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
@@ -5,6 +5,7 @@
 public class PgPlanResultRe {
 
     private String taskKey;
+    private List<String> pileAcuList;
     private List<PgPlanResult> pgPlanResultList;
 
     public String getTaskKey() {
@@ -15,6 +16,14 @@
         this.taskKey = taskKey;
     }
 
+    public List<String> getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(List<String> pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+
     public List<PgPlanResult> getPgPlanResultList() {
         return pgPlanResultList;
     }
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
index 71ea765..47eea07 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
@@ -54,9 +54,7 @@
 
         List<PgLineHole> pgLineHoleList=criteria.list();
         List<PgLineHoleDTO> pgLineHoleDTOList=new ArrayList<>();
-        if(pgLineHoleList==null||pgLineHoleList.size()==0)
-            return null;
-        else
+        if(pgLineHoleList!=null&&pgLineHoleList.size()!=0)
             pgLineHoleDTOList=PgLineHoleDTO.ConvertToDTOList(pgLineHoleList,pgPileAcuManager,pgRoadManager);
         return pgLineHoleDTOList;
     }
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
index 0fd9e1f..841a386 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
@@ -1,12 +1,15 @@
 package com.casic.PgInterface.intelPlan.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.devTable.domain.PgPartition;
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
 import com.casic.PgInterface.intelPlan.domain.PgLineHole;
 import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
 import com.casic.PgInterface.intelPlan.domain.PgSection;
 import com.casic.PgInterface.intelPlan.dto.PgPlanResult;
 import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
 import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -22,6 +25,9 @@
     @Resource
     private PgLineHoleManager pgLineHoleManager;
 
+    @Resource
+    private PgRoadManager pgRoadManager;
+
     public PgPileAcu getPgPileAcuByCode(String acuCode){
         List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
 
@@ -58,7 +64,9 @@
         for(PgPlanTask pgPlanTask:pgPlanTaskList){
             List<PgPlanResult> pgPlanResultList=getPgPlanResultByPlantask(pgPlanTask);
             PgPlanResultRe pgPlanResultRe=new PgPlanResultRe();
+
             pgPlanResultRe.setTaskKey(pgPlanTask.getTaskKey());
+            pgPlanResultRe.setPileAcuList(pgPlanTask.getPileAcuList());
             pgPlanResultRe.setPgPlanResultList(pgPlanResultList);
 
             pgPlanResultReList.add(pgPlanResultRe);
@@ -142,4 +150,57 @@
         return length;
     }
 
+    private PgPileAcu getPgPileAcuByAcuCode(String acuCode){
+        List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
+
+        if(pgPileAcuList==null||pgPileAcuList.size()==0)
+            return null;
+        else
+            return pgPileAcuList.get(0);
+    }
+
+    public List<PgAcuTask> getACUTask(String pileAcuList){
+        String[] acuArray=pileAcuList.split(",");
+        List<PgAcuTask> pgAcuTaskList=new ArrayList<>();
+
+        for(String acu:acuArray){
+            PgPileAcu pgPileAcu=this.getPgPileAcuByCode(acu);
+            String roadName=pgRoadManager.get(pgPileAcu.getRoadId()).getRoadName();
+
+            if(!containRoad(roadName,pgAcuTaskList))
+            {
+                PgAcuTask pgAcuTask=new PgAcuTask();
+                pgAcuTask.setRoadName(roadName);
+                pgAcuTask.setPileAcuList(acu);
+                pgAcuTaskList.add(pgAcuTask);
+            }
+            else{
+                PgAcuTask pgAcuTask=getIndexRoad(roadName,pgAcuTaskList);
+                if(pgAcuTask!=null)
+                    pgAcuTask.setPileAcuList(pgAcuTask.getPileAcuList()+","+acu);
+            }
+        }
+
+        return pgAcuTaskList;
+    }
+
+    private boolean containRoad(String roadName,List<PgAcuTask> pgAcuTaskList){
+        if(pgAcuTaskList==null||pgAcuTaskList.size()==0) return false;
+        for(PgAcuTask pgAcuTask:pgAcuTaskList){
+            if(pgAcuTask.getRoadName().equals(roadName))
+                return true;
+        }
+
+        return false;
+    }
+
+    private PgAcuTask getIndexRoad(String roadName, List<PgAcuTask> pgAcuTaskList){
+        for(PgAcuTask pgAcuTask:pgAcuTaskList){
+            if(pgAcuTask.getRoadName().equals(roadName))
+                return pgAcuTask;
+        }
+
+        return null;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java
new file mode 100644
index 0000000..323f7ef
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java
@@ -0,0 +1,25 @@
+package com.casic.PgInterface.reservePlan.dto;
+
+import java.util.List;
+
+public class PgAcuTask {
+
+    private String roadName;//道路
+    private String pileAcuList;//acu分区
+
+    public String getRoadName() {
+        return roadName;
+    }
+
+    public void setRoadName(String roadName) {
+        this.roadName = roadName;
+    }
+
+    public String getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(String pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
index c25e926..c7d7693 100644
--- a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
@@ -70,9 +70,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(Long.valueOf(inPgPersonId));
         PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("hostName",pgInPgPerson.getAssetCode());
-//        PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode());
-//        long maxId = pgTagPositionManager.getMaxId(pgTagMac.getTagMac());
-//        PGTagPosition pgTagPosition = pgTagPositionManager.get(maxId);
+
         PGTagPosition pgTagPosition = tagmacRun.GetTagStatus(pgTagMac);
         boolean bExist = false;
         bExist = pgTagPositionManager.findTagPosition(pgTagPosition.getPositionUpdatetime(),pgTagPosition.getHostId());
@@ -104,8 +102,7 @@
         PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(Long.valueOf(inPgPersonId));
         PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pgInPgPersonId",pgInPgPerson);
         System.out.println("time:"+pgInPgStatus.getInTime());
-//        PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pgInPgPersonId",inPgPersonId);
-//        PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode());
+
         PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("hostName",pgInPgPerson.getAssetCode());
 
         Map<Object,Object> mapPosition = new HashMap<>();
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
index 082ba5d..3eed00a 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
@@ -48,6 +48,7 @@
     public Map<String, Object> linkDevice(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         PgDeviceDto pgDeviceDto = null;
         try {
@@ -62,6 +63,7 @@
                     else {
                         pgDeviceDto = new PgDeviceDto(pgDevice);
                         msg = "报警关联设备获取成功";
+                        code="200";
                     }
                 }
             }
@@ -71,6 +73,7 @@
             e.printStackTrace();
             msg = "获取关联设备失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceDto);
 
@@ -86,6 +89,7 @@
     public Map<String, Object> linkPartitionCamera(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
         try {
@@ -106,6 +110,7 @@
 
                         pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(partition,position);
                         msg = "关联设备获取成功";
+                        code="200";
                     }
                 }
             }
@@ -115,6 +120,7 @@
             e.printStackTrace();
             msg = "分区设备关联失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceDtoList);
         return resultMap;
@@ -129,6 +135,7 @@
     public Map<String, Object> linkReservePlan(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgReservePlanDto> pgReservePlanDtoList=new ArrayList<>();
         try{
@@ -139,10 +146,12 @@
                 else {
                     pgReservePlanDtoList = pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
 
-                    if(pgReservePlanDtoList==null||pgReservePlanDtoList.size()==0)
-                        msg="不存在关联的报警预案";
-                    else
+                    if (pgReservePlanDtoList == null || pgReservePlanDtoList.size() == 0)
+                        msg = "不存在关联的报警预案";
+                    else {
                         msg = "关联预案获取成功";
+                        code="200";
+                    }
                 }
             }
             else
@@ -153,6 +162,7 @@
             e.printStackTrace();
             msg="预案关联失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgReservePlanDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
index 0ddbc4d..0ce886b 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
@@ -41,25 +41,19 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getAlarmList(@FormParam("alarmType") String alarmType,
                                             @FormParam("startDay") String startDay,
+                                            @FormParam("partition") String partition,
                                             @FormParam("endDay") String endDay,
                                             @FormParam("isNew") String isNew,
                                             @FormParam("page") int page,
                                             @FormParam("rows") int rows) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
         try {
-            pgAlarmDtoList = pgAlarmManager.getAllAlarm(alarmType,startDay,endDay,isNew,page,rows);
-            if (pgAlarmDtoList==null||pgAlarmDtoList.size() == 0)
-                msg = "没有报警信息";
-            else
-                msg = "报警信息获取成功";
+            resultMap = pgAlarmManager.getAllAlarm(alarmType,partition,startDay,endDay,isNew,page,rows);
+
         } catch (Exception e) {
             e.printStackTrace();
-            msg = "报警信息获取失败";
         }
-        resultMap.put("msg", msg);
-        resultMap.put("result", pgAlarmDtoList);
         return resultMap;
     }
 
@@ -71,9 +65,10 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> clearAlarmList(@FormParam("id") String id) throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        String result = "false";
+        String result = "";
+        String code="0";
 
         try {
             PgAlarm pgAlarm = new PgAlarm();
@@ -86,12 +81,14 @@
                 pgAlarmManager.save(pgAlarm);
                 msg = "报警信息清除成功";
                 result = "true";
+                code = "200";
             }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警信息清除失败";
             result = "false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
@@ -106,21 +103,26 @@
     public Map<String, Object> getAlarmByTypeOrTime(@FormParam("alarmType") String alarmType,
                                                     @FormParam("startTime") String startTime,
                                                     @FormParam("endTime") String endTime) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
-        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<PgAlarmDto>();
+        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
         try {
             pgAlarmDtoList = pgAlarmManager.getAlarmByTypeAndTime(alarmType, startTime, endTime);
             if (pgAlarmDtoList == null || pgAlarmDtoList.size() == 0)
                 msg = "报警信息不存在";
             else
+            {
                 msg = "报警信息获取成功";
+                code="200";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警信息获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
index 29ce8a4..ed0bf34 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
@@ -39,8 +39,8 @@
     public Map<String, Object> getAlarmRule(@FormParam("devType") String devType) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
-        System.out.println("devType:"+devType);
         List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<>();
         try {
             pgAlarmRuleDtoList = pgAlarmRuleManager.getAlarmRuleDto(devType);
@@ -52,6 +52,7 @@
             e.printStackTrace();
             msg = "报警阈值信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmRuleDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
index 24ab894..abef1b1 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
@@ -39,16 +39,21 @@
                                                      @FormParam("endDate") String endDate)throws Exception{
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
+
         List<PgAlarmTjDto> pgAlarmTjDtoList=null;
         try{
             pgAlarmTjDtoList=pgAlarmTjManager.getAlarmTjResultByType(startDate,endDate);
             msg="获取成功";
+            code="200";
         }
         catch(Exception ex) {
             msg = "统计失败";
         }
-        resultMap.put("result",pgAlarmTjDtoList);
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
+        resultMap.put("result",pgAlarmTjDtoList);
+
         return resultMap;
     }
 
@@ -61,23 +66,27 @@
     public Map<String, Object> getAlarmByTime(@FormParam("startTime") String startTime,
                                               @FormParam("endTime") String endTime,
                                               @FormParam("statisticType") String statisticType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code = "0";
 
-        List<PgAlarmTjDto> pgAlarmTjDtoList = new ArrayList<PgAlarmTjDto>();
+        List<PgAlarmTjDto> pgAlarmTjDtoList = new ArrayList<>();
         try {
             pgAlarmTjDtoList = pgAlarmTjManager.getAlarmByTime(startTime, endTime, statisticType);
             if(pgAlarmTjDtoList==null)
                 msg="报警统计信息获取失败";
-            else
-                msg="报警统计信息获取成功";
+            else {
+                msg = "报警统计信息获取成功";
+                code="200";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警统计信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmTjDtoList);
         return resultMap;
     }
 
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
index 28bc811..b6278a9 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
@@ -30,7 +30,6 @@
     @Resource
     private PgAlarmTypeManager pgAlarmTypeManager;
 
-
     /**
      * 获取报警类型
      */
@@ -38,19 +37,24 @@
     @Path("getAlarmType")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getAlarmTypeList()throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
-        List<PgAlarmTypeDto> pgAlarmTypeDtoList=new ArrayList<PgAlarmTypeDto>();
+        String code="";
+
+        List<PgAlarmTypeDto> pgAlarmTypeDtoList=new ArrayList<>();
         try {
             pgAlarmTypeDtoList = pgAlarmTypeManager.getAllAlarmTypeDto();
             if(pgAlarmTypeDtoList.size()==0)
                 msg="没有报警类型信息";
-            else
-                msg="报警类型信息获取成功";
+            else {
+                code="200";
+                msg = "报警类型信息获取成功";
+            }
         }catch(Exception e){
             e.printStackTrace();
             msg="报警类型信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAlarmTypeDtoList);
         return resultMap;
@@ -66,6 +70,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
@@ -83,6 +88,7 @@
                 logger.info("成功保存");
                 result = "true";
                 msg = "保存成功";
+                code="200";
             }
         } catch (Exception e) {
             result = "false";
@@ -90,6 +96,7 @@
             e.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -106,6 +113,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try{
             if(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
@@ -119,6 +127,7 @@
                 pgAlarmTypeManager.save(pgAlarmType);
                 result = "true";
                 msg = "编辑成功";
+                code="200";
             }
         }
         catch(Exception e)
@@ -128,6 +137,7 @@
             e.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("result",result);
         resultMap.put("msg",msg);
 
@@ -146,6 +156,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
         String result="false";
+        String code="0";
 
         try {
             PgAlarmType pgAlarmType=pgAlarmTypeManager.get(Long.valueOf(id));
@@ -157,6 +168,7 @@
             {
                 pgAlarmType.setActive(0);
                 pgAlarmTypeManager.save(pgAlarmType);
+                code="200";
                 msg="报警类型删除成功";
                 result="true";
             }
@@ -165,6 +177,7 @@
             msg="报警类型删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
index 4533e1a..85940bb 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
@@ -33,12 +33,15 @@
                                                  @FormParam("inSpectionPlace") String inSpectionPlace){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
         List<PgAssetPlanDto> pgAssetPlanDtoList=new ArrayList<>();
         try{
             pgAssetPlanDtoList=pgAssetPlanManager.getPgAssetPlanDtoList(startDay,endDay,inSpectionPlace);
-            if(pgAssetPlanDtoList!=null&&pgAssetPlanDtoList.size()!=0)
-                msg="巡检信息获取成功";
+            if(pgAssetPlanDtoList!=null&&pgAssetPlanDtoList.size()!=0) {
+                code="200";
+                msg = "巡检信息获取成功";
+            }
             else
                 msg="不存在巡检信息";
         }
@@ -47,6 +50,7 @@
             msg="巡检信息获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAssetPlanDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
index 47ef9d1..5cbdfcb 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
@@ -30,12 +30,15 @@
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
         String result="";
+        String code="0";
 
         List<PgAssetPlanStatic> pgAssetPlanStaticList = null;
         try{
             pgAssetPlanStaticList=pgAssetPlanManager.getPgAssetPlanStaticLisByTime(startTime,endTime,staticType);
-            if(pgAssetPlanStaticList!=null&&pgAssetPlanStaticList.size()!=0)
-                msg="巡检统计信息获取成功";
+            if(pgAssetPlanStaticList!=null&&pgAssetPlanStaticList.size()!=0) {
+                code = "200";
+                msg = "巡检统计信息获取成功";
+            }
             else
                 msg="统计信息获取失败";
         }
@@ -44,6 +47,7 @@
             msg="统计失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAssetPlanStaticList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
index 26f5d6a..503bfe3 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
@@ -40,6 +40,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="";
 
         try{
             PgAuthority pgAuthority=new PgAuthority();
@@ -50,6 +51,7 @@
 
             pgAuthorityManager.save(pgAuthority);
             msg="用户权限保存成功";
+            code="200";
             result="true";
         }
         catch(Exception e) {
@@ -57,6 +59,7 @@
             msg = "新增权限失败";
             result = "false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -65,22 +68,25 @@
 
     /*
        *编辑角权限信息
-        */
+    */
     @POST
     @Path("editAuthority")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> editAuthority(@FormParam("id") String id,
                                        @FormParam("authority") String authority,
                                        @FormParam("concent") String concent) throws Exception{
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
+
         try {
             PgAuthority pgAuthority=pgAuthorityManager.get(Long.valueOf(id));
             pgAuthority.setAuthority(authority);
             pgAuthority.setConcent(concent);
 
             pgAuthorityManager.save(pgAuthority);
+            code="200";
             msg="权限保存成功";
             result="true";
         }
@@ -90,7 +96,7 @@
             msg="权限编辑失败";
             result="false";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -105,9 +111,10 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> deleteAuthority(@FormParam("id") String id)throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
-        String result="false";
+        String result="";
+        String code="0";
 
         try {
             PgAuthority pgAuthority= pgAuthorityManager.get(Long.valueOf(id));
@@ -119,6 +126,7 @@
             {
                 pgAuthority.setActive(0);
                 pgAuthorityManager.save(pgAuthority);
+                code="200";
                 msg="删除权限成功";
                 result="true";
             }
@@ -127,37 +135,40 @@
             msg="删除权限失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
     }
 
     /*
-* 获取权限信息
- */
+    * 获取权限信息
+    */
     @POST
     @Path("getAuthorityList")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> getAuthorityList() {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgAuthorityDto> pgAuthorityDtoList = new ArrayList<PgAuthorityDto>();
         try {
             pgAuthorityDtoList = pgAuthorityManager.getAuthorityList();
             if (pgAuthorityDtoList == null)
                 msg = "不存在权限信息";
-            else
+            else {
+                code = "200";
                 msg = "权限信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "权限信息获取是失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAuthorityDtoList);
         return resultMap;
     }
 
 
-
-
 }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
index a9ef521..a74ecc7 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
@@ -45,6 +45,7 @@
                                                @FormParam("endDate") String endDate)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgHistoryDataDto> pgHistoryDataDtoList=new ArrayList<>();
 
         try {
@@ -55,13 +56,16 @@
                 pgHistoryDataDtoList=pgCh4Manager.getAllCH4Data(pgDevice,startDate,endDate);
                 if(pgHistoryDataDtoList==null)
                     msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+                else {
+                    code = "200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgHistoryDataDtoList);
         return resultMap;
@@ -75,8 +79,9 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getNewestCh4InfoByDev(@FormParam("assetCode") String assetCode)throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
+        String code="0";
         PgCh4Dto pgCh4Dto=new PgCh4Dto(null);
 
         try {
@@ -87,13 +92,17 @@
                 pgCh4Dto=pgCh4Manager.getNewestCH4Data(pgDevice);
                 if(pgCh4Dto==null)
                     msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgCh4Dto);
         return resultMap;
@@ -111,6 +120,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
@@ -127,6 +137,7 @@
                 pgCh4.setPgDeviceId(pgDevice);
 
                 pgCh4Manager.save(pgCh4);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -135,7 +146,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
index a7eac39..dfc8ca5 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
@@ -43,23 +43,27 @@
                                                       @FormParam("endDate") String endDate)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgHistoryDataDto> pgHistoryDataDtoList=new ArrayList<>();
 
         try {
             PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
                 msg="设备不存在";
-            else{
-                pgHistoryDataDtoList=pgCoManager.getAllCoData(pgDevice, startDate, endDate);
-                if(pgHistoryDataDtoList==null)
-                    msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+            else {
+                pgHistoryDataDtoList = pgCoManager.getAllCoData(pgDevice, startDate, endDate);
+                if (pgHistoryDataDtoList == null)
+                    msg = "没有满足要求的数据";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgHistoryDataDtoList);
         return resultMap;
@@ -75,6 +79,7 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         PgCoDto pgCoDto=new PgCoDto(null);
 
         try {
@@ -85,13 +90,16 @@
                 pgCoDto=pgCoManager.getNewestCoData(pgDevice);
                 if(pgCoDto==null)
                     msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgCoDto);
         return resultMap;
@@ -110,6 +118,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         try {
@@ -126,6 +135,7 @@
 
                 pgCoManager.save(pgCo);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
         } catch (Exception e) {
@@ -133,7 +143,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
index b4b826e..9af98a3 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
@@ -60,6 +60,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         try {
 
@@ -80,8 +81,8 @@
                 pgConstruction.setPgConstructionTypeId(pgConstructionType.getId());
                 pgConstruction.setActive(1);
                 pgConstruction.setParName(parName);
-                logger.info("保存成功");
                 pgConstructionManager.save(pgConstruction);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -90,6 +91,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("success", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -116,6 +118,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
@@ -140,6 +143,7 @@
                 pgConstruction.setParName(parName);
 
                 pgConstructionManager.save(pgConstruction);
+                code="200";
                 result = "true";
                 msg = "编辑成功";
             }
@@ -150,7 +154,7 @@
             e.printStackTrace();
 
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -167,6 +171,8 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
+
         try {
             PgConstruction pgConstruction = pgConstructionManager.get(Long.valueOf(id));
             if (pgConstruction == null)
@@ -177,6 +183,7 @@
             {
                 pgConstruction.setActive(0);
                 pgConstructionManager.save(pgConstruction);
+                code="200";
                 result = "true";
                 msg = "成功删除信息";
             }
@@ -185,6 +192,7 @@
             result = "false";
             msg = "删除失败";
         }
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -204,9 +212,11 @@
                                                   @FormParam("rows") int rows)throws Exception{
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
         List<PgConstructionDto> pgConstructionDtoList=new ArrayList<>();
         try{
             pgConstructionDtoList=pgConstructionManager.getPgContructionDto(cs_name,cs_type,startTime,endTime,page,rows);
+            code="200";
             msg="信息获取成功";
         }
         catch(Exception e)
@@ -214,6 +224,7 @@
             e.printStackTrace();
             msg="查询失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
 
@@ -231,18 +242,22 @@
                                                               @FormParam("statisticType") String statisticType) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgConstructionStiatistic> pgConstructionStiatisticList=new ArrayList<>();
         try {
             pgConstructionStiatisticList = pgConstructionManager.getConstructionByTimeAndStatus(startTime, endTime, statisticType);
             if(pgConstructionStiatisticList==null)
                 msg="施工统计信息获取失败";
-            else
-                msg="施工统计信息获取成功";
+            else {
+                code="200";
+                msg = "施工统计信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "施工统计信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgConstructionStiatisticList);
         return resultMap;
@@ -257,6 +272,7 @@
     public Map<String, Object> getConstructionByType(@FormParam("statisticType") String statisticType){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
         List<PgConstructionStiatistic> pgConstructionStiatisticList=new ArrayList<>();
 
         try{
@@ -268,6 +284,7 @@
                 resultMap.put("result",null);
             }
             else {
+                code="200";
                 msg = "统计信息获取成功";
                 resultMap.put("result", pgConstructionStiatisticList);
             }
@@ -278,6 +295,7 @@
             msg="统计失败";
             resultMap.put("result",null);
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         return resultMap;
     }
@@ -291,9 +309,11 @@
     public Map<String, Object> getConstructionToday() throws Exception{
         Map<String,Object> resultMap=new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgConstructionDto> pgConstructionDtoList=new ArrayList<PgConstructionDto>();
         try {
             pgConstructionDtoList = pgConstructionManager.getConstructionToday();
+            code="200";
             msg = "当天施工信息获取成功";
         }
         catch(Exception e)
@@ -301,7 +321,7 @@
             e.printStackTrace();
             msg="获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
         return resultMap;
@@ -316,6 +336,7 @@
     public Map<String, Object> getConstructionDev(@FormParam("id") String id) throws Exception{
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
         List<PgDeviceDto> pgDeviceDtoList =new ArrayList<>();
         try{
@@ -325,14 +346,17 @@
 
             if(pgDeviceDtoList==null)
                 msg="信息获取失败";
-            else
-                msg="信息获取成功";
+            else {
+                code="200";
+                msg = "信息获取成功";
+            }
         }
         catch(Exception e)
         {
             e.printStackTrace();
-            msg="设备信息获取成功";
+            msg="信息获取是被";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgDeviceDtoList);
 
@@ -346,17 +370,21 @@
     @Path("getConstruction")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getConstruction() throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
-        List<PgConstructionDto> pgConstructionDtoList=new ArrayList<PgConstructionDto>();
+        String code="0";
+
+        List<PgConstructionDto> pgConstructionDtoList=new ArrayList<>();
 
         try{
             pgConstructionDtoList=pgConstructionManager.getPgConstructionList();
             if(pgConstructionDtoList==null||pgConstructionDtoList.size()==0)
                 msg="不存在施工记录";
-            else
-                msg="施工信息获取成功";
+            else {
+                code = "200";
+                msg = "施工信息获取成功";
+            }
         }
         catch(Exception e)
         {
@@ -364,6 +392,7 @@
             msg="施工信息获取失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java
index fd3d53e..2019502 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java
@@ -39,12 +39,12 @@
         try {
             pgConstructionTypeDtoList = pgConstructionTypeManager.getAllConstructionTypeDto();
             if (pgConstructionTypeDtoList.size() == 0)
-                msg = "没有项目类型信息";
+                msg = "获取失败";
             else
-                msg = "项目类型获取成功";
+                msg = "获取成功";
         } catch (Exception e) {
             e.printStackTrace();
-            msg = "项目类型信息获取失败";
+            msg = "获取失败";
         }
         resultMap.put("msg", msg);
         resultMap.put("result", pgConstructionTypeDtoList);

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 25ded8a..283d7ab 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,20 +7,56 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" 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/construction/manager/PgCsDocumentManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/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/manager/PgAlarmManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/~$说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/~$说明20191207.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.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$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/接口说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明20191207.docx" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
@@ -51,7 +87,7 @@
         <counts>
           <entry key="class" value="4" />
           <entry key="iml" value="2" />
-          <entry key="java" value="707" />
+          <entry key="java" value="820" />
           <entry key="properties" value="14" />
           <entry key="xml" value="7" />
         </counts>
@@ -60,7 +96,7 @@
         <counts>
           <entry key="CLASS" value="4" />
           <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="707" />
+          <entry key="JAVA" value="820" />
           <entry key="Properties" value="14" />
           <entry key="XML" value="7" />
         </counts>
@@ -68,32 +104,32 @@
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
           <entry key="dummy" value="38" />
-          <entry key="java" value="30161" />
+          <entry key="java" value="40859" />
           <entry key="properties" value="100" />
-          <entry key="txt" value="176" />
+          <entry key="txt" value="186" />
           <entry key="xml" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="30161" />
-          <entry key="PLAIN_TEXT" value="214" />
+          <entry key="JAVA" value="40859" />
+          <entry key="PLAIN_TEXT" value="224" />
           <entry key="Properties" value="100" />
           <entry key="XML" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="48" />
+          <entry key="project.closed" value="51" />
           <entry key="project.open.time.1" value="5" />
           <entry key="project.open.time.12" value="2" />
           <entry key="project.open.time.13" value="1" />
           <entry key="project.open.time.15" value="1" />
           <entry key="project.open.time.16" value="1" />
           <entry key="project.open.time.17" value="1" />
-          <entry key="project.open.time.2" value="1" />
+          <entry key="project.open.time.2" value="2" />
           <entry key="project.open.time.20" value="1" />
-          <entry key="project.open.time.23" value="1" />
+          <entry key="project.open.time.23" value="2" />
           <entry key="project.open.time.24" value="2" />
           <entry key="project.open.time.251" value="1" />
           <entry key="project.open.time.27" value="2" />
@@ -106,8 +142,8 @@
           <entry key="project.open.time.36" value="1" />
           <entry key="project.open.time.37" value="1" />
           <entry key="project.open.time.39" value="2" />
-          <entry key="project.open.time.4" value="2" />
-          <entry key="project.open.time.40" value="1" />
+          <entry key="project.open.time.4" value="3" />
+          <entry key="project.open.time.40" value="2" />
           <entry key="project.open.time.41" value="2" />
           <entry key="project.open.time.42" value="2" />
           <entry key="project.open.time.43" value="2" />
@@ -122,23 +158,25 @@
           <entry key="project.open.time.6" value="3" />
           <entry key="project.open.time.63" value="2" />
           <entry key="project.open.time.64" value="1" />
+          <entry key="project.open.time.66" value="1" />
           <entry key="project.open.time.71" value="2" />
+          <entry key="project.open.time.74" value="1" />
           <entry key="project.open.time.76" value="1" />
           <entry key="project.open.time.8" value="2" />
           <entry key="project.open.time.9" value="1" />
           <entry key="project.open.time.97" value="1" />
-          <entry key="project.opened" value="78" />
+          <entry key="project.opened" value="84" />
         </counts>
       </usages-collector>
     </session>
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+            <state relative-caret-position="396">
+              <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
               <folding>
                 <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
                 <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -147,73 +185,6 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <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="99">
-              <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-              <folding>
-                <element signature="imports" expanded="true" />
-                <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-1170">
-              <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state>
-              <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
-              <folding>
-                <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-                <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="true">
-        <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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-              <folding>
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-                <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>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <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="352">
-              <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -225,18 +196,9 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>inCriteria</find>
-      <find>getPgPlanResulList</find>
-      <find>getPileAcuListByPileAcuStr</find>
-      <find>distinct</find>
-      <find>order</find>
-      <find>canPlanLine</find>
-      <find>isExistLine</find>
-      <find>getPlanResult</find>
       <find>pgPipeLine</find>
       <find>getPipeLineBylineName</find>
       <find>StringU</find>
-      <find>getAllAlarm</find>
       <find>getAlarmList</find>
       <find>getPgInPersonListByDay</find>
       <find>getDayInPgStatistic</find>
@@ -254,7 +216,16 @@
       <find>getPgContructionByNameOrType</find>
       <find>&quot;&quot;,&quot;&quot;,</find>
       <find>getPgContructionDtoByNameOrType</find>
+      <find>addConstruction</find>
+      <find>getPgLineAcuHole</find>
+      <find>getPlanResult</find>
       <find>getConstruction</find>
+      <find>addPipeLine</find>
+      <find>未找到入廊数据</find>
+      <find>getCurrentHoleByAcu</find>
+      <find>getAllAlarm</find>
+      <find>getPgDeviceDtoListByPartition</find>
+      <find>getPgDeviceByDevType</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -263,57 +234,57 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlan.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileHoleManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/planData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/PlanData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
       </list>
     </option>
   </component>
@@ -359,7 +330,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -421,53 +391,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="dto" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="manager" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -479,29 +402,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="rs" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -516,6 +416,7 @@
         </subPane>
       </pane>
       <pane id="Scope" />
+      <pane id="PackagesPane" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -710,7 +611,13 @@
       <workItem from="1574902733573" duration="1829000" />
       <workItem from="1574998240004" duration="7016000" />
       <workItem from="1575247959683" duration="6997000" />
-      <workItem from="1575704345590" duration="40473000" />
+      <workItem from="1575704345590" duration="69381000" />
+      <workItem from="1575869479666" duration="721000" />
+      <workItem from="1575947104878" duration="6101000" />
+      <workItem from="1576128264436" duration="3347000" />
+      <workItem from="1576208571543" duration="22000" />
+      <workItem from="1576227513917" duration="862000" />
+      <workItem from="1576293721220" duration="18246000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -817,11 +724,18 @@
       <option name="project" value="LOCAL" />
       <updated>1575775489149</updated>
     </task>
-    <option name="localTasksCounter" value="16" />
+    <task id="LOCAL-00016" summary="整改施工信息">
+      <created>1575791780774</created>
+      <option name="number" value="00016" />
+      <option name="presentableId" value="LOCAL-00016" />
+      <option name="project" value="LOCAL" />
+      <updated>1575791780774</updated>
+    </task>
+    <option name="localTasksCounter" value="17" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="452131000" />
+    <option name="totallyTimeSpent" value="510338000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -834,9 +748,8 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
-    <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.24205749" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2647504" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -847,7 +760,7 @@
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.3295082" />
       <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.4819672" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.65737706" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.3295082" />
@@ -939,7 +852,8 @@
     <MESSAGE value="重新设计智能规划部分" />
     <MESSAGE value="完成智能规划对接" />
     <MESSAGE value="修改报警统计" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改报警统计" />
+    <MESSAGE value="整改施工信息" />
+    <option name="LAST_COMMIT_MESSAGE" value="整改施工信息" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -951,16 +865,10 @@
           <option name="timeStamp" value="3" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java</url>
-          <line>69</line>
+          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java</url>
+          <line>40</line>
           <properties />
-          <option name="timeStamp" value="21" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java</url>
-          <line>96</line>
-          <properties />
-          <option name="timeStamp" value="38" />
+          <option name="timeStamp" value="122" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
@@ -970,394 +878,452 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <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="2068">
-          <caret line="154" column="35" selection-start-line="154" selection-start-column="35" selection-end-line="154" selection-end-column="35" />
-        </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="3300">
-          <caret line="297" column="22" selection-start-line="297" selection-start-column="22" selection-end-line="297" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/StringUtils.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
-          <caret line="13" column="48" lean-forward="true" selection-start-line="13" selection-start-column="48" selection-end-line="13" selection-end-column="48" />
+          <caret line="11" column="5" selection-start-line="11" selection-start-column="5" selection-end-line="11" selection-end-column="5" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="78" lean-forward="true" selection-start-line="78" selection-end-line="78" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="616">
-          <caret line="41" column="1" selection-start-line="41" selection-start-column="1" selection-end-line="41" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="110">
-          <caret line="12" column="23" selection-start-line="12" selection-start-column="23" selection-end-line="12" selection-end-column="23" />
+        <state relative-caret-position="516">
+          <caret line="114" column="12" selection-start-line="114" selection-start-column="12" selection-end-line="114" selection-end-column="12" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="164">
-          <caret line="56" lean-forward="true" selection-start-line="56" selection-end-line="56" />
+        <state relative-caret-position="418">
+          <caret line="33" column="44" selection-start-line="33" selection-start-column="44" selection-end-line="33" selection-end-column="44" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="258">
-          <caret line="27" column="12" lean-forward="true" selection-start-line="27" selection-start-column="12" selection-end-line="27" selection-end-column="12" />
+        <state relative-caret-position="132">
+          <caret line="11" column="20" lean-forward="true" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="20" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.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="-12">
-          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        <state relative-caret-position="516">
+          <caret line="142" column="54" selection-start-line="142" selection-start-column="54" selection-end-line="142" selection-end-column="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="858">
-          <caret line="55" column="27" lean-forward="true" selection-start-line="55" selection-start-column="27" selection-end-line="55" selection-end-column="27" />
+        <state relative-caret-position="66">
+          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="58">
+          <caret line="18" column="28" selection-start-line="18" selection-start-column="19" selection-end-line="18" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="305">
+          <caret line="24" column="31" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="714">
+          <caret line="58" column="5" lean-forward="true" selection-start-line="58" selection-start-column="5" selection-end-line="58" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="924">
+          <caret line="134" column="92" selection-start-line="134" selection-start-column="92" selection-end-line="134" selection-end-column="92" />
+          <folding>
+            <element signature="method#linkDevice#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkPartitionCamera#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkReservePlan#0;class#PgAlarmLinkRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1066">
+          <caret line="90" lean-forward="true" selection-start-line="90" selection-end-line="90" />
+          <folding>
+            <element signature="method#getTjResultByAlarmType#0;class#PgAlarmTjRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="946">
+          <caret line="148" column="11" lean-forward="true" selection-start-line="148" selection-start-column="11" selection-end-line="148" selection-end-column="11" />
+          <folding>
+            <element signature="method#getAlarmTypeList#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#addAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#editAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#deleteAlarmType#0;class#PgAlarmTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="208">
+          <caret line="46" column="23" lean-forward="true" selection-start-line="46" selection-start-column="23" selection-end-line="46" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="113" column="9" lean-forward="true" selection-start-line="113" selection-start-column="9" selection-end-line="113" selection-end-column="9" />
+          <folding>
+            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
+            <element signature="method#getNewestCh4InfoByDev#0;class#PgCh4Rs#0" />
+            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="145" column="6" lean-forward="true" selection-start-line="145" selection-start-column="6" selection-end-line="145" selection-end-column="6" />
+          <folding>
+            <element signature="method#addAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#editAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#deleteAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#getAuthorityList#0;class#PgAuthorityRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="58" column="1" lean-forward="true" selection-start-line="58" selection-start-column="1" selection-end-line="58" selection-end-column="1" />
+          <folding>
+            <element signature="method#getPgAssetPlanList#0;class#PgAssetPlanRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="370">
+          <caret line="371" column="66" selection-start-line="371" selection-start-column="66" selection-end-line="371" selection-end-column="66" />
+          <folding>
+            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#searchConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionDev#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="139" column="13" lean-forward="true" selection-start-line="139" selection-start-column="13" selection-end-line="139" selection-end-column="13" />
+          <folding>
+            <element signature="method#getCoInfoByDevAndDate#0;class#PgCoRs#0" />
+            <element signature="method#getNewestCoInfoByDev#0;class#PgCoRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="540">
+          <caret line="223" column="5" lean-forward="true" selection-start-line="223" selection-start-column="5" selection-end-line="223" selection-end-column="5" />
+          <folding>
+            <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="682">
+          <caret line="100" lean-forward="true" selection-start-line="100" selection-end-line="100" />
+          <folding>
+            <element signature="method#getDeviceTpeyList#0;class#PgDeviceTypeRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="377">
+          <caret line="225" column="35" selection-start-line="225" selection-start-column="35" selection-end-line="225" selection-end-column="35" />
+          <folding>
+            <element signature="method#addEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#addEquipment#1;class#PgEquipmentRs#0" />
+            <element signature="method#getEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#deleteEquipment#0;class#PgEquipmentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="406">
+          <caret line="109" lean-forward="true" selection-start-line="109" selection-end-line="109" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="154">
+          <caret line="28" column="19" selection-start-line="28" selection-start-column="19" selection-end-line="28" selection-end-column="19" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="748">
-          <caret line="49" column="5" lean-forward="true" selection-start-line="49" selection-start-column="5" selection-end-line="49" selection-end-column="5" />
+        <state relative-caret-position="296">
+          <caret line="161" column="35" selection-start-line="161" selection-start-column="35" selection-end-line="161" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="384">
+          <caret line="99" column="5" lean-forward="true" selection-start-line="99" selection-start-column="5" selection-end-line="99" selection-end-column="5" />
+        </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="362">
+          <caret line="340" column="35" selection-start-line="340" selection-start-column="35" selection-end-line="340" selection-end-column="35" />
+          <folding>
+            <element signature="method#addInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPersonInPg#0;class#PgInPgPersonRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-606">
+          <caret line="76" column="20" lean-forward="true" selection-start-line="76" selection-start-column="20" selection-end-line="76" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="65" column="35" selection-start-line="65" selection-start-column="35" selection-end-line="65" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="101" column="35" selection-start-line="101" selection-start-column="35" selection-end-line="101" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="84" column="35" selection-start-line="84" selection-start-column="35" selection-end-line="84" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="59" lean-forward="true" selection-start-line="59" selection-end-line="59" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="60" column="1" lean-forward="true" selection-start-line="60" selection-start-column="1" selection-end-line="60" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="145" column="35" selection-start-line="145" selection-start-column="35" selection-end-line="145" selection-end-column="35" />
+        </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="274">
+          <caret line="350" column="35" selection-start-line="350" selection-start-column="35" selection-end-line="350" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="121" column="39" selection-start-line="121" selection-start-column="39" selection-end-line="121" selection-end-column="39" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="28" column="8" lean-forward="true" selection-start-line="28" selection-start-column="8" selection-end-line="28" selection-end-column="8" />
+        <state relative-caret-position="340">
+          <caret line="103" selection-start-line="103" selection-end-line="103" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="226" column="35" selection-start-line="226" selection-start-column="35" selection-end-line="226" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="203" column="35" selection-start-line="203" selection-start-column="35" selection-end-line="203" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="241" column="35" selection-start-line="241" selection-start-column="35" selection-end-line="241" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="225" column="1" lean-forward="true" selection-start-line="225" selection-start-column="1" selection-end-line="225" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="176" column="5" lean-forward="true" selection-start-line="176" selection-start-column="5" selection-end-line="176" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="178" column="35" lean-forward="true" selection-start-line="178" selection-start-column="35" selection-end-line="178" selection-end-column="35" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="516">
-          <caret line="94" column="53" selection-start-line="94" selection-start-column="53" selection-end-line="94" selection-end-column="53" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="814">
-          <caret line="52" column="9" lean-forward="true" selection-start-line="52" selection-start-column="9" selection-end-line="52" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="182">
-          <caret line="58" column="12" lean-forward="true" selection-start-line="58" selection-start-column="12" selection-end-line="58" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="34" lean-forward="true" selection-start-line="34" selection-end-line="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="32" lean-forward="true" selection-start-line="32" selection-end-line="32" />
-          <folding>
-            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
-            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="185">
-          <caret line="63" column="13" selection-start-line="63" selection-start-column="13" selection-end-line="63" selection-end-column="13" />
-          <folding>
-            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
-            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
-            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="e#6319#6324#0" />
-            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
-          </folding>
+          <caret line="240" lean-forward="true" selection-start-line="240" selection-end-line="240" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
-          <caret line="58" column="28" lean-forward="true" selection-start-line="58" selection-start-column="28" selection-end-line="58" selection-end-column="28" />
-          <folding>
-            <element signature="method#addTempHumData#0;class#PgTempHumRs#0" />
-          </folding>
+        <state relative-caret-position="340">
+          <caret line="148" column="34" selection-start-line="148" selection-start-column="34" selection-end-line="148" selection-end-column="34" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
+        <state relative-caret-position="458">
+          <caret line="99" column="35" selection-start-line="99" selection-start-column="35" selection-end-line="99" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+        <state relative-caret-position="384">
+          <caret line="145" column="32" lean-forward="true" selection-start-line="145" selection-start-column="32" selection-end-line="145" selection-end-column="32" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="414">
-          <caret line="22" column="46" lean-forward="true" selection-start-line="22" selection-start-column="46" selection-end-line="22" selection-end-column="46" />
-        </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="396">
-          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" column="83" selection-start-line="11" selection-start-column="83" selection-end-line="11" selection-end-column="83" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="26">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
-          <folding>
-            <element signature="method#getPgInPgStatusByPerson#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNumByName#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNum#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPersonListByDay#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPgStatusByPgInPgPerson#0;class#PgInPgStatusManager#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="44">
-          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-12">
-          <caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="87" lean-forward="true" selection-start-line="87" selection-end-line="87" />
-          <folding>
-            <element signature="method#getConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#addConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#deleteConstructionType#0;class#PgConstructionTypeRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
-          <folding>
-            <element signature="method#getConstructionTypeByType#0;class#PgConstructionTypeManager#0" />
-            <element signature="method#getAllConstructionTypeDto#0;class#PgConstructionTypeManager#0" />
-          </folding>
-        </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="145">
-          <caret line="258" column="9" lean-forward="true" selection-start-line="258" selection-start-column="9" selection-end-line="258" selection-end-column="9" />
-          <folding>
-            <element signature="method#getMonthInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayInPgStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgOverViewRs#0" />
-            <element signature="method#getAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getMonthAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayAlarmStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgOverViewRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="103">
-          <caret line="105" column="50" lean-forward="true" selection-start-line="105" selection-start-column="50" selection-end-line="105" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateBasicDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="99">
-          <caret line="125" selection-start-line="125" selection-end-line="125" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="190">
-          <caret line="24" column="35" lean-forward="true" selection-start-line="24" selection-start-column="35" selection-end-line="24" selection-end-column="35" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="436">
-          <caret line="24" lean-forward="true" selection-start-line="24" selection-end-line="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" lean-forward="true" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="300">
-          <caret line="34" column="31" lean-forward="true" selection-start-line="34" selection-start-column="31" selection-end-line="34" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="42" column="13" lean-forward="true" selection-start-line="42" selection-start-column="13" selection-end-line="42" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="120" column="72" lean-forward="true" selection-start-line="120" selection-start-column="72" selection-end-line="120" selection-end-column="72" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="293">
-          <caret line="58" column="73" lean-forward="true" selection-start-line="58" selection-start-column="73" selection-end-line="58" selection-end-column="73" />
-          <folding>
-            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
-            <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
-          </folding>
-        </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="307">
-          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
+        <state relative-caret-position="758">
+          <caret line="130" column="5" lean-forward="true" selection-start-line="130" selection-start-column="5" selection-end-line="130" selection-end-column="5" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1170">
-          <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
+        <state relative-caret-position="494">
+          <caret line="86" column="62" lean-forward="true" selection-start-line="86" selection-start-column="62" selection-end-line="86" selection-end-column="62" />
           <folding>
-            <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-            <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+            <element signature="method#getAllDevice#0;class#PgDeviceManager#0" />
+            <element signature="method#getAllDev#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="195" column="28" lean-forward="true" selection-start-line="195" selection-start-column="28" selection-end-line="195" selection-end-column="28" />
+        <state relative-caret-position="166">
+          <caret line="174" column="13" lean-forward="true" selection-start-line="174" selection-start-column="13" selection-end-line="174" selection-end-column="13" />
           <folding>
-            <element signature="method#getAlarmByTypeAndTime#0;class#PgAlarmManager#0" />
-            <element signature="method#getAlarmNum#0;class#PgAlarmManager#0" />
             <element signature="method#getDayAlarmStatistic#0;class#PgAlarmManager#0" />
+            <element signature="method#getAlarmList#0;class#PgAlarmManager#0" />
             <element signature="method#createDTO#0;class#PgAlarmManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="364">
+          <caret line="46" column="56" lean-forward="true" selection-start-line="46" selection-start-column="56" selection-end-line="46" selection-end-column="56" />
+          <folding>
+            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
+            <element signature="method#getPgDev#0;class#PgDeviceRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
+            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+        <state relative-caret-position="396">
+          <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
           <folding>
             <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
             <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -1365,52 +1331,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="239">
-          <caret line="21" column="33" lean-forward="true" selection-start-line="21" selection-start-column="33" selection-end-line="21" selection-end-column="33" />
-        </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="352">
-          <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-        </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="99">
-          <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-          </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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-          <folding>
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-            <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>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
index c436c93..e913155 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
@@ -132,7 +132,10 @@
             this.setAlarmType("");
         else
             this.setAlarmType(pgAlarm.getAlarmTypeId().getAlarmType());
-        this.setAlarmValue(pgAlarm.getAlarmValue());
+        if(pgAlarm.getAlarmValue()==null)
+            this.setAlarmValue("");
+        else
+            this.setAlarmValue(pgAlarm.getAlarmValue());
         if (pgAlarm.getAlarmDate() != null)
             this.setAlarmDate(sdf.format(pgAlarm.getAlarmDate()));
         else
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
index a43965c..565cb41 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -159,11 +159,21 @@
     }
 
     //获取历史报警消息列表
-    public List<PgAlarmDto> getAllAlarm(String alarmType,String startDay,String endDay,String isNew,int page,int rows) {
-        try {
+    public  Map<String, Object> getAllAlarm(String alarmType,String partition,String startDay,String endDay,String isNew,int page,int rows) {
 
+        Map<String, Object> resultMap = new HashMap<>();
+        String msg="";
+
+        try {
             Criteria criteria = createCriteria(PgAlarm.class);
 
+            if (StringUtils.isNotBlank(partition)) {
+                DetachedCriteria inCriteria = DetachedCriteria.forClass(PgDevice.class);
+                inCriteria.add(Restrictions.eq("partition", partition));
+                inCriteria.setProjection(Property.forName("id"));
+                criteria.add(Property.forName("alarmDevId").in(inCriteria));
+            }
+
             if (StringUtils.isNotBlank(alarmType)&&!alarmType.contains("全部")&&pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
                 criteria.add(Restrictions.eq("alarmTypeId", pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)));
 
@@ -190,8 +200,16 @@
             for (PgAlarm pgAlarm : pgAlarmList) {
                 pgAlarmDtoList.add(new PgAlarmDto(pgAlarm));
             }
-
-            return pgAlarmDtoList;
+            if(pgAlarmDtoList==null||pgAlarmDtoList.size()==0) {
+                resultMap.put("msg", "没有报警信息");
+                resultMap.put("code","0");
+            }else {
+                resultMap.put("code","200");
+                resultMap.put("msg", "报警信息获取成功");
+            }
+            resultMap.put("count",pg.getTotalCount());
+            resultMap.put("result",pgAlarmDtoList);
+            return resultMap;
         }
         catch(Exception ex){
             ex.printStackTrace();
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index 7547560..654f49e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -24,11 +24,11 @@
 
         Criteria criteria = createCriteria(PgDevice.class);
 
-        if(road!=null)
+        if(StringUtils.isNotBlank(road))
             criteria.add(Restrictions.eq("road",road));
-        if(partition!=null)
+        if(StringUtils.isNotBlank(partition))
             criteria.add(Restrictions.eq("partition",partition));
-        if(devType!=null)
+        if(StringUtils.isNotBlank(devType))
             criteria.add(Restrictions.eq("devType",devType));
 
         criteria.add(Restrictions.eq("active", 1));
@@ -43,6 +43,29 @@
         return pgDeviceDtoList;
     }
 
+    public List<PgDeviceDto> getAllDev(String road,String partition,String devType) {
+
+        Criteria criteria = createCriteria(PgDevice.class);
+
+        if(StringUtils.isNotBlank(road))
+            criteria.add(Restrictions.eq("road",road));
+        if(StringUtils.isNotBlank(partition))
+            criteria.add(Restrictions.eq("partition",partition));
+        if(StringUtils.isNotBlank(devType))
+            criteria.add(Restrictions.like("devType","%"+devType+"%"));
+
+        criteria.add(Restrictions.eq("active", 1));
+        criteria.addOrder(Order.desc("id"));
+        List<PgDevice> pgDeviceList = criteria.list();
+
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
+        for (PgDevice pgDevice : pgDeviceList) {
+            pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
+        }
+
+        return pgDeviceDtoList;
+    }
+
     //根据名字获取当前设备
     public PgDevice getDeviceByAssetCode(String assetCode) {
         Criteria criteria=createCriteria(PgDevice.class);
@@ -56,9 +79,9 @@
     }
 
     //根据类型获取设备列表
-    public List<PgDeviceDto> getDeviceByDevTypee(String devType) {
+    public List<PgDeviceDto> getDeviceByDevType(String devType) {
         Criteria criteria=createCriteria(PgDevice.class);
-        criteria.add(Restrictions.eq("devType",devType));
+        criteria.add(Restrictions.like("devType","%"+devType+"%"));
 
         List<PgDevice> pgDeviceList=criteria.list();
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
@@ -106,7 +129,7 @@
         criteria.add(Restrictions.eq("partition",partition));
 
         List<PgDevice> pgDeviceList=criteria.list();
-        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<PgDeviceDto>();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
 
         for (PgDevice pgDevice : pgDeviceList) {
             pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
index 3a3bccd..595730e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
@@ -1,10 +1,13 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.devTable.domain.PgAlarmType;
 import com.casic.PgInterface.devTable.domain.PgPartition;
 import com.casic.PgInterface.devTable.domain.PgRoad;
 import com.casic.PgInterface.devTable.domain.PipeGallery;
 import com.casic.PgInterface.devTable.dto.PgPartitionDto;
+import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
@@ -12,7 +15,9 @@
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Created by yxw on 2017/11/4.
@@ -21,7 +26,8 @@
 public class PgPartitionManager extends HibernateEntityDao<PgPartition> {
 
     @Resource
-    PgRoadManager pgRoadManager;
+    private PgRoadManager pgRoadManager;
+
 
     public PgPartition getPartitionByParName(String parName) {
         Criteria criteria = getSession().createCriteria(PgPartition.class);
@@ -99,4 +105,5 @@
         return pgPartitionDtoList;
     }
 
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
index f216360..a6928f1 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
@@ -5,6 +5,7 @@
 public class PgPlanResultRe {
 
     private String taskKey;
+    private List<String> pileAcuList;
     private List<PgPlanResult> pgPlanResultList;
 
     public String getTaskKey() {
@@ -15,6 +16,14 @@
         this.taskKey = taskKey;
     }
 
+    public List<String> getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(List<String> pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+
     public List<PgPlanResult> getPgPlanResultList() {
         return pgPlanResultList;
     }
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
index 71ea765..47eea07 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
@@ -54,9 +54,7 @@
 
         List<PgLineHole> pgLineHoleList=criteria.list();
         List<PgLineHoleDTO> pgLineHoleDTOList=new ArrayList<>();
-        if(pgLineHoleList==null||pgLineHoleList.size()==0)
-            return null;
-        else
+        if(pgLineHoleList!=null&&pgLineHoleList.size()!=0)
             pgLineHoleDTOList=PgLineHoleDTO.ConvertToDTOList(pgLineHoleList,pgPileAcuManager,pgRoadManager);
         return pgLineHoleDTOList;
     }
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
index 0fd9e1f..841a386 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
@@ -1,12 +1,15 @@
 package com.casic.PgInterface.intelPlan.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.devTable.domain.PgPartition;
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
 import com.casic.PgInterface.intelPlan.domain.PgLineHole;
 import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
 import com.casic.PgInterface.intelPlan.domain.PgSection;
 import com.casic.PgInterface.intelPlan.dto.PgPlanResult;
 import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
 import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -22,6 +25,9 @@
     @Resource
     private PgLineHoleManager pgLineHoleManager;
 
+    @Resource
+    private PgRoadManager pgRoadManager;
+
     public PgPileAcu getPgPileAcuByCode(String acuCode){
         List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
 
@@ -58,7 +64,9 @@
         for(PgPlanTask pgPlanTask:pgPlanTaskList){
             List<PgPlanResult> pgPlanResultList=getPgPlanResultByPlantask(pgPlanTask);
             PgPlanResultRe pgPlanResultRe=new PgPlanResultRe();
+
             pgPlanResultRe.setTaskKey(pgPlanTask.getTaskKey());
+            pgPlanResultRe.setPileAcuList(pgPlanTask.getPileAcuList());
             pgPlanResultRe.setPgPlanResultList(pgPlanResultList);
 
             pgPlanResultReList.add(pgPlanResultRe);
@@ -142,4 +150,57 @@
         return length;
     }
 
+    private PgPileAcu getPgPileAcuByAcuCode(String acuCode){
+        List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
+
+        if(pgPileAcuList==null||pgPileAcuList.size()==0)
+            return null;
+        else
+            return pgPileAcuList.get(0);
+    }
+
+    public List<PgAcuTask> getACUTask(String pileAcuList){
+        String[] acuArray=pileAcuList.split(",");
+        List<PgAcuTask> pgAcuTaskList=new ArrayList<>();
+
+        for(String acu:acuArray){
+            PgPileAcu pgPileAcu=this.getPgPileAcuByCode(acu);
+            String roadName=pgRoadManager.get(pgPileAcu.getRoadId()).getRoadName();
+
+            if(!containRoad(roadName,pgAcuTaskList))
+            {
+                PgAcuTask pgAcuTask=new PgAcuTask();
+                pgAcuTask.setRoadName(roadName);
+                pgAcuTask.setPileAcuList(acu);
+                pgAcuTaskList.add(pgAcuTask);
+            }
+            else{
+                PgAcuTask pgAcuTask=getIndexRoad(roadName,pgAcuTaskList);
+                if(pgAcuTask!=null)
+                    pgAcuTask.setPileAcuList(pgAcuTask.getPileAcuList()+","+acu);
+            }
+        }
+
+        return pgAcuTaskList;
+    }
+
+    private boolean containRoad(String roadName,List<PgAcuTask> pgAcuTaskList){
+        if(pgAcuTaskList==null||pgAcuTaskList.size()==0) return false;
+        for(PgAcuTask pgAcuTask:pgAcuTaskList){
+            if(pgAcuTask.getRoadName().equals(roadName))
+                return true;
+        }
+
+        return false;
+    }
+
+    private PgAcuTask getIndexRoad(String roadName, List<PgAcuTask> pgAcuTaskList){
+        for(PgAcuTask pgAcuTask:pgAcuTaskList){
+            if(pgAcuTask.getRoadName().equals(roadName))
+                return pgAcuTask;
+        }
+
+        return null;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java
new file mode 100644
index 0000000..323f7ef
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java
@@ -0,0 +1,25 @@
+package com.casic.PgInterface.reservePlan.dto;
+
+import java.util.List;
+
+public class PgAcuTask {
+
+    private String roadName;//道路
+    private String pileAcuList;//acu分区
+
+    public String getRoadName() {
+        return roadName;
+    }
+
+    public void setRoadName(String roadName) {
+        this.roadName = roadName;
+    }
+
+    public String getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(String pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
index c25e926..c7d7693 100644
--- a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
@@ -70,9 +70,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(Long.valueOf(inPgPersonId));
         PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("hostName",pgInPgPerson.getAssetCode());
-//        PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode());
-//        long maxId = pgTagPositionManager.getMaxId(pgTagMac.getTagMac());
-//        PGTagPosition pgTagPosition = pgTagPositionManager.get(maxId);
+
         PGTagPosition pgTagPosition = tagmacRun.GetTagStatus(pgTagMac);
         boolean bExist = false;
         bExist = pgTagPositionManager.findTagPosition(pgTagPosition.getPositionUpdatetime(),pgTagPosition.getHostId());
@@ -104,8 +102,7 @@
         PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(Long.valueOf(inPgPersonId));
         PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pgInPgPersonId",pgInPgPerson);
         System.out.println("time:"+pgInPgStatus.getInTime());
-//        PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pgInPgPersonId",inPgPersonId);
-//        PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode());
+
         PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("hostName",pgInPgPerson.getAssetCode());
 
         Map<Object,Object> mapPosition = new HashMap<>();
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
index 082ba5d..3eed00a 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
@@ -48,6 +48,7 @@
     public Map<String, Object> linkDevice(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         PgDeviceDto pgDeviceDto = null;
         try {
@@ -62,6 +63,7 @@
                     else {
                         pgDeviceDto = new PgDeviceDto(pgDevice);
                         msg = "报警关联设备获取成功";
+                        code="200";
                     }
                 }
             }
@@ -71,6 +73,7 @@
             e.printStackTrace();
             msg = "获取关联设备失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceDto);
 
@@ -86,6 +89,7 @@
     public Map<String, Object> linkPartitionCamera(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
         try {
@@ -106,6 +110,7 @@
 
                         pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(partition,position);
                         msg = "关联设备获取成功";
+                        code="200";
                     }
                 }
             }
@@ -115,6 +120,7 @@
             e.printStackTrace();
             msg = "分区设备关联失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceDtoList);
         return resultMap;
@@ -129,6 +135,7 @@
     public Map<String, Object> linkReservePlan(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgReservePlanDto> pgReservePlanDtoList=new ArrayList<>();
         try{
@@ -139,10 +146,12 @@
                 else {
                     pgReservePlanDtoList = pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
 
-                    if(pgReservePlanDtoList==null||pgReservePlanDtoList.size()==0)
-                        msg="不存在关联的报警预案";
-                    else
+                    if (pgReservePlanDtoList == null || pgReservePlanDtoList.size() == 0)
+                        msg = "不存在关联的报警预案";
+                    else {
                         msg = "关联预案获取成功";
+                        code="200";
+                    }
                 }
             }
             else
@@ -153,6 +162,7 @@
             e.printStackTrace();
             msg="预案关联失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgReservePlanDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
index 0ddbc4d..0ce886b 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
@@ -41,25 +41,19 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getAlarmList(@FormParam("alarmType") String alarmType,
                                             @FormParam("startDay") String startDay,
+                                            @FormParam("partition") String partition,
                                             @FormParam("endDay") String endDay,
                                             @FormParam("isNew") String isNew,
                                             @FormParam("page") int page,
                                             @FormParam("rows") int rows) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
         try {
-            pgAlarmDtoList = pgAlarmManager.getAllAlarm(alarmType,startDay,endDay,isNew,page,rows);
-            if (pgAlarmDtoList==null||pgAlarmDtoList.size() == 0)
-                msg = "没有报警信息";
-            else
-                msg = "报警信息获取成功";
+            resultMap = pgAlarmManager.getAllAlarm(alarmType,partition,startDay,endDay,isNew,page,rows);
+
         } catch (Exception e) {
             e.printStackTrace();
-            msg = "报警信息获取失败";
         }
-        resultMap.put("msg", msg);
-        resultMap.put("result", pgAlarmDtoList);
         return resultMap;
     }
 
@@ -71,9 +65,10 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> clearAlarmList(@FormParam("id") String id) throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        String result = "false";
+        String result = "";
+        String code="0";
 
         try {
             PgAlarm pgAlarm = new PgAlarm();
@@ -86,12 +81,14 @@
                 pgAlarmManager.save(pgAlarm);
                 msg = "报警信息清除成功";
                 result = "true";
+                code = "200";
             }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警信息清除失败";
             result = "false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
@@ -106,21 +103,26 @@
     public Map<String, Object> getAlarmByTypeOrTime(@FormParam("alarmType") String alarmType,
                                                     @FormParam("startTime") String startTime,
                                                     @FormParam("endTime") String endTime) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
-        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<PgAlarmDto>();
+        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
         try {
             pgAlarmDtoList = pgAlarmManager.getAlarmByTypeAndTime(alarmType, startTime, endTime);
             if (pgAlarmDtoList == null || pgAlarmDtoList.size() == 0)
                 msg = "报警信息不存在";
             else
+            {
                 msg = "报警信息获取成功";
+                code="200";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警信息获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
index 29ce8a4..ed0bf34 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
@@ -39,8 +39,8 @@
     public Map<String, Object> getAlarmRule(@FormParam("devType") String devType) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
-        System.out.println("devType:"+devType);
         List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<>();
         try {
             pgAlarmRuleDtoList = pgAlarmRuleManager.getAlarmRuleDto(devType);
@@ -52,6 +52,7 @@
             e.printStackTrace();
             msg = "报警阈值信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmRuleDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
index 24ab894..abef1b1 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
@@ -39,16 +39,21 @@
                                                      @FormParam("endDate") String endDate)throws Exception{
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
+
         List<PgAlarmTjDto> pgAlarmTjDtoList=null;
         try{
             pgAlarmTjDtoList=pgAlarmTjManager.getAlarmTjResultByType(startDate,endDate);
             msg="获取成功";
+            code="200";
         }
         catch(Exception ex) {
             msg = "统计失败";
         }
-        resultMap.put("result",pgAlarmTjDtoList);
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
+        resultMap.put("result",pgAlarmTjDtoList);
+
         return resultMap;
     }
 
@@ -61,23 +66,27 @@
     public Map<String, Object> getAlarmByTime(@FormParam("startTime") String startTime,
                                               @FormParam("endTime") String endTime,
                                               @FormParam("statisticType") String statisticType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code = "0";
 
-        List<PgAlarmTjDto> pgAlarmTjDtoList = new ArrayList<PgAlarmTjDto>();
+        List<PgAlarmTjDto> pgAlarmTjDtoList = new ArrayList<>();
         try {
             pgAlarmTjDtoList = pgAlarmTjManager.getAlarmByTime(startTime, endTime, statisticType);
             if(pgAlarmTjDtoList==null)
                 msg="报警统计信息获取失败";
-            else
-                msg="报警统计信息获取成功";
+            else {
+                msg = "报警统计信息获取成功";
+                code="200";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警统计信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmTjDtoList);
         return resultMap;
     }
 
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
index 28bc811..b6278a9 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
@@ -30,7 +30,6 @@
     @Resource
     private PgAlarmTypeManager pgAlarmTypeManager;
 
-
     /**
      * 获取报警类型
      */
@@ -38,19 +37,24 @@
     @Path("getAlarmType")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getAlarmTypeList()throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
-        List<PgAlarmTypeDto> pgAlarmTypeDtoList=new ArrayList<PgAlarmTypeDto>();
+        String code="";
+
+        List<PgAlarmTypeDto> pgAlarmTypeDtoList=new ArrayList<>();
         try {
             pgAlarmTypeDtoList = pgAlarmTypeManager.getAllAlarmTypeDto();
             if(pgAlarmTypeDtoList.size()==0)
                 msg="没有报警类型信息";
-            else
-                msg="报警类型信息获取成功";
+            else {
+                code="200";
+                msg = "报警类型信息获取成功";
+            }
         }catch(Exception e){
             e.printStackTrace();
             msg="报警类型信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAlarmTypeDtoList);
         return resultMap;
@@ -66,6 +70,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
@@ -83,6 +88,7 @@
                 logger.info("成功保存");
                 result = "true";
                 msg = "保存成功";
+                code="200";
             }
         } catch (Exception e) {
             result = "false";
@@ -90,6 +96,7 @@
             e.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -106,6 +113,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try{
             if(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
@@ -119,6 +127,7 @@
                 pgAlarmTypeManager.save(pgAlarmType);
                 result = "true";
                 msg = "编辑成功";
+                code="200";
             }
         }
         catch(Exception e)
@@ -128,6 +137,7 @@
             e.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("result",result);
         resultMap.put("msg",msg);
 
@@ -146,6 +156,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
         String result="false";
+        String code="0";
 
         try {
             PgAlarmType pgAlarmType=pgAlarmTypeManager.get(Long.valueOf(id));
@@ -157,6 +168,7 @@
             {
                 pgAlarmType.setActive(0);
                 pgAlarmTypeManager.save(pgAlarmType);
+                code="200";
                 msg="报警类型删除成功";
                 result="true";
             }
@@ -165,6 +177,7 @@
             msg="报警类型删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
index 4533e1a..85940bb 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
@@ -33,12 +33,15 @@
                                                  @FormParam("inSpectionPlace") String inSpectionPlace){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
         List<PgAssetPlanDto> pgAssetPlanDtoList=new ArrayList<>();
         try{
             pgAssetPlanDtoList=pgAssetPlanManager.getPgAssetPlanDtoList(startDay,endDay,inSpectionPlace);
-            if(pgAssetPlanDtoList!=null&&pgAssetPlanDtoList.size()!=0)
-                msg="巡检信息获取成功";
+            if(pgAssetPlanDtoList!=null&&pgAssetPlanDtoList.size()!=0) {
+                code="200";
+                msg = "巡检信息获取成功";
+            }
             else
                 msg="不存在巡检信息";
         }
@@ -47,6 +50,7 @@
             msg="巡检信息获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAssetPlanDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
index 47ef9d1..5cbdfcb 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
@@ -30,12 +30,15 @@
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
         String result="";
+        String code="0";
 
         List<PgAssetPlanStatic> pgAssetPlanStaticList = null;
         try{
             pgAssetPlanStaticList=pgAssetPlanManager.getPgAssetPlanStaticLisByTime(startTime,endTime,staticType);
-            if(pgAssetPlanStaticList!=null&&pgAssetPlanStaticList.size()!=0)
-                msg="巡检统计信息获取成功";
+            if(pgAssetPlanStaticList!=null&&pgAssetPlanStaticList.size()!=0) {
+                code = "200";
+                msg = "巡检统计信息获取成功";
+            }
             else
                 msg="统计信息获取失败";
         }
@@ -44,6 +47,7 @@
             msg="统计失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAssetPlanStaticList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
index 26f5d6a..503bfe3 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
@@ -40,6 +40,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="";
 
         try{
             PgAuthority pgAuthority=new PgAuthority();
@@ -50,6 +51,7 @@
 
             pgAuthorityManager.save(pgAuthority);
             msg="用户权限保存成功";
+            code="200";
             result="true";
         }
         catch(Exception e) {
@@ -57,6 +59,7 @@
             msg = "新增权限失败";
             result = "false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -65,22 +68,25 @@
 
     /*
        *编辑角权限信息
-        */
+    */
     @POST
     @Path("editAuthority")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> editAuthority(@FormParam("id") String id,
                                        @FormParam("authority") String authority,
                                        @FormParam("concent") String concent) throws Exception{
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
+
         try {
             PgAuthority pgAuthority=pgAuthorityManager.get(Long.valueOf(id));
             pgAuthority.setAuthority(authority);
             pgAuthority.setConcent(concent);
 
             pgAuthorityManager.save(pgAuthority);
+            code="200";
             msg="权限保存成功";
             result="true";
         }
@@ -90,7 +96,7 @@
             msg="权限编辑失败";
             result="false";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -105,9 +111,10 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> deleteAuthority(@FormParam("id") String id)throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
-        String result="false";
+        String result="";
+        String code="0";
 
         try {
             PgAuthority pgAuthority= pgAuthorityManager.get(Long.valueOf(id));
@@ -119,6 +126,7 @@
             {
                 pgAuthority.setActive(0);
                 pgAuthorityManager.save(pgAuthority);
+                code="200";
                 msg="删除权限成功";
                 result="true";
             }
@@ -127,37 +135,40 @@
             msg="删除权限失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
     }
 
     /*
-* 获取权限信息
- */
+    * 获取权限信息
+    */
     @POST
     @Path("getAuthorityList")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> getAuthorityList() {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgAuthorityDto> pgAuthorityDtoList = new ArrayList<PgAuthorityDto>();
         try {
             pgAuthorityDtoList = pgAuthorityManager.getAuthorityList();
             if (pgAuthorityDtoList == null)
                 msg = "不存在权限信息";
-            else
+            else {
+                code = "200";
                 msg = "权限信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "权限信息获取是失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAuthorityDtoList);
         return resultMap;
     }
 
 
-
-
 }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
index a9ef521..a74ecc7 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
@@ -45,6 +45,7 @@
                                                @FormParam("endDate") String endDate)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgHistoryDataDto> pgHistoryDataDtoList=new ArrayList<>();
 
         try {
@@ -55,13 +56,16 @@
                 pgHistoryDataDtoList=pgCh4Manager.getAllCH4Data(pgDevice,startDate,endDate);
                 if(pgHistoryDataDtoList==null)
                     msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+                else {
+                    code = "200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgHistoryDataDtoList);
         return resultMap;
@@ -75,8 +79,9 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getNewestCh4InfoByDev(@FormParam("assetCode") String assetCode)throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
+        String code="0";
         PgCh4Dto pgCh4Dto=new PgCh4Dto(null);
 
         try {
@@ -87,13 +92,17 @@
                 pgCh4Dto=pgCh4Manager.getNewestCH4Data(pgDevice);
                 if(pgCh4Dto==null)
                     msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgCh4Dto);
         return resultMap;
@@ -111,6 +120,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
@@ -127,6 +137,7 @@
                 pgCh4.setPgDeviceId(pgDevice);
 
                 pgCh4Manager.save(pgCh4);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -135,7 +146,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
index a7eac39..dfc8ca5 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
@@ -43,23 +43,27 @@
                                                       @FormParam("endDate") String endDate)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgHistoryDataDto> pgHistoryDataDtoList=new ArrayList<>();
 
         try {
             PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
                 msg="设备不存在";
-            else{
-                pgHistoryDataDtoList=pgCoManager.getAllCoData(pgDevice, startDate, endDate);
-                if(pgHistoryDataDtoList==null)
-                    msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+            else {
+                pgHistoryDataDtoList = pgCoManager.getAllCoData(pgDevice, startDate, endDate);
+                if (pgHistoryDataDtoList == null)
+                    msg = "没有满足要求的数据";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgHistoryDataDtoList);
         return resultMap;
@@ -75,6 +79,7 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         PgCoDto pgCoDto=new PgCoDto(null);
 
         try {
@@ -85,13 +90,16 @@
                 pgCoDto=pgCoManager.getNewestCoData(pgDevice);
                 if(pgCoDto==null)
                     msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgCoDto);
         return resultMap;
@@ -110,6 +118,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         try {
@@ -126,6 +135,7 @@
 
                 pgCoManager.save(pgCo);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
         } catch (Exception e) {
@@ -133,7 +143,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
index b4b826e..9af98a3 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
@@ -60,6 +60,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         try {
 
@@ -80,8 +81,8 @@
                 pgConstruction.setPgConstructionTypeId(pgConstructionType.getId());
                 pgConstruction.setActive(1);
                 pgConstruction.setParName(parName);
-                logger.info("保存成功");
                 pgConstructionManager.save(pgConstruction);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -90,6 +91,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("success", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -116,6 +118,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
@@ -140,6 +143,7 @@
                 pgConstruction.setParName(parName);
 
                 pgConstructionManager.save(pgConstruction);
+                code="200";
                 result = "true";
                 msg = "编辑成功";
             }
@@ -150,7 +154,7 @@
             e.printStackTrace();
 
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -167,6 +171,8 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
+
         try {
             PgConstruction pgConstruction = pgConstructionManager.get(Long.valueOf(id));
             if (pgConstruction == null)
@@ -177,6 +183,7 @@
             {
                 pgConstruction.setActive(0);
                 pgConstructionManager.save(pgConstruction);
+                code="200";
                 result = "true";
                 msg = "成功删除信息";
             }
@@ -185,6 +192,7 @@
             result = "false";
             msg = "删除失败";
         }
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -204,9 +212,11 @@
                                                   @FormParam("rows") int rows)throws Exception{
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
         List<PgConstructionDto> pgConstructionDtoList=new ArrayList<>();
         try{
             pgConstructionDtoList=pgConstructionManager.getPgContructionDto(cs_name,cs_type,startTime,endTime,page,rows);
+            code="200";
             msg="信息获取成功";
         }
         catch(Exception e)
@@ -214,6 +224,7 @@
             e.printStackTrace();
             msg="查询失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
 
@@ -231,18 +242,22 @@
                                                               @FormParam("statisticType") String statisticType) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgConstructionStiatistic> pgConstructionStiatisticList=new ArrayList<>();
         try {
             pgConstructionStiatisticList = pgConstructionManager.getConstructionByTimeAndStatus(startTime, endTime, statisticType);
             if(pgConstructionStiatisticList==null)
                 msg="施工统计信息获取失败";
-            else
-                msg="施工统计信息获取成功";
+            else {
+                code="200";
+                msg = "施工统计信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "施工统计信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgConstructionStiatisticList);
         return resultMap;
@@ -257,6 +272,7 @@
     public Map<String, Object> getConstructionByType(@FormParam("statisticType") String statisticType){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
         List<PgConstructionStiatistic> pgConstructionStiatisticList=new ArrayList<>();
 
         try{
@@ -268,6 +284,7 @@
                 resultMap.put("result",null);
             }
             else {
+                code="200";
                 msg = "统计信息获取成功";
                 resultMap.put("result", pgConstructionStiatisticList);
             }
@@ -278,6 +295,7 @@
             msg="统计失败";
             resultMap.put("result",null);
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         return resultMap;
     }
@@ -291,9 +309,11 @@
     public Map<String, Object> getConstructionToday() throws Exception{
         Map<String,Object> resultMap=new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgConstructionDto> pgConstructionDtoList=new ArrayList<PgConstructionDto>();
         try {
             pgConstructionDtoList = pgConstructionManager.getConstructionToday();
+            code="200";
             msg = "当天施工信息获取成功";
         }
         catch(Exception e)
@@ -301,7 +321,7 @@
             e.printStackTrace();
             msg="获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
         return resultMap;
@@ -316,6 +336,7 @@
     public Map<String, Object> getConstructionDev(@FormParam("id") String id) throws Exception{
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
         List<PgDeviceDto> pgDeviceDtoList =new ArrayList<>();
         try{
@@ -325,14 +346,17 @@
 
             if(pgDeviceDtoList==null)
                 msg="信息获取失败";
-            else
-                msg="信息获取成功";
+            else {
+                code="200";
+                msg = "信息获取成功";
+            }
         }
         catch(Exception e)
         {
             e.printStackTrace();
-            msg="设备信息获取成功";
+            msg="信息获取是被";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgDeviceDtoList);
 
@@ -346,17 +370,21 @@
     @Path("getConstruction")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getConstruction() throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
-        List<PgConstructionDto> pgConstructionDtoList=new ArrayList<PgConstructionDto>();
+        String code="0";
+
+        List<PgConstructionDto> pgConstructionDtoList=new ArrayList<>();
 
         try{
             pgConstructionDtoList=pgConstructionManager.getPgConstructionList();
             if(pgConstructionDtoList==null||pgConstructionDtoList.size()==0)
                 msg="不存在施工记录";
-            else
-                msg="施工信息获取成功";
+            else {
+                code = "200";
+                msg = "施工信息获取成功";
+            }
         }
         catch(Exception e)
         {
@@ -364,6 +392,7 @@
             msg="施工信息获取失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java
index fd3d53e..2019502 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java
@@ -39,12 +39,12 @@
         try {
             pgConstructionTypeDtoList = pgConstructionTypeManager.getAllConstructionTypeDto();
             if (pgConstructionTypeDtoList.size() == 0)
-                msg = "没有项目类型信息";
+                msg = "获取失败";
             else
-                msg = "项目类型获取成功";
+                msg = "获取成功";
         } catch (Exception e) {
             e.printStackTrace();
-            msg = "项目类型信息获取失败";
+            msg = "获取失败";
         }
         resultMap.put("msg", msg);
         resultMap.put("result", pgConstructionTypeDtoList);
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
index 90d001c..037a399 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
@@ -51,6 +51,7 @@
 
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if (StringUtils.isBlank(construct_doc)||StringUtils.isBlank(doc_name))
@@ -65,6 +66,7 @@
             pgCsDocument.setActive(1);
             pgCsDocumentManager.save(pgCsDocument);
 
+            code="200";
             result = "true";
             msg = "保存成功";
 
@@ -74,6 +76,7 @@
             ex.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("success", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -90,6 +93,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             PgCsDocument pgCsDocument = pgCsDocumentManager.get(Long.valueOf(id));
@@ -103,6 +107,7 @@
 
                 pgCsDocumentManager.save(pgCsDocument);
 
+                code="200";
                 result = "true";
                 msg = "编辑成功";
             }
@@ -112,6 +117,7 @@
             msg = "编辑失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -125,9 +131,9 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
         String result="";
+        String code="0";
 
         try{
-
             PgCsDocument pgCsDocument = pgCsDocumentManager.get(Long.valueOf(id));
             if(pgCsDocument==null)
             {
@@ -137,6 +143,7 @@
             else{
                 pgCsDocument.setActive(0);
                 pgCsDocumentManager.save(pgCsDocument);
+                code="200";
                 result="true";
                 msg="删除成功";
             }
@@ -147,7 +154,7 @@
             msg="预案删除失败";
             result="false";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -168,18 +175,21 @@
 
         String msg="";
         String result="";
+        String code="0";
 
         try {
             pgCsDocumentDtoList = pgCsDocumentManager.getAllDocData(cs_name);
-            if (pgCsDocumentDtoList != null)
+            if (pgCsDocumentDtoList != null) {
+                code="200";
                 msg = "获取数据成功";
+            }
             else
                 msg = "没有满足条件的数据";
         }catch (Exception e){
             e.printStackTrace();
             msg = "获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgCsDocumentDtoList);
         return resultMap;
@@ -192,20 +202,22 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
 
         String msg = "";
+        String code="0";
         ResponseEntity<byte[]> path = null;
         try {
             PgCsDocument pgCsDocument = pgCsDocumentManager.get(Long.valueOf(id));
             path = pgCsDocumentManager.downloadFile(pgCsDocument);
             if (path == null)
                 msg = "不存在该文档";
-            else
+            else {
+                code = "200";
                 msg = "下载成功";
-
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "下载失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", path.getBody());
         resultMap.put("msg", msg);
         return resultMap;

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 25ded8a..283d7ab 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,20 +7,56 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" 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/construction/manager/PgCsDocumentManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/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/manager/PgAlarmManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/~$说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/~$说明20191207.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.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$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/接口说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明20191207.docx" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
@@ -51,7 +87,7 @@
         <counts>
           <entry key="class" value="4" />
           <entry key="iml" value="2" />
-          <entry key="java" value="707" />
+          <entry key="java" value="820" />
           <entry key="properties" value="14" />
           <entry key="xml" value="7" />
         </counts>
@@ -60,7 +96,7 @@
         <counts>
           <entry key="CLASS" value="4" />
           <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="707" />
+          <entry key="JAVA" value="820" />
           <entry key="Properties" value="14" />
           <entry key="XML" value="7" />
         </counts>
@@ -68,32 +104,32 @@
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
           <entry key="dummy" value="38" />
-          <entry key="java" value="30161" />
+          <entry key="java" value="40859" />
           <entry key="properties" value="100" />
-          <entry key="txt" value="176" />
+          <entry key="txt" value="186" />
           <entry key="xml" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="30161" />
-          <entry key="PLAIN_TEXT" value="214" />
+          <entry key="JAVA" value="40859" />
+          <entry key="PLAIN_TEXT" value="224" />
           <entry key="Properties" value="100" />
           <entry key="XML" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="48" />
+          <entry key="project.closed" value="51" />
           <entry key="project.open.time.1" value="5" />
           <entry key="project.open.time.12" value="2" />
           <entry key="project.open.time.13" value="1" />
           <entry key="project.open.time.15" value="1" />
           <entry key="project.open.time.16" value="1" />
           <entry key="project.open.time.17" value="1" />
-          <entry key="project.open.time.2" value="1" />
+          <entry key="project.open.time.2" value="2" />
           <entry key="project.open.time.20" value="1" />
-          <entry key="project.open.time.23" value="1" />
+          <entry key="project.open.time.23" value="2" />
           <entry key="project.open.time.24" value="2" />
           <entry key="project.open.time.251" value="1" />
           <entry key="project.open.time.27" value="2" />
@@ -106,8 +142,8 @@
           <entry key="project.open.time.36" value="1" />
           <entry key="project.open.time.37" value="1" />
           <entry key="project.open.time.39" value="2" />
-          <entry key="project.open.time.4" value="2" />
-          <entry key="project.open.time.40" value="1" />
+          <entry key="project.open.time.4" value="3" />
+          <entry key="project.open.time.40" value="2" />
           <entry key="project.open.time.41" value="2" />
           <entry key="project.open.time.42" value="2" />
           <entry key="project.open.time.43" value="2" />
@@ -122,23 +158,25 @@
           <entry key="project.open.time.6" value="3" />
           <entry key="project.open.time.63" value="2" />
           <entry key="project.open.time.64" value="1" />
+          <entry key="project.open.time.66" value="1" />
           <entry key="project.open.time.71" value="2" />
+          <entry key="project.open.time.74" value="1" />
           <entry key="project.open.time.76" value="1" />
           <entry key="project.open.time.8" value="2" />
           <entry key="project.open.time.9" value="1" />
           <entry key="project.open.time.97" value="1" />
-          <entry key="project.opened" value="78" />
+          <entry key="project.opened" value="84" />
         </counts>
       </usages-collector>
     </session>
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+            <state relative-caret-position="396">
+              <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
               <folding>
                 <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
                 <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -147,73 +185,6 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <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="99">
-              <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-              <folding>
-                <element signature="imports" expanded="true" />
-                <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-1170">
-              <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state>
-              <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
-              <folding>
-                <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-                <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="true">
-        <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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-              <folding>
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-                <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>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <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="352">
-              <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -225,18 +196,9 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>inCriteria</find>
-      <find>getPgPlanResulList</find>
-      <find>getPileAcuListByPileAcuStr</find>
-      <find>distinct</find>
-      <find>order</find>
-      <find>canPlanLine</find>
-      <find>isExistLine</find>
-      <find>getPlanResult</find>
       <find>pgPipeLine</find>
       <find>getPipeLineBylineName</find>
       <find>StringU</find>
-      <find>getAllAlarm</find>
       <find>getAlarmList</find>
       <find>getPgInPersonListByDay</find>
       <find>getDayInPgStatistic</find>
@@ -254,7 +216,16 @@
       <find>getPgContructionByNameOrType</find>
       <find>&quot;&quot;,&quot;&quot;,</find>
       <find>getPgContructionDtoByNameOrType</find>
+      <find>addConstruction</find>
+      <find>getPgLineAcuHole</find>
+      <find>getPlanResult</find>
       <find>getConstruction</find>
+      <find>addPipeLine</find>
+      <find>未找到入廊数据</find>
+      <find>getCurrentHoleByAcu</find>
+      <find>getAllAlarm</find>
+      <find>getPgDeviceDtoListByPartition</find>
+      <find>getPgDeviceByDevType</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -263,57 +234,57 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlan.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileHoleManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/planData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/PlanData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
       </list>
     </option>
   </component>
@@ -359,7 +330,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -421,53 +391,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="dto" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="manager" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -479,29 +402,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="rs" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -516,6 +416,7 @@
         </subPane>
       </pane>
       <pane id="Scope" />
+      <pane id="PackagesPane" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -710,7 +611,13 @@
       <workItem from="1574902733573" duration="1829000" />
       <workItem from="1574998240004" duration="7016000" />
       <workItem from="1575247959683" duration="6997000" />
-      <workItem from="1575704345590" duration="40473000" />
+      <workItem from="1575704345590" duration="69381000" />
+      <workItem from="1575869479666" duration="721000" />
+      <workItem from="1575947104878" duration="6101000" />
+      <workItem from="1576128264436" duration="3347000" />
+      <workItem from="1576208571543" duration="22000" />
+      <workItem from="1576227513917" duration="862000" />
+      <workItem from="1576293721220" duration="18246000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -817,11 +724,18 @@
       <option name="project" value="LOCAL" />
       <updated>1575775489149</updated>
     </task>
-    <option name="localTasksCounter" value="16" />
+    <task id="LOCAL-00016" summary="整改施工信息">
+      <created>1575791780774</created>
+      <option name="number" value="00016" />
+      <option name="presentableId" value="LOCAL-00016" />
+      <option name="project" value="LOCAL" />
+      <updated>1575791780774</updated>
+    </task>
+    <option name="localTasksCounter" value="17" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="452131000" />
+    <option name="totallyTimeSpent" value="510338000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -834,9 +748,8 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
-    <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.24205749" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2647504" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -847,7 +760,7 @@
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.3295082" />
       <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.4819672" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.65737706" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.3295082" />
@@ -939,7 +852,8 @@
     <MESSAGE value="重新设计智能规划部分" />
     <MESSAGE value="完成智能规划对接" />
     <MESSAGE value="修改报警统计" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改报警统计" />
+    <MESSAGE value="整改施工信息" />
+    <option name="LAST_COMMIT_MESSAGE" value="整改施工信息" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -951,16 +865,10 @@
           <option name="timeStamp" value="3" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java</url>
-          <line>69</line>
+          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java</url>
+          <line>40</line>
           <properties />
-          <option name="timeStamp" value="21" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java</url>
-          <line>96</line>
-          <properties />
-          <option name="timeStamp" value="38" />
+          <option name="timeStamp" value="122" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
@@ -970,394 +878,452 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <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="2068">
-          <caret line="154" column="35" selection-start-line="154" selection-start-column="35" selection-end-line="154" selection-end-column="35" />
-        </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="3300">
-          <caret line="297" column="22" selection-start-line="297" selection-start-column="22" selection-end-line="297" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/StringUtils.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
-          <caret line="13" column="48" lean-forward="true" selection-start-line="13" selection-start-column="48" selection-end-line="13" selection-end-column="48" />
+          <caret line="11" column="5" selection-start-line="11" selection-start-column="5" selection-end-line="11" selection-end-column="5" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="78" lean-forward="true" selection-start-line="78" selection-end-line="78" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="616">
-          <caret line="41" column="1" selection-start-line="41" selection-start-column="1" selection-end-line="41" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="110">
-          <caret line="12" column="23" selection-start-line="12" selection-start-column="23" selection-end-line="12" selection-end-column="23" />
+        <state relative-caret-position="516">
+          <caret line="114" column="12" selection-start-line="114" selection-start-column="12" selection-end-line="114" selection-end-column="12" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="164">
-          <caret line="56" lean-forward="true" selection-start-line="56" selection-end-line="56" />
+        <state relative-caret-position="418">
+          <caret line="33" column="44" selection-start-line="33" selection-start-column="44" selection-end-line="33" selection-end-column="44" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="258">
-          <caret line="27" column="12" lean-forward="true" selection-start-line="27" selection-start-column="12" selection-end-line="27" selection-end-column="12" />
+        <state relative-caret-position="132">
+          <caret line="11" column="20" lean-forward="true" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="20" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.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="-12">
-          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        <state relative-caret-position="516">
+          <caret line="142" column="54" selection-start-line="142" selection-start-column="54" selection-end-line="142" selection-end-column="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="858">
-          <caret line="55" column="27" lean-forward="true" selection-start-line="55" selection-start-column="27" selection-end-line="55" selection-end-column="27" />
+        <state relative-caret-position="66">
+          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="58">
+          <caret line="18" column="28" selection-start-line="18" selection-start-column="19" selection-end-line="18" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="305">
+          <caret line="24" column="31" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="714">
+          <caret line="58" column="5" lean-forward="true" selection-start-line="58" selection-start-column="5" selection-end-line="58" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="924">
+          <caret line="134" column="92" selection-start-line="134" selection-start-column="92" selection-end-line="134" selection-end-column="92" />
+          <folding>
+            <element signature="method#linkDevice#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkPartitionCamera#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkReservePlan#0;class#PgAlarmLinkRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1066">
+          <caret line="90" lean-forward="true" selection-start-line="90" selection-end-line="90" />
+          <folding>
+            <element signature="method#getTjResultByAlarmType#0;class#PgAlarmTjRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="946">
+          <caret line="148" column="11" lean-forward="true" selection-start-line="148" selection-start-column="11" selection-end-line="148" selection-end-column="11" />
+          <folding>
+            <element signature="method#getAlarmTypeList#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#addAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#editAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#deleteAlarmType#0;class#PgAlarmTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="208">
+          <caret line="46" column="23" lean-forward="true" selection-start-line="46" selection-start-column="23" selection-end-line="46" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="113" column="9" lean-forward="true" selection-start-line="113" selection-start-column="9" selection-end-line="113" selection-end-column="9" />
+          <folding>
+            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
+            <element signature="method#getNewestCh4InfoByDev#0;class#PgCh4Rs#0" />
+            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="145" column="6" lean-forward="true" selection-start-line="145" selection-start-column="6" selection-end-line="145" selection-end-column="6" />
+          <folding>
+            <element signature="method#addAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#editAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#deleteAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#getAuthorityList#0;class#PgAuthorityRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="58" column="1" lean-forward="true" selection-start-line="58" selection-start-column="1" selection-end-line="58" selection-end-column="1" />
+          <folding>
+            <element signature="method#getPgAssetPlanList#0;class#PgAssetPlanRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="370">
+          <caret line="371" column="66" selection-start-line="371" selection-start-column="66" selection-end-line="371" selection-end-column="66" />
+          <folding>
+            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#searchConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionDev#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="139" column="13" lean-forward="true" selection-start-line="139" selection-start-column="13" selection-end-line="139" selection-end-column="13" />
+          <folding>
+            <element signature="method#getCoInfoByDevAndDate#0;class#PgCoRs#0" />
+            <element signature="method#getNewestCoInfoByDev#0;class#PgCoRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="540">
+          <caret line="223" column="5" lean-forward="true" selection-start-line="223" selection-start-column="5" selection-end-line="223" selection-end-column="5" />
+          <folding>
+            <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="682">
+          <caret line="100" lean-forward="true" selection-start-line="100" selection-end-line="100" />
+          <folding>
+            <element signature="method#getDeviceTpeyList#0;class#PgDeviceTypeRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="377">
+          <caret line="225" column="35" selection-start-line="225" selection-start-column="35" selection-end-line="225" selection-end-column="35" />
+          <folding>
+            <element signature="method#addEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#addEquipment#1;class#PgEquipmentRs#0" />
+            <element signature="method#getEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#deleteEquipment#0;class#PgEquipmentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="406">
+          <caret line="109" lean-forward="true" selection-start-line="109" selection-end-line="109" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="154">
+          <caret line="28" column="19" selection-start-line="28" selection-start-column="19" selection-end-line="28" selection-end-column="19" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="748">
-          <caret line="49" column="5" lean-forward="true" selection-start-line="49" selection-start-column="5" selection-end-line="49" selection-end-column="5" />
+        <state relative-caret-position="296">
+          <caret line="161" column="35" selection-start-line="161" selection-start-column="35" selection-end-line="161" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="384">
+          <caret line="99" column="5" lean-forward="true" selection-start-line="99" selection-start-column="5" selection-end-line="99" selection-end-column="5" />
+        </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="362">
+          <caret line="340" column="35" selection-start-line="340" selection-start-column="35" selection-end-line="340" selection-end-column="35" />
+          <folding>
+            <element signature="method#addInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPersonInPg#0;class#PgInPgPersonRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-606">
+          <caret line="76" column="20" lean-forward="true" selection-start-line="76" selection-start-column="20" selection-end-line="76" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="65" column="35" selection-start-line="65" selection-start-column="35" selection-end-line="65" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="101" column="35" selection-start-line="101" selection-start-column="35" selection-end-line="101" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="84" column="35" selection-start-line="84" selection-start-column="35" selection-end-line="84" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="59" lean-forward="true" selection-start-line="59" selection-end-line="59" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="60" column="1" lean-forward="true" selection-start-line="60" selection-start-column="1" selection-end-line="60" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="145" column="35" selection-start-line="145" selection-start-column="35" selection-end-line="145" selection-end-column="35" />
+        </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="274">
+          <caret line="350" column="35" selection-start-line="350" selection-start-column="35" selection-end-line="350" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="121" column="39" selection-start-line="121" selection-start-column="39" selection-end-line="121" selection-end-column="39" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="28" column="8" lean-forward="true" selection-start-line="28" selection-start-column="8" selection-end-line="28" selection-end-column="8" />
+        <state relative-caret-position="340">
+          <caret line="103" selection-start-line="103" selection-end-line="103" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="226" column="35" selection-start-line="226" selection-start-column="35" selection-end-line="226" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="203" column="35" selection-start-line="203" selection-start-column="35" selection-end-line="203" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="241" column="35" selection-start-line="241" selection-start-column="35" selection-end-line="241" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="225" column="1" lean-forward="true" selection-start-line="225" selection-start-column="1" selection-end-line="225" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="176" column="5" lean-forward="true" selection-start-line="176" selection-start-column="5" selection-end-line="176" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="178" column="35" lean-forward="true" selection-start-line="178" selection-start-column="35" selection-end-line="178" selection-end-column="35" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="516">
-          <caret line="94" column="53" selection-start-line="94" selection-start-column="53" selection-end-line="94" selection-end-column="53" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="814">
-          <caret line="52" column="9" lean-forward="true" selection-start-line="52" selection-start-column="9" selection-end-line="52" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="182">
-          <caret line="58" column="12" lean-forward="true" selection-start-line="58" selection-start-column="12" selection-end-line="58" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="34" lean-forward="true" selection-start-line="34" selection-end-line="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="32" lean-forward="true" selection-start-line="32" selection-end-line="32" />
-          <folding>
-            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
-            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="185">
-          <caret line="63" column="13" selection-start-line="63" selection-start-column="13" selection-end-line="63" selection-end-column="13" />
-          <folding>
-            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
-            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
-            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="e#6319#6324#0" />
-            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
-          </folding>
+          <caret line="240" lean-forward="true" selection-start-line="240" selection-end-line="240" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
-          <caret line="58" column="28" lean-forward="true" selection-start-line="58" selection-start-column="28" selection-end-line="58" selection-end-column="28" />
-          <folding>
-            <element signature="method#addTempHumData#0;class#PgTempHumRs#0" />
-          </folding>
+        <state relative-caret-position="340">
+          <caret line="148" column="34" selection-start-line="148" selection-start-column="34" selection-end-line="148" selection-end-column="34" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
+        <state relative-caret-position="458">
+          <caret line="99" column="35" selection-start-line="99" selection-start-column="35" selection-end-line="99" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+        <state relative-caret-position="384">
+          <caret line="145" column="32" lean-forward="true" selection-start-line="145" selection-start-column="32" selection-end-line="145" selection-end-column="32" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="414">
-          <caret line="22" column="46" lean-forward="true" selection-start-line="22" selection-start-column="46" selection-end-line="22" selection-end-column="46" />
-        </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="396">
-          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" column="83" selection-start-line="11" selection-start-column="83" selection-end-line="11" selection-end-column="83" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="26">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
-          <folding>
-            <element signature="method#getPgInPgStatusByPerson#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNumByName#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNum#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPersonListByDay#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPgStatusByPgInPgPerson#0;class#PgInPgStatusManager#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="44">
-          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-12">
-          <caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="87" lean-forward="true" selection-start-line="87" selection-end-line="87" />
-          <folding>
-            <element signature="method#getConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#addConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#deleteConstructionType#0;class#PgConstructionTypeRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
-          <folding>
-            <element signature="method#getConstructionTypeByType#0;class#PgConstructionTypeManager#0" />
-            <element signature="method#getAllConstructionTypeDto#0;class#PgConstructionTypeManager#0" />
-          </folding>
-        </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="145">
-          <caret line="258" column="9" lean-forward="true" selection-start-line="258" selection-start-column="9" selection-end-line="258" selection-end-column="9" />
-          <folding>
-            <element signature="method#getMonthInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayInPgStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgOverViewRs#0" />
-            <element signature="method#getAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getMonthAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayAlarmStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgOverViewRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="103">
-          <caret line="105" column="50" lean-forward="true" selection-start-line="105" selection-start-column="50" selection-end-line="105" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateBasicDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="99">
-          <caret line="125" selection-start-line="125" selection-end-line="125" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="190">
-          <caret line="24" column="35" lean-forward="true" selection-start-line="24" selection-start-column="35" selection-end-line="24" selection-end-column="35" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="436">
-          <caret line="24" lean-forward="true" selection-start-line="24" selection-end-line="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" lean-forward="true" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="300">
-          <caret line="34" column="31" lean-forward="true" selection-start-line="34" selection-start-column="31" selection-end-line="34" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="42" column="13" lean-forward="true" selection-start-line="42" selection-start-column="13" selection-end-line="42" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="120" column="72" lean-forward="true" selection-start-line="120" selection-start-column="72" selection-end-line="120" selection-end-column="72" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="293">
-          <caret line="58" column="73" lean-forward="true" selection-start-line="58" selection-start-column="73" selection-end-line="58" selection-end-column="73" />
-          <folding>
-            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
-            <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
-          </folding>
-        </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="307">
-          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
+        <state relative-caret-position="758">
+          <caret line="130" column="5" lean-forward="true" selection-start-line="130" selection-start-column="5" selection-end-line="130" selection-end-column="5" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1170">
-          <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
+        <state relative-caret-position="494">
+          <caret line="86" column="62" lean-forward="true" selection-start-line="86" selection-start-column="62" selection-end-line="86" selection-end-column="62" />
           <folding>
-            <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-            <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+            <element signature="method#getAllDevice#0;class#PgDeviceManager#0" />
+            <element signature="method#getAllDev#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="195" column="28" lean-forward="true" selection-start-line="195" selection-start-column="28" selection-end-line="195" selection-end-column="28" />
+        <state relative-caret-position="166">
+          <caret line="174" column="13" lean-forward="true" selection-start-line="174" selection-start-column="13" selection-end-line="174" selection-end-column="13" />
           <folding>
-            <element signature="method#getAlarmByTypeAndTime#0;class#PgAlarmManager#0" />
-            <element signature="method#getAlarmNum#0;class#PgAlarmManager#0" />
             <element signature="method#getDayAlarmStatistic#0;class#PgAlarmManager#0" />
+            <element signature="method#getAlarmList#0;class#PgAlarmManager#0" />
             <element signature="method#createDTO#0;class#PgAlarmManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="364">
+          <caret line="46" column="56" lean-forward="true" selection-start-line="46" selection-start-column="56" selection-end-line="46" selection-end-column="56" />
+          <folding>
+            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
+            <element signature="method#getPgDev#0;class#PgDeviceRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
+            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+        <state relative-caret-position="396">
+          <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
           <folding>
             <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
             <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -1365,52 +1331,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="239">
-          <caret line="21" column="33" lean-forward="true" selection-start-line="21" selection-start-column="33" selection-end-line="21" selection-end-column="33" />
-        </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="352">
-          <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-        </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="99">
-          <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-          </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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-          <folding>
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-            <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>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
index c436c93..e913155 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
@@ -132,7 +132,10 @@
             this.setAlarmType("");
         else
             this.setAlarmType(pgAlarm.getAlarmTypeId().getAlarmType());
-        this.setAlarmValue(pgAlarm.getAlarmValue());
+        if(pgAlarm.getAlarmValue()==null)
+            this.setAlarmValue("");
+        else
+            this.setAlarmValue(pgAlarm.getAlarmValue());
         if (pgAlarm.getAlarmDate() != null)
             this.setAlarmDate(sdf.format(pgAlarm.getAlarmDate()));
         else
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
index a43965c..565cb41 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -159,11 +159,21 @@
     }
 
     //获取历史报警消息列表
-    public List<PgAlarmDto> getAllAlarm(String alarmType,String startDay,String endDay,String isNew,int page,int rows) {
-        try {
+    public  Map<String, Object> getAllAlarm(String alarmType,String partition,String startDay,String endDay,String isNew,int page,int rows) {
 
+        Map<String, Object> resultMap = new HashMap<>();
+        String msg="";
+
+        try {
             Criteria criteria = createCriteria(PgAlarm.class);
 
+            if (StringUtils.isNotBlank(partition)) {
+                DetachedCriteria inCriteria = DetachedCriteria.forClass(PgDevice.class);
+                inCriteria.add(Restrictions.eq("partition", partition));
+                inCriteria.setProjection(Property.forName("id"));
+                criteria.add(Property.forName("alarmDevId").in(inCriteria));
+            }
+
             if (StringUtils.isNotBlank(alarmType)&&!alarmType.contains("全部")&&pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
                 criteria.add(Restrictions.eq("alarmTypeId", pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)));
 
@@ -190,8 +200,16 @@
             for (PgAlarm pgAlarm : pgAlarmList) {
                 pgAlarmDtoList.add(new PgAlarmDto(pgAlarm));
             }
-
-            return pgAlarmDtoList;
+            if(pgAlarmDtoList==null||pgAlarmDtoList.size()==0) {
+                resultMap.put("msg", "没有报警信息");
+                resultMap.put("code","0");
+            }else {
+                resultMap.put("code","200");
+                resultMap.put("msg", "报警信息获取成功");
+            }
+            resultMap.put("count",pg.getTotalCount());
+            resultMap.put("result",pgAlarmDtoList);
+            return resultMap;
         }
         catch(Exception ex){
             ex.printStackTrace();
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index 7547560..654f49e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -24,11 +24,11 @@
 
         Criteria criteria = createCriteria(PgDevice.class);
 
-        if(road!=null)
+        if(StringUtils.isNotBlank(road))
             criteria.add(Restrictions.eq("road",road));
-        if(partition!=null)
+        if(StringUtils.isNotBlank(partition))
             criteria.add(Restrictions.eq("partition",partition));
-        if(devType!=null)
+        if(StringUtils.isNotBlank(devType))
             criteria.add(Restrictions.eq("devType",devType));
 
         criteria.add(Restrictions.eq("active", 1));
@@ -43,6 +43,29 @@
         return pgDeviceDtoList;
     }
 
+    public List<PgDeviceDto> getAllDev(String road,String partition,String devType) {
+
+        Criteria criteria = createCriteria(PgDevice.class);
+
+        if(StringUtils.isNotBlank(road))
+            criteria.add(Restrictions.eq("road",road));
+        if(StringUtils.isNotBlank(partition))
+            criteria.add(Restrictions.eq("partition",partition));
+        if(StringUtils.isNotBlank(devType))
+            criteria.add(Restrictions.like("devType","%"+devType+"%"));
+
+        criteria.add(Restrictions.eq("active", 1));
+        criteria.addOrder(Order.desc("id"));
+        List<PgDevice> pgDeviceList = criteria.list();
+
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
+        for (PgDevice pgDevice : pgDeviceList) {
+            pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
+        }
+
+        return pgDeviceDtoList;
+    }
+
     //根据名字获取当前设备
     public PgDevice getDeviceByAssetCode(String assetCode) {
         Criteria criteria=createCriteria(PgDevice.class);
@@ -56,9 +79,9 @@
     }
 
     //根据类型获取设备列表
-    public List<PgDeviceDto> getDeviceByDevTypee(String devType) {
+    public List<PgDeviceDto> getDeviceByDevType(String devType) {
         Criteria criteria=createCriteria(PgDevice.class);
-        criteria.add(Restrictions.eq("devType",devType));
+        criteria.add(Restrictions.like("devType","%"+devType+"%"));
 
         List<PgDevice> pgDeviceList=criteria.list();
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
@@ -106,7 +129,7 @@
         criteria.add(Restrictions.eq("partition",partition));
 
         List<PgDevice> pgDeviceList=criteria.list();
-        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<PgDeviceDto>();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
 
         for (PgDevice pgDevice : pgDeviceList) {
             pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
index 3a3bccd..595730e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
@@ -1,10 +1,13 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.devTable.domain.PgAlarmType;
 import com.casic.PgInterface.devTable.domain.PgPartition;
 import com.casic.PgInterface.devTable.domain.PgRoad;
 import com.casic.PgInterface.devTable.domain.PipeGallery;
 import com.casic.PgInterface.devTable.dto.PgPartitionDto;
+import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
@@ -12,7 +15,9 @@
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Created by yxw on 2017/11/4.
@@ -21,7 +26,8 @@
 public class PgPartitionManager extends HibernateEntityDao<PgPartition> {
 
     @Resource
-    PgRoadManager pgRoadManager;
+    private PgRoadManager pgRoadManager;
+
 
     public PgPartition getPartitionByParName(String parName) {
         Criteria criteria = getSession().createCriteria(PgPartition.class);
@@ -99,4 +105,5 @@
         return pgPartitionDtoList;
     }
 
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
index f216360..a6928f1 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
@@ -5,6 +5,7 @@
 public class PgPlanResultRe {
 
     private String taskKey;
+    private List<String> pileAcuList;
     private List<PgPlanResult> pgPlanResultList;
 
     public String getTaskKey() {
@@ -15,6 +16,14 @@
         this.taskKey = taskKey;
     }
 
+    public List<String> getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(List<String> pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+
     public List<PgPlanResult> getPgPlanResultList() {
         return pgPlanResultList;
     }
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
index 71ea765..47eea07 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
@@ -54,9 +54,7 @@
 
         List<PgLineHole> pgLineHoleList=criteria.list();
         List<PgLineHoleDTO> pgLineHoleDTOList=new ArrayList<>();
-        if(pgLineHoleList==null||pgLineHoleList.size()==0)
-            return null;
-        else
+        if(pgLineHoleList!=null&&pgLineHoleList.size()!=0)
             pgLineHoleDTOList=PgLineHoleDTO.ConvertToDTOList(pgLineHoleList,pgPileAcuManager,pgRoadManager);
         return pgLineHoleDTOList;
     }
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
index 0fd9e1f..841a386 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
@@ -1,12 +1,15 @@
 package com.casic.PgInterface.intelPlan.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.devTable.domain.PgPartition;
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
 import com.casic.PgInterface.intelPlan.domain.PgLineHole;
 import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
 import com.casic.PgInterface.intelPlan.domain.PgSection;
 import com.casic.PgInterface.intelPlan.dto.PgPlanResult;
 import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
 import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -22,6 +25,9 @@
     @Resource
     private PgLineHoleManager pgLineHoleManager;
 
+    @Resource
+    private PgRoadManager pgRoadManager;
+
     public PgPileAcu getPgPileAcuByCode(String acuCode){
         List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
 
@@ -58,7 +64,9 @@
         for(PgPlanTask pgPlanTask:pgPlanTaskList){
             List<PgPlanResult> pgPlanResultList=getPgPlanResultByPlantask(pgPlanTask);
             PgPlanResultRe pgPlanResultRe=new PgPlanResultRe();
+
             pgPlanResultRe.setTaskKey(pgPlanTask.getTaskKey());
+            pgPlanResultRe.setPileAcuList(pgPlanTask.getPileAcuList());
             pgPlanResultRe.setPgPlanResultList(pgPlanResultList);
 
             pgPlanResultReList.add(pgPlanResultRe);
@@ -142,4 +150,57 @@
         return length;
     }
 
+    private PgPileAcu getPgPileAcuByAcuCode(String acuCode){
+        List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
+
+        if(pgPileAcuList==null||pgPileAcuList.size()==0)
+            return null;
+        else
+            return pgPileAcuList.get(0);
+    }
+
+    public List<PgAcuTask> getACUTask(String pileAcuList){
+        String[] acuArray=pileAcuList.split(",");
+        List<PgAcuTask> pgAcuTaskList=new ArrayList<>();
+
+        for(String acu:acuArray){
+            PgPileAcu pgPileAcu=this.getPgPileAcuByCode(acu);
+            String roadName=pgRoadManager.get(pgPileAcu.getRoadId()).getRoadName();
+
+            if(!containRoad(roadName,pgAcuTaskList))
+            {
+                PgAcuTask pgAcuTask=new PgAcuTask();
+                pgAcuTask.setRoadName(roadName);
+                pgAcuTask.setPileAcuList(acu);
+                pgAcuTaskList.add(pgAcuTask);
+            }
+            else{
+                PgAcuTask pgAcuTask=getIndexRoad(roadName,pgAcuTaskList);
+                if(pgAcuTask!=null)
+                    pgAcuTask.setPileAcuList(pgAcuTask.getPileAcuList()+","+acu);
+            }
+        }
+
+        return pgAcuTaskList;
+    }
+
+    private boolean containRoad(String roadName,List<PgAcuTask> pgAcuTaskList){
+        if(pgAcuTaskList==null||pgAcuTaskList.size()==0) return false;
+        for(PgAcuTask pgAcuTask:pgAcuTaskList){
+            if(pgAcuTask.getRoadName().equals(roadName))
+                return true;
+        }
+
+        return false;
+    }
+
+    private PgAcuTask getIndexRoad(String roadName, List<PgAcuTask> pgAcuTaskList){
+        for(PgAcuTask pgAcuTask:pgAcuTaskList){
+            if(pgAcuTask.getRoadName().equals(roadName))
+                return pgAcuTask;
+        }
+
+        return null;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java
new file mode 100644
index 0000000..323f7ef
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java
@@ -0,0 +1,25 @@
+package com.casic.PgInterface.reservePlan.dto;
+
+import java.util.List;
+
+public class PgAcuTask {
+
+    private String roadName;//道路
+    private String pileAcuList;//acu分区
+
+    public String getRoadName() {
+        return roadName;
+    }
+
+    public void setRoadName(String roadName) {
+        this.roadName = roadName;
+    }
+
+    public String getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(String pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
index c25e926..c7d7693 100644
--- a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
@@ -70,9 +70,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(Long.valueOf(inPgPersonId));
         PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("hostName",pgInPgPerson.getAssetCode());
-//        PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode());
-//        long maxId = pgTagPositionManager.getMaxId(pgTagMac.getTagMac());
-//        PGTagPosition pgTagPosition = pgTagPositionManager.get(maxId);
+
         PGTagPosition pgTagPosition = tagmacRun.GetTagStatus(pgTagMac);
         boolean bExist = false;
         bExist = pgTagPositionManager.findTagPosition(pgTagPosition.getPositionUpdatetime(),pgTagPosition.getHostId());
@@ -104,8 +102,7 @@
         PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(Long.valueOf(inPgPersonId));
         PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pgInPgPersonId",pgInPgPerson);
         System.out.println("time:"+pgInPgStatus.getInTime());
-//        PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pgInPgPersonId",inPgPersonId);
-//        PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode());
+
         PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("hostName",pgInPgPerson.getAssetCode());
 
         Map<Object,Object> mapPosition = new HashMap<>();
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
index 082ba5d..3eed00a 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
@@ -48,6 +48,7 @@
     public Map<String, Object> linkDevice(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         PgDeviceDto pgDeviceDto = null;
         try {
@@ -62,6 +63,7 @@
                     else {
                         pgDeviceDto = new PgDeviceDto(pgDevice);
                         msg = "报警关联设备获取成功";
+                        code="200";
                     }
                 }
             }
@@ -71,6 +73,7 @@
             e.printStackTrace();
             msg = "获取关联设备失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceDto);
 
@@ -86,6 +89,7 @@
     public Map<String, Object> linkPartitionCamera(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
         try {
@@ -106,6 +110,7 @@
 
                         pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(partition,position);
                         msg = "关联设备获取成功";
+                        code="200";
                     }
                 }
             }
@@ -115,6 +120,7 @@
             e.printStackTrace();
             msg = "分区设备关联失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceDtoList);
         return resultMap;
@@ -129,6 +135,7 @@
     public Map<String, Object> linkReservePlan(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgReservePlanDto> pgReservePlanDtoList=new ArrayList<>();
         try{
@@ -139,10 +146,12 @@
                 else {
                     pgReservePlanDtoList = pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
 
-                    if(pgReservePlanDtoList==null||pgReservePlanDtoList.size()==0)
-                        msg="不存在关联的报警预案";
-                    else
+                    if (pgReservePlanDtoList == null || pgReservePlanDtoList.size() == 0)
+                        msg = "不存在关联的报警预案";
+                    else {
                         msg = "关联预案获取成功";
+                        code="200";
+                    }
                 }
             }
             else
@@ -153,6 +162,7 @@
             e.printStackTrace();
             msg="预案关联失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgReservePlanDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
index 0ddbc4d..0ce886b 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
@@ -41,25 +41,19 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getAlarmList(@FormParam("alarmType") String alarmType,
                                             @FormParam("startDay") String startDay,
+                                            @FormParam("partition") String partition,
                                             @FormParam("endDay") String endDay,
                                             @FormParam("isNew") String isNew,
                                             @FormParam("page") int page,
                                             @FormParam("rows") int rows) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
         try {
-            pgAlarmDtoList = pgAlarmManager.getAllAlarm(alarmType,startDay,endDay,isNew,page,rows);
-            if (pgAlarmDtoList==null||pgAlarmDtoList.size() == 0)
-                msg = "没有报警信息";
-            else
-                msg = "报警信息获取成功";
+            resultMap = pgAlarmManager.getAllAlarm(alarmType,partition,startDay,endDay,isNew,page,rows);
+
         } catch (Exception e) {
             e.printStackTrace();
-            msg = "报警信息获取失败";
         }
-        resultMap.put("msg", msg);
-        resultMap.put("result", pgAlarmDtoList);
         return resultMap;
     }
 
@@ -71,9 +65,10 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> clearAlarmList(@FormParam("id") String id) throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        String result = "false";
+        String result = "";
+        String code="0";
 
         try {
             PgAlarm pgAlarm = new PgAlarm();
@@ -86,12 +81,14 @@
                 pgAlarmManager.save(pgAlarm);
                 msg = "报警信息清除成功";
                 result = "true";
+                code = "200";
             }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警信息清除失败";
             result = "false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
@@ -106,21 +103,26 @@
     public Map<String, Object> getAlarmByTypeOrTime(@FormParam("alarmType") String alarmType,
                                                     @FormParam("startTime") String startTime,
                                                     @FormParam("endTime") String endTime) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
-        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<PgAlarmDto>();
+        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
         try {
             pgAlarmDtoList = pgAlarmManager.getAlarmByTypeAndTime(alarmType, startTime, endTime);
             if (pgAlarmDtoList == null || pgAlarmDtoList.size() == 0)
                 msg = "报警信息不存在";
             else
+            {
                 msg = "报警信息获取成功";
+                code="200";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警信息获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
index 29ce8a4..ed0bf34 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
@@ -39,8 +39,8 @@
     public Map<String, Object> getAlarmRule(@FormParam("devType") String devType) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
-        System.out.println("devType:"+devType);
         List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<>();
         try {
             pgAlarmRuleDtoList = pgAlarmRuleManager.getAlarmRuleDto(devType);
@@ -52,6 +52,7 @@
             e.printStackTrace();
             msg = "报警阈值信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmRuleDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
index 24ab894..abef1b1 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
@@ -39,16 +39,21 @@
                                                      @FormParam("endDate") String endDate)throws Exception{
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
+
         List<PgAlarmTjDto> pgAlarmTjDtoList=null;
         try{
             pgAlarmTjDtoList=pgAlarmTjManager.getAlarmTjResultByType(startDate,endDate);
             msg="获取成功";
+            code="200";
         }
         catch(Exception ex) {
             msg = "统计失败";
         }
-        resultMap.put("result",pgAlarmTjDtoList);
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
+        resultMap.put("result",pgAlarmTjDtoList);
+
         return resultMap;
     }
 
@@ -61,23 +66,27 @@
     public Map<String, Object> getAlarmByTime(@FormParam("startTime") String startTime,
                                               @FormParam("endTime") String endTime,
                                               @FormParam("statisticType") String statisticType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code = "0";
 
-        List<PgAlarmTjDto> pgAlarmTjDtoList = new ArrayList<PgAlarmTjDto>();
+        List<PgAlarmTjDto> pgAlarmTjDtoList = new ArrayList<>();
         try {
             pgAlarmTjDtoList = pgAlarmTjManager.getAlarmByTime(startTime, endTime, statisticType);
             if(pgAlarmTjDtoList==null)
                 msg="报警统计信息获取失败";
-            else
-                msg="报警统计信息获取成功";
+            else {
+                msg = "报警统计信息获取成功";
+                code="200";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警统计信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmTjDtoList);
         return resultMap;
     }
 
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
index 28bc811..b6278a9 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
@@ -30,7 +30,6 @@
     @Resource
     private PgAlarmTypeManager pgAlarmTypeManager;
 
-
     /**
      * 获取报警类型
      */
@@ -38,19 +37,24 @@
     @Path("getAlarmType")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getAlarmTypeList()throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
-        List<PgAlarmTypeDto> pgAlarmTypeDtoList=new ArrayList<PgAlarmTypeDto>();
+        String code="";
+
+        List<PgAlarmTypeDto> pgAlarmTypeDtoList=new ArrayList<>();
         try {
             pgAlarmTypeDtoList = pgAlarmTypeManager.getAllAlarmTypeDto();
             if(pgAlarmTypeDtoList.size()==0)
                 msg="没有报警类型信息";
-            else
-                msg="报警类型信息获取成功";
+            else {
+                code="200";
+                msg = "报警类型信息获取成功";
+            }
         }catch(Exception e){
             e.printStackTrace();
             msg="报警类型信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAlarmTypeDtoList);
         return resultMap;
@@ -66,6 +70,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
@@ -83,6 +88,7 @@
                 logger.info("成功保存");
                 result = "true";
                 msg = "保存成功";
+                code="200";
             }
         } catch (Exception e) {
             result = "false";
@@ -90,6 +96,7 @@
             e.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -106,6 +113,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try{
             if(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
@@ -119,6 +127,7 @@
                 pgAlarmTypeManager.save(pgAlarmType);
                 result = "true";
                 msg = "编辑成功";
+                code="200";
             }
         }
         catch(Exception e)
@@ -128,6 +137,7 @@
             e.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("result",result);
         resultMap.put("msg",msg);
 
@@ -146,6 +156,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
         String result="false";
+        String code="0";
 
         try {
             PgAlarmType pgAlarmType=pgAlarmTypeManager.get(Long.valueOf(id));
@@ -157,6 +168,7 @@
             {
                 pgAlarmType.setActive(0);
                 pgAlarmTypeManager.save(pgAlarmType);
+                code="200";
                 msg="报警类型删除成功";
                 result="true";
             }
@@ -165,6 +177,7 @@
             msg="报警类型删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
index 4533e1a..85940bb 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
@@ -33,12 +33,15 @@
                                                  @FormParam("inSpectionPlace") String inSpectionPlace){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
         List<PgAssetPlanDto> pgAssetPlanDtoList=new ArrayList<>();
         try{
             pgAssetPlanDtoList=pgAssetPlanManager.getPgAssetPlanDtoList(startDay,endDay,inSpectionPlace);
-            if(pgAssetPlanDtoList!=null&&pgAssetPlanDtoList.size()!=0)
-                msg="巡检信息获取成功";
+            if(pgAssetPlanDtoList!=null&&pgAssetPlanDtoList.size()!=0) {
+                code="200";
+                msg = "巡检信息获取成功";
+            }
             else
                 msg="不存在巡检信息";
         }
@@ -47,6 +50,7 @@
             msg="巡检信息获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAssetPlanDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
index 47ef9d1..5cbdfcb 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
@@ -30,12 +30,15 @@
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
         String result="";
+        String code="0";
 
         List<PgAssetPlanStatic> pgAssetPlanStaticList = null;
         try{
             pgAssetPlanStaticList=pgAssetPlanManager.getPgAssetPlanStaticLisByTime(startTime,endTime,staticType);
-            if(pgAssetPlanStaticList!=null&&pgAssetPlanStaticList.size()!=0)
-                msg="巡检统计信息获取成功";
+            if(pgAssetPlanStaticList!=null&&pgAssetPlanStaticList.size()!=0) {
+                code = "200";
+                msg = "巡检统计信息获取成功";
+            }
             else
                 msg="统计信息获取失败";
         }
@@ -44,6 +47,7 @@
             msg="统计失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAssetPlanStaticList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
index 26f5d6a..503bfe3 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
@@ -40,6 +40,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="";
 
         try{
             PgAuthority pgAuthority=new PgAuthority();
@@ -50,6 +51,7 @@
 
             pgAuthorityManager.save(pgAuthority);
             msg="用户权限保存成功";
+            code="200";
             result="true";
         }
         catch(Exception e) {
@@ -57,6 +59,7 @@
             msg = "新增权限失败";
             result = "false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -65,22 +68,25 @@
 
     /*
        *编辑角权限信息
-        */
+    */
     @POST
     @Path("editAuthority")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> editAuthority(@FormParam("id") String id,
                                        @FormParam("authority") String authority,
                                        @FormParam("concent") String concent) throws Exception{
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
+
         try {
             PgAuthority pgAuthority=pgAuthorityManager.get(Long.valueOf(id));
             pgAuthority.setAuthority(authority);
             pgAuthority.setConcent(concent);
 
             pgAuthorityManager.save(pgAuthority);
+            code="200";
             msg="权限保存成功";
             result="true";
         }
@@ -90,7 +96,7 @@
             msg="权限编辑失败";
             result="false";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -105,9 +111,10 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> deleteAuthority(@FormParam("id") String id)throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
-        String result="false";
+        String result="";
+        String code="0";
 
         try {
             PgAuthority pgAuthority= pgAuthorityManager.get(Long.valueOf(id));
@@ -119,6 +126,7 @@
             {
                 pgAuthority.setActive(0);
                 pgAuthorityManager.save(pgAuthority);
+                code="200";
                 msg="删除权限成功";
                 result="true";
             }
@@ -127,37 +135,40 @@
             msg="删除权限失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
     }
 
     /*
-* 获取权限信息
- */
+    * 获取权限信息
+    */
     @POST
     @Path("getAuthorityList")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> getAuthorityList() {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgAuthorityDto> pgAuthorityDtoList = new ArrayList<PgAuthorityDto>();
         try {
             pgAuthorityDtoList = pgAuthorityManager.getAuthorityList();
             if (pgAuthorityDtoList == null)
                 msg = "不存在权限信息";
-            else
+            else {
+                code = "200";
                 msg = "权限信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "权限信息获取是失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAuthorityDtoList);
         return resultMap;
     }
 
 
-
-
 }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
index a9ef521..a74ecc7 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
@@ -45,6 +45,7 @@
                                                @FormParam("endDate") String endDate)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgHistoryDataDto> pgHistoryDataDtoList=new ArrayList<>();
 
         try {
@@ -55,13 +56,16 @@
                 pgHistoryDataDtoList=pgCh4Manager.getAllCH4Data(pgDevice,startDate,endDate);
                 if(pgHistoryDataDtoList==null)
                     msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+                else {
+                    code = "200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgHistoryDataDtoList);
         return resultMap;
@@ -75,8 +79,9 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getNewestCh4InfoByDev(@FormParam("assetCode") String assetCode)throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
+        String code="0";
         PgCh4Dto pgCh4Dto=new PgCh4Dto(null);
 
         try {
@@ -87,13 +92,17 @@
                 pgCh4Dto=pgCh4Manager.getNewestCH4Data(pgDevice);
                 if(pgCh4Dto==null)
                     msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgCh4Dto);
         return resultMap;
@@ -111,6 +120,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
@@ -127,6 +137,7 @@
                 pgCh4.setPgDeviceId(pgDevice);
 
                 pgCh4Manager.save(pgCh4);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -135,7 +146,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
index a7eac39..dfc8ca5 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
@@ -43,23 +43,27 @@
                                                       @FormParam("endDate") String endDate)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgHistoryDataDto> pgHistoryDataDtoList=new ArrayList<>();
 
         try {
             PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
                 msg="设备不存在";
-            else{
-                pgHistoryDataDtoList=pgCoManager.getAllCoData(pgDevice, startDate, endDate);
-                if(pgHistoryDataDtoList==null)
-                    msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+            else {
+                pgHistoryDataDtoList = pgCoManager.getAllCoData(pgDevice, startDate, endDate);
+                if (pgHistoryDataDtoList == null)
+                    msg = "没有满足要求的数据";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgHistoryDataDtoList);
         return resultMap;
@@ -75,6 +79,7 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         PgCoDto pgCoDto=new PgCoDto(null);
 
         try {
@@ -85,13 +90,16 @@
                 pgCoDto=pgCoManager.getNewestCoData(pgDevice);
                 if(pgCoDto==null)
                     msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgCoDto);
         return resultMap;
@@ -110,6 +118,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         try {
@@ -126,6 +135,7 @@
 
                 pgCoManager.save(pgCo);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
         } catch (Exception e) {
@@ -133,7 +143,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
index b4b826e..9af98a3 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
@@ -60,6 +60,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         try {
 
@@ -80,8 +81,8 @@
                 pgConstruction.setPgConstructionTypeId(pgConstructionType.getId());
                 pgConstruction.setActive(1);
                 pgConstruction.setParName(parName);
-                logger.info("保存成功");
                 pgConstructionManager.save(pgConstruction);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -90,6 +91,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("success", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -116,6 +118,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
@@ -140,6 +143,7 @@
                 pgConstruction.setParName(parName);
 
                 pgConstructionManager.save(pgConstruction);
+                code="200";
                 result = "true";
                 msg = "编辑成功";
             }
@@ -150,7 +154,7 @@
             e.printStackTrace();
 
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -167,6 +171,8 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
+
         try {
             PgConstruction pgConstruction = pgConstructionManager.get(Long.valueOf(id));
             if (pgConstruction == null)
@@ -177,6 +183,7 @@
             {
                 pgConstruction.setActive(0);
                 pgConstructionManager.save(pgConstruction);
+                code="200";
                 result = "true";
                 msg = "成功删除信息";
             }
@@ -185,6 +192,7 @@
             result = "false";
             msg = "删除失败";
         }
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -204,9 +212,11 @@
                                                   @FormParam("rows") int rows)throws Exception{
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
         List<PgConstructionDto> pgConstructionDtoList=new ArrayList<>();
         try{
             pgConstructionDtoList=pgConstructionManager.getPgContructionDto(cs_name,cs_type,startTime,endTime,page,rows);
+            code="200";
             msg="信息获取成功";
         }
         catch(Exception e)
@@ -214,6 +224,7 @@
             e.printStackTrace();
             msg="查询失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
 
@@ -231,18 +242,22 @@
                                                               @FormParam("statisticType") String statisticType) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgConstructionStiatistic> pgConstructionStiatisticList=new ArrayList<>();
         try {
             pgConstructionStiatisticList = pgConstructionManager.getConstructionByTimeAndStatus(startTime, endTime, statisticType);
             if(pgConstructionStiatisticList==null)
                 msg="施工统计信息获取失败";
-            else
-                msg="施工统计信息获取成功";
+            else {
+                code="200";
+                msg = "施工统计信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "施工统计信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgConstructionStiatisticList);
         return resultMap;
@@ -257,6 +272,7 @@
     public Map<String, Object> getConstructionByType(@FormParam("statisticType") String statisticType){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
         List<PgConstructionStiatistic> pgConstructionStiatisticList=new ArrayList<>();
 
         try{
@@ -268,6 +284,7 @@
                 resultMap.put("result",null);
             }
             else {
+                code="200";
                 msg = "统计信息获取成功";
                 resultMap.put("result", pgConstructionStiatisticList);
             }
@@ -278,6 +295,7 @@
             msg="统计失败";
             resultMap.put("result",null);
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         return resultMap;
     }
@@ -291,9 +309,11 @@
     public Map<String, Object> getConstructionToday() throws Exception{
         Map<String,Object> resultMap=new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgConstructionDto> pgConstructionDtoList=new ArrayList<PgConstructionDto>();
         try {
             pgConstructionDtoList = pgConstructionManager.getConstructionToday();
+            code="200";
             msg = "当天施工信息获取成功";
         }
         catch(Exception e)
@@ -301,7 +321,7 @@
             e.printStackTrace();
             msg="获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
         return resultMap;
@@ -316,6 +336,7 @@
     public Map<String, Object> getConstructionDev(@FormParam("id") String id) throws Exception{
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
         List<PgDeviceDto> pgDeviceDtoList =new ArrayList<>();
         try{
@@ -325,14 +346,17 @@
 
             if(pgDeviceDtoList==null)
                 msg="信息获取失败";
-            else
-                msg="信息获取成功";
+            else {
+                code="200";
+                msg = "信息获取成功";
+            }
         }
         catch(Exception e)
         {
             e.printStackTrace();
-            msg="设备信息获取成功";
+            msg="信息获取是被";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgDeviceDtoList);
 
@@ -346,17 +370,21 @@
     @Path("getConstruction")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getConstruction() throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
-        List<PgConstructionDto> pgConstructionDtoList=new ArrayList<PgConstructionDto>();
+        String code="0";
+
+        List<PgConstructionDto> pgConstructionDtoList=new ArrayList<>();
 
         try{
             pgConstructionDtoList=pgConstructionManager.getPgConstructionList();
             if(pgConstructionDtoList==null||pgConstructionDtoList.size()==0)
                 msg="不存在施工记录";
-            else
-                msg="施工信息获取成功";
+            else {
+                code = "200";
+                msg = "施工信息获取成功";
+            }
         }
         catch(Exception e)
         {
@@ -364,6 +392,7 @@
             msg="施工信息获取失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java
index fd3d53e..2019502 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java
@@ -39,12 +39,12 @@
         try {
             pgConstructionTypeDtoList = pgConstructionTypeManager.getAllConstructionTypeDto();
             if (pgConstructionTypeDtoList.size() == 0)
-                msg = "没有项目类型信息";
+                msg = "获取失败";
             else
-                msg = "项目类型获取成功";
+                msg = "获取成功";
         } catch (Exception e) {
             e.printStackTrace();
-            msg = "项目类型信息获取失败";
+            msg = "获取失败";
         }
         resultMap.put("msg", msg);
         resultMap.put("result", pgConstructionTypeDtoList);
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
index 90d001c..037a399 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
@@ -51,6 +51,7 @@
 
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if (StringUtils.isBlank(construct_doc)||StringUtils.isBlank(doc_name))
@@ -65,6 +66,7 @@
             pgCsDocument.setActive(1);
             pgCsDocumentManager.save(pgCsDocument);
 
+            code="200";
             result = "true";
             msg = "保存成功";
 
@@ -74,6 +76,7 @@
             ex.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("success", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -90,6 +93,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             PgCsDocument pgCsDocument = pgCsDocumentManager.get(Long.valueOf(id));
@@ -103,6 +107,7 @@
 
                 pgCsDocumentManager.save(pgCsDocument);
 
+                code="200";
                 result = "true";
                 msg = "编辑成功";
             }
@@ -112,6 +117,7 @@
             msg = "编辑失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -125,9 +131,9 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
         String result="";
+        String code="0";
 
         try{
-
             PgCsDocument pgCsDocument = pgCsDocumentManager.get(Long.valueOf(id));
             if(pgCsDocument==null)
             {
@@ -137,6 +143,7 @@
             else{
                 pgCsDocument.setActive(0);
                 pgCsDocumentManager.save(pgCsDocument);
+                code="200";
                 result="true";
                 msg="删除成功";
             }
@@ -147,7 +154,7 @@
             msg="预案删除失败";
             result="false";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -168,18 +175,21 @@
 
         String msg="";
         String result="";
+        String code="0";
 
         try {
             pgCsDocumentDtoList = pgCsDocumentManager.getAllDocData(cs_name);
-            if (pgCsDocumentDtoList != null)
+            if (pgCsDocumentDtoList != null) {
+                code="200";
                 msg = "获取数据成功";
+            }
             else
                 msg = "没有满足条件的数据";
         }catch (Exception e){
             e.printStackTrace();
             msg = "获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgCsDocumentDtoList);
         return resultMap;
@@ -192,20 +202,22 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
 
         String msg = "";
+        String code="0";
         ResponseEntity<byte[]> path = null;
         try {
             PgCsDocument pgCsDocument = pgCsDocumentManager.get(Long.valueOf(id));
             path = pgCsDocumentManager.downloadFile(pgCsDocument);
             if (path == null)
                 msg = "不存在该文档";
-            else
+            else {
+                code = "200";
                 msg = "下载成功";
-
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "下载失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", path.getBody());
         resultMap.put("msg", msg);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
index 94c5c84..ffc8b95 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
@@ -41,22 +41,24 @@
     public Map<String, Object> getPgDeviceByDevType(@FormParam("devType") String devType) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
         try {
-            pgDeviceDtoList = pgDeviceManager.getDeviceByDevTypee(devType);
+            pgDeviceDtoList = pgDeviceManager.getDeviceByDevType(devType);
             if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0){
                 msg="不存在满足要求的数据";
-                resultMap.put("result",null);
             }
             else{
-                resultMap.put("result", pgDeviceDtoList);
+                code="200";
                 msg = "获取成功";
             }
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", pgDeviceDtoList);
         return resultMap;
     }
 
@@ -69,25 +71,26 @@
     public Map<String, Object> getPgDeviceByAssetCode(@FormParam("assetCode") String assetCode) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         PgDeviceDto pgDeviceDto=null;
         try {
             PgDevice pgDevice = pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
             {
                 msg="不存在设备信息";
-                resultMap.put("result",null);
             }
             else {
                 pgDeviceDto = new PgDeviceDto(pgDevice);
                 msg = "获取成功";
-                resultMap.put("result", pgDeviceDto);
+                code="200";
             }
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", pgDeviceDto);
         return resultMap;
     }
 
@@ -102,27 +105,61 @@
                                              @FormParam("devType") String devType)throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
         try {
             pgDeviceDtoList = pgDeviceManager.getAllDevice(road,partition,devType);
             if(pgDeviceDtoList.size()==0) {
                 msg = "没有找到设备信息";
-                resultMap.put("result",null);
             }
             else {
                 msg = "设备信息获取成功";
-                resultMap.put("result", pgDeviceDtoList);
+                code="200";
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result", pgDeviceDtoList);
         return resultMap;
     }
 
     /**
+     * 显示设备列表
+     */
+    @POST
+    @Path("getPgDev")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String, Object> getPgDev(@FormParam("road") String road,
+                                             @FormParam("partition") String partition,
+                                             @FormParam("devType") String devType)throws Exception {
+        Map<String, Object> resultMap = new HashMap<>();
+        String msg="";
+        String code="0";
+        List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
+        try {
+            pgDeviceDtoList = pgDeviceManager.getAllDev(road,partition,devType);
+            if(pgDeviceDtoList.size()==0) {
+                msg = "没有找到设备信息";
+            }
+            else {
+                code="200";
+                msg = "设备信息获取成功";
+            }
+        }catch(Exception e){
+            e.printStackTrace();
+            msg="设备信息获取失败";
+        }
+        resultMap.put("code",code);
+        resultMap.put("msg",msg);
+        resultMap.put("result", pgDeviceDtoList);
+        return resultMap;
+    }
+
+
+    /**
      * 新增设备
      */
     @POST
@@ -145,6 +182,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if (pgDeviceManager.getDeviceByAssetCode(assetCode)!=null) {
@@ -169,6 +207,7 @@
 
                 pgDeviceManager.save(pgDevice);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
 
@@ -177,10 +216,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -208,14 +246,9 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
-            /*
-            if (pgDeviceManager.getDeviceByAssetCode(assetCode)!=null) {
-                result = "false";
-                msg = "已存在同名设备";
-            } else {
-            */
             PgDevice pgDevice = pgDeviceManager.get(Long.valueOf(id));
             pgDevice.setPipeGallery(pipeGallery);
             pgDevice.setPartition(partition);
@@ -233,14 +266,14 @@
 
             pgDeviceManager.save(pgDevice);
             result = "true";
+            code="200";
             msg = "编辑成功";
-            //}
         } catch (Exception e) {
             result = "false";
             msg = "编辑失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("result",result);
         resultMap.put("msg",msg);
         return resultMap;
@@ -256,7 +289,8 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
-        String result="false";
+        String result="";
+        String code="0";
 
         try {
             PgDevice pgDevice=pgDeviceManager.get(Long.valueOf(id));
@@ -268,6 +302,7 @@
             {
                 pgDevice.setActive(0);
                 pgDeviceManager.save(pgDevice);
+                code="200";
                 msg="设备删除成功";
                 result="true";
             }
@@ -276,6 +311,7 @@
             msg="设备删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -291,18 +327,18 @@
     {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         PgDeviceDto pgDeviceDto=null;
 
         try{
             PgDevice pgDevice=pgDeviceManager.getDeviceBydevCode(devCode);
             if(pgDevice==null) {
                 msg = "设备信息获取失败";
-                resultMap.put("result",null);
             }
             else{
                 pgDeviceDto = new PgDeviceDto(pgDevice);
                 msg = "设备信息获取成功";
-                resultMap.put("result",pgDeviceDto);
+                code="200";
             }
         }
         catch(Exception ex)
@@ -310,8 +346,9 @@
             ex.printStackTrace();
             msg="设备状态获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgDeviceDto);
         return resultMap;
     }
 
@@ -324,17 +361,17 @@
     public Map<String,Object> getDeviceByPartition(@FormParam("partition") String partition) throws Exception{
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<PgDeviceDto>();
 
         try{
             pgDeviceDtoList=pgDeviceManager.getPgDeviceDtoListByPartition(partition);
             if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0) {
                 msg = "设备信息获取失败";
-                resultMap.put("result",null);
             }
             else {
+                code="200";
                 msg = "设备信息获取成功";
-                resultMap.put("result",pgDeviceDtoList);
             }
         }
         catch(Exception e)
@@ -342,8 +379,9 @@
             e.printStackTrace();
             msg="设备信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgDeviceDtoList);
         return resultMap;
     }
 
@@ -353,17 +391,16 @@
     public Map<String,Object> getDeviceByOldDAssetCodeCode(@FormParam("assetCode") String assetCode) throws Exception{
         Map<String, Object> resultMap = new HashMap<>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
 
         try{
             pgDeviceDtoList=pgDeviceManager.getDeviceByOldDAssetCodeCode(assetCode);
-            if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0) {
-                msg = "设备信息获取失败";;
-                resultMap.put("result",null);
-            }
+            if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0)
+                msg = "设备信息获取失败";
             else {
                 msg = "设备信息获取成功";
-                resultMap.put("result",pgDeviceDtoList);
+                code="200";
             }
         }
         catch(Exception e)
@@ -372,8 +409,9 @@
             msg="设备信息获取失败";
             resultMap.put("result",null);
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgDeviceDtoList);
         return resultMap;
     }
 

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 25ded8a..283d7ab 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,20 +7,56 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" 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/construction/manager/PgCsDocumentManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/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/manager/PgAlarmManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/~$说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/~$说明20191207.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.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$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/接口说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明20191207.docx" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
@@ -51,7 +87,7 @@
         <counts>
           <entry key="class" value="4" />
           <entry key="iml" value="2" />
-          <entry key="java" value="707" />
+          <entry key="java" value="820" />
           <entry key="properties" value="14" />
           <entry key="xml" value="7" />
         </counts>
@@ -60,7 +96,7 @@
         <counts>
           <entry key="CLASS" value="4" />
           <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="707" />
+          <entry key="JAVA" value="820" />
           <entry key="Properties" value="14" />
           <entry key="XML" value="7" />
         </counts>
@@ -68,32 +104,32 @@
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
           <entry key="dummy" value="38" />
-          <entry key="java" value="30161" />
+          <entry key="java" value="40859" />
           <entry key="properties" value="100" />
-          <entry key="txt" value="176" />
+          <entry key="txt" value="186" />
           <entry key="xml" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="30161" />
-          <entry key="PLAIN_TEXT" value="214" />
+          <entry key="JAVA" value="40859" />
+          <entry key="PLAIN_TEXT" value="224" />
           <entry key="Properties" value="100" />
           <entry key="XML" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="48" />
+          <entry key="project.closed" value="51" />
           <entry key="project.open.time.1" value="5" />
           <entry key="project.open.time.12" value="2" />
           <entry key="project.open.time.13" value="1" />
           <entry key="project.open.time.15" value="1" />
           <entry key="project.open.time.16" value="1" />
           <entry key="project.open.time.17" value="1" />
-          <entry key="project.open.time.2" value="1" />
+          <entry key="project.open.time.2" value="2" />
           <entry key="project.open.time.20" value="1" />
-          <entry key="project.open.time.23" value="1" />
+          <entry key="project.open.time.23" value="2" />
           <entry key="project.open.time.24" value="2" />
           <entry key="project.open.time.251" value="1" />
           <entry key="project.open.time.27" value="2" />
@@ -106,8 +142,8 @@
           <entry key="project.open.time.36" value="1" />
           <entry key="project.open.time.37" value="1" />
           <entry key="project.open.time.39" value="2" />
-          <entry key="project.open.time.4" value="2" />
-          <entry key="project.open.time.40" value="1" />
+          <entry key="project.open.time.4" value="3" />
+          <entry key="project.open.time.40" value="2" />
           <entry key="project.open.time.41" value="2" />
           <entry key="project.open.time.42" value="2" />
           <entry key="project.open.time.43" value="2" />
@@ -122,23 +158,25 @@
           <entry key="project.open.time.6" value="3" />
           <entry key="project.open.time.63" value="2" />
           <entry key="project.open.time.64" value="1" />
+          <entry key="project.open.time.66" value="1" />
           <entry key="project.open.time.71" value="2" />
+          <entry key="project.open.time.74" value="1" />
           <entry key="project.open.time.76" value="1" />
           <entry key="project.open.time.8" value="2" />
           <entry key="project.open.time.9" value="1" />
           <entry key="project.open.time.97" value="1" />
-          <entry key="project.opened" value="78" />
+          <entry key="project.opened" value="84" />
         </counts>
       </usages-collector>
     </session>
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+            <state relative-caret-position="396">
+              <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
               <folding>
                 <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
                 <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -147,73 +185,6 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <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="99">
-              <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-              <folding>
-                <element signature="imports" expanded="true" />
-                <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-1170">
-              <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state>
-              <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
-              <folding>
-                <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-                <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="true">
-        <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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-              <folding>
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-                <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>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <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="352">
-              <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -225,18 +196,9 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>inCriteria</find>
-      <find>getPgPlanResulList</find>
-      <find>getPileAcuListByPileAcuStr</find>
-      <find>distinct</find>
-      <find>order</find>
-      <find>canPlanLine</find>
-      <find>isExistLine</find>
-      <find>getPlanResult</find>
       <find>pgPipeLine</find>
       <find>getPipeLineBylineName</find>
       <find>StringU</find>
-      <find>getAllAlarm</find>
       <find>getAlarmList</find>
       <find>getPgInPersonListByDay</find>
       <find>getDayInPgStatistic</find>
@@ -254,7 +216,16 @@
       <find>getPgContructionByNameOrType</find>
       <find>&quot;&quot;,&quot;&quot;,</find>
       <find>getPgContructionDtoByNameOrType</find>
+      <find>addConstruction</find>
+      <find>getPgLineAcuHole</find>
+      <find>getPlanResult</find>
       <find>getConstruction</find>
+      <find>addPipeLine</find>
+      <find>未找到入廊数据</find>
+      <find>getCurrentHoleByAcu</find>
+      <find>getAllAlarm</find>
+      <find>getPgDeviceDtoListByPartition</find>
+      <find>getPgDeviceByDevType</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -263,57 +234,57 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlan.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileHoleManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/planData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/PlanData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
       </list>
     </option>
   </component>
@@ -359,7 +330,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -421,53 +391,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="dto" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="manager" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -479,29 +402,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="rs" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -516,6 +416,7 @@
         </subPane>
       </pane>
       <pane id="Scope" />
+      <pane id="PackagesPane" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -710,7 +611,13 @@
       <workItem from="1574902733573" duration="1829000" />
       <workItem from="1574998240004" duration="7016000" />
       <workItem from="1575247959683" duration="6997000" />
-      <workItem from="1575704345590" duration="40473000" />
+      <workItem from="1575704345590" duration="69381000" />
+      <workItem from="1575869479666" duration="721000" />
+      <workItem from="1575947104878" duration="6101000" />
+      <workItem from="1576128264436" duration="3347000" />
+      <workItem from="1576208571543" duration="22000" />
+      <workItem from="1576227513917" duration="862000" />
+      <workItem from="1576293721220" duration="18246000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -817,11 +724,18 @@
       <option name="project" value="LOCAL" />
       <updated>1575775489149</updated>
     </task>
-    <option name="localTasksCounter" value="16" />
+    <task id="LOCAL-00016" summary="整改施工信息">
+      <created>1575791780774</created>
+      <option name="number" value="00016" />
+      <option name="presentableId" value="LOCAL-00016" />
+      <option name="project" value="LOCAL" />
+      <updated>1575791780774</updated>
+    </task>
+    <option name="localTasksCounter" value="17" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="452131000" />
+    <option name="totallyTimeSpent" value="510338000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -834,9 +748,8 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
-    <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.24205749" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2647504" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -847,7 +760,7 @@
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.3295082" />
       <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.4819672" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.65737706" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.3295082" />
@@ -939,7 +852,8 @@
     <MESSAGE value="重新设计智能规划部分" />
     <MESSAGE value="完成智能规划对接" />
     <MESSAGE value="修改报警统计" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改报警统计" />
+    <MESSAGE value="整改施工信息" />
+    <option name="LAST_COMMIT_MESSAGE" value="整改施工信息" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -951,16 +865,10 @@
           <option name="timeStamp" value="3" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java</url>
-          <line>69</line>
+          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java</url>
+          <line>40</line>
           <properties />
-          <option name="timeStamp" value="21" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java</url>
-          <line>96</line>
-          <properties />
-          <option name="timeStamp" value="38" />
+          <option name="timeStamp" value="122" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
@@ -970,394 +878,452 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <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="2068">
-          <caret line="154" column="35" selection-start-line="154" selection-start-column="35" selection-end-line="154" selection-end-column="35" />
-        </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="3300">
-          <caret line="297" column="22" selection-start-line="297" selection-start-column="22" selection-end-line="297" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/StringUtils.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
-          <caret line="13" column="48" lean-forward="true" selection-start-line="13" selection-start-column="48" selection-end-line="13" selection-end-column="48" />
+          <caret line="11" column="5" selection-start-line="11" selection-start-column="5" selection-end-line="11" selection-end-column="5" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="78" lean-forward="true" selection-start-line="78" selection-end-line="78" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="616">
-          <caret line="41" column="1" selection-start-line="41" selection-start-column="1" selection-end-line="41" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="110">
-          <caret line="12" column="23" selection-start-line="12" selection-start-column="23" selection-end-line="12" selection-end-column="23" />
+        <state relative-caret-position="516">
+          <caret line="114" column="12" selection-start-line="114" selection-start-column="12" selection-end-line="114" selection-end-column="12" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="164">
-          <caret line="56" lean-forward="true" selection-start-line="56" selection-end-line="56" />
+        <state relative-caret-position="418">
+          <caret line="33" column="44" selection-start-line="33" selection-start-column="44" selection-end-line="33" selection-end-column="44" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="258">
-          <caret line="27" column="12" lean-forward="true" selection-start-line="27" selection-start-column="12" selection-end-line="27" selection-end-column="12" />
+        <state relative-caret-position="132">
+          <caret line="11" column="20" lean-forward="true" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="20" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.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="-12">
-          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        <state relative-caret-position="516">
+          <caret line="142" column="54" selection-start-line="142" selection-start-column="54" selection-end-line="142" selection-end-column="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="858">
-          <caret line="55" column="27" lean-forward="true" selection-start-line="55" selection-start-column="27" selection-end-line="55" selection-end-column="27" />
+        <state relative-caret-position="66">
+          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="58">
+          <caret line="18" column="28" selection-start-line="18" selection-start-column="19" selection-end-line="18" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="305">
+          <caret line="24" column="31" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="714">
+          <caret line="58" column="5" lean-forward="true" selection-start-line="58" selection-start-column="5" selection-end-line="58" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="924">
+          <caret line="134" column="92" selection-start-line="134" selection-start-column="92" selection-end-line="134" selection-end-column="92" />
+          <folding>
+            <element signature="method#linkDevice#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkPartitionCamera#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkReservePlan#0;class#PgAlarmLinkRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1066">
+          <caret line="90" lean-forward="true" selection-start-line="90" selection-end-line="90" />
+          <folding>
+            <element signature="method#getTjResultByAlarmType#0;class#PgAlarmTjRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="946">
+          <caret line="148" column="11" lean-forward="true" selection-start-line="148" selection-start-column="11" selection-end-line="148" selection-end-column="11" />
+          <folding>
+            <element signature="method#getAlarmTypeList#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#addAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#editAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#deleteAlarmType#0;class#PgAlarmTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="208">
+          <caret line="46" column="23" lean-forward="true" selection-start-line="46" selection-start-column="23" selection-end-line="46" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="113" column="9" lean-forward="true" selection-start-line="113" selection-start-column="9" selection-end-line="113" selection-end-column="9" />
+          <folding>
+            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
+            <element signature="method#getNewestCh4InfoByDev#0;class#PgCh4Rs#0" />
+            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="145" column="6" lean-forward="true" selection-start-line="145" selection-start-column="6" selection-end-line="145" selection-end-column="6" />
+          <folding>
+            <element signature="method#addAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#editAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#deleteAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#getAuthorityList#0;class#PgAuthorityRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="58" column="1" lean-forward="true" selection-start-line="58" selection-start-column="1" selection-end-line="58" selection-end-column="1" />
+          <folding>
+            <element signature="method#getPgAssetPlanList#0;class#PgAssetPlanRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="370">
+          <caret line="371" column="66" selection-start-line="371" selection-start-column="66" selection-end-line="371" selection-end-column="66" />
+          <folding>
+            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#searchConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionDev#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="139" column="13" lean-forward="true" selection-start-line="139" selection-start-column="13" selection-end-line="139" selection-end-column="13" />
+          <folding>
+            <element signature="method#getCoInfoByDevAndDate#0;class#PgCoRs#0" />
+            <element signature="method#getNewestCoInfoByDev#0;class#PgCoRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="540">
+          <caret line="223" column="5" lean-forward="true" selection-start-line="223" selection-start-column="5" selection-end-line="223" selection-end-column="5" />
+          <folding>
+            <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="682">
+          <caret line="100" lean-forward="true" selection-start-line="100" selection-end-line="100" />
+          <folding>
+            <element signature="method#getDeviceTpeyList#0;class#PgDeviceTypeRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="377">
+          <caret line="225" column="35" selection-start-line="225" selection-start-column="35" selection-end-line="225" selection-end-column="35" />
+          <folding>
+            <element signature="method#addEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#addEquipment#1;class#PgEquipmentRs#0" />
+            <element signature="method#getEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#deleteEquipment#0;class#PgEquipmentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="406">
+          <caret line="109" lean-forward="true" selection-start-line="109" selection-end-line="109" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="154">
+          <caret line="28" column="19" selection-start-line="28" selection-start-column="19" selection-end-line="28" selection-end-column="19" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="748">
-          <caret line="49" column="5" lean-forward="true" selection-start-line="49" selection-start-column="5" selection-end-line="49" selection-end-column="5" />
+        <state relative-caret-position="296">
+          <caret line="161" column="35" selection-start-line="161" selection-start-column="35" selection-end-line="161" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="384">
+          <caret line="99" column="5" lean-forward="true" selection-start-line="99" selection-start-column="5" selection-end-line="99" selection-end-column="5" />
+        </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="362">
+          <caret line="340" column="35" selection-start-line="340" selection-start-column="35" selection-end-line="340" selection-end-column="35" />
+          <folding>
+            <element signature="method#addInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPersonInPg#0;class#PgInPgPersonRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-606">
+          <caret line="76" column="20" lean-forward="true" selection-start-line="76" selection-start-column="20" selection-end-line="76" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="65" column="35" selection-start-line="65" selection-start-column="35" selection-end-line="65" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="101" column="35" selection-start-line="101" selection-start-column="35" selection-end-line="101" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="84" column="35" selection-start-line="84" selection-start-column="35" selection-end-line="84" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="59" lean-forward="true" selection-start-line="59" selection-end-line="59" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="60" column="1" lean-forward="true" selection-start-line="60" selection-start-column="1" selection-end-line="60" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="145" column="35" selection-start-line="145" selection-start-column="35" selection-end-line="145" selection-end-column="35" />
+        </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="274">
+          <caret line="350" column="35" selection-start-line="350" selection-start-column="35" selection-end-line="350" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="121" column="39" selection-start-line="121" selection-start-column="39" selection-end-line="121" selection-end-column="39" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="28" column="8" lean-forward="true" selection-start-line="28" selection-start-column="8" selection-end-line="28" selection-end-column="8" />
+        <state relative-caret-position="340">
+          <caret line="103" selection-start-line="103" selection-end-line="103" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="226" column="35" selection-start-line="226" selection-start-column="35" selection-end-line="226" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="203" column="35" selection-start-line="203" selection-start-column="35" selection-end-line="203" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="241" column="35" selection-start-line="241" selection-start-column="35" selection-end-line="241" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="225" column="1" lean-forward="true" selection-start-line="225" selection-start-column="1" selection-end-line="225" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="176" column="5" lean-forward="true" selection-start-line="176" selection-start-column="5" selection-end-line="176" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="178" column="35" lean-forward="true" selection-start-line="178" selection-start-column="35" selection-end-line="178" selection-end-column="35" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="516">
-          <caret line="94" column="53" selection-start-line="94" selection-start-column="53" selection-end-line="94" selection-end-column="53" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="814">
-          <caret line="52" column="9" lean-forward="true" selection-start-line="52" selection-start-column="9" selection-end-line="52" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="182">
-          <caret line="58" column="12" lean-forward="true" selection-start-line="58" selection-start-column="12" selection-end-line="58" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="34" lean-forward="true" selection-start-line="34" selection-end-line="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="32" lean-forward="true" selection-start-line="32" selection-end-line="32" />
-          <folding>
-            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
-            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="185">
-          <caret line="63" column="13" selection-start-line="63" selection-start-column="13" selection-end-line="63" selection-end-column="13" />
-          <folding>
-            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
-            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
-            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="e#6319#6324#0" />
-            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
-          </folding>
+          <caret line="240" lean-forward="true" selection-start-line="240" selection-end-line="240" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
-          <caret line="58" column="28" lean-forward="true" selection-start-line="58" selection-start-column="28" selection-end-line="58" selection-end-column="28" />
-          <folding>
-            <element signature="method#addTempHumData#0;class#PgTempHumRs#0" />
-          </folding>
+        <state relative-caret-position="340">
+          <caret line="148" column="34" selection-start-line="148" selection-start-column="34" selection-end-line="148" selection-end-column="34" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
+        <state relative-caret-position="458">
+          <caret line="99" column="35" selection-start-line="99" selection-start-column="35" selection-end-line="99" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+        <state relative-caret-position="384">
+          <caret line="145" column="32" lean-forward="true" selection-start-line="145" selection-start-column="32" selection-end-line="145" selection-end-column="32" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="414">
-          <caret line="22" column="46" lean-forward="true" selection-start-line="22" selection-start-column="46" selection-end-line="22" selection-end-column="46" />
-        </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="396">
-          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" column="83" selection-start-line="11" selection-start-column="83" selection-end-line="11" selection-end-column="83" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="26">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
-          <folding>
-            <element signature="method#getPgInPgStatusByPerson#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNumByName#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNum#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPersonListByDay#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPgStatusByPgInPgPerson#0;class#PgInPgStatusManager#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="44">
-          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-12">
-          <caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="87" lean-forward="true" selection-start-line="87" selection-end-line="87" />
-          <folding>
-            <element signature="method#getConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#addConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#deleteConstructionType#0;class#PgConstructionTypeRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
-          <folding>
-            <element signature="method#getConstructionTypeByType#0;class#PgConstructionTypeManager#0" />
-            <element signature="method#getAllConstructionTypeDto#0;class#PgConstructionTypeManager#0" />
-          </folding>
-        </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="145">
-          <caret line="258" column="9" lean-forward="true" selection-start-line="258" selection-start-column="9" selection-end-line="258" selection-end-column="9" />
-          <folding>
-            <element signature="method#getMonthInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayInPgStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgOverViewRs#0" />
-            <element signature="method#getAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getMonthAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayAlarmStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgOverViewRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="103">
-          <caret line="105" column="50" lean-forward="true" selection-start-line="105" selection-start-column="50" selection-end-line="105" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateBasicDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="99">
-          <caret line="125" selection-start-line="125" selection-end-line="125" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="190">
-          <caret line="24" column="35" lean-forward="true" selection-start-line="24" selection-start-column="35" selection-end-line="24" selection-end-column="35" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="436">
-          <caret line="24" lean-forward="true" selection-start-line="24" selection-end-line="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" lean-forward="true" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="300">
-          <caret line="34" column="31" lean-forward="true" selection-start-line="34" selection-start-column="31" selection-end-line="34" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="42" column="13" lean-forward="true" selection-start-line="42" selection-start-column="13" selection-end-line="42" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="120" column="72" lean-forward="true" selection-start-line="120" selection-start-column="72" selection-end-line="120" selection-end-column="72" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="293">
-          <caret line="58" column="73" lean-forward="true" selection-start-line="58" selection-start-column="73" selection-end-line="58" selection-end-column="73" />
-          <folding>
-            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
-            <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
-          </folding>
-        </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="307">
-          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
+        <state relative-caret-position="758">
+          <caret line="130" column="5" lean-forward="true" selection-start-line="130" selection-start-column="5" selection-end-line="130" selection-end-column="5" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1170">
-          <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
+        <state relative-caret-position="494">
+          <caret line="86" column="62" lean-forward="true" selection-start-line="86" selection-start-column="62" selection-end-line="86" selection-end-column="62" />
           <folding>
-            <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-            <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+            <element signature="method#getAllDevice#0;class#PgDeviceManager#0" />
+            <element signature="method#getAllDev#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="195" column="28" lean-forward="true" selection-start-line="195" selection-start-column="28" selection-end-line="195" selection-end-column="28" />
+        <state relative-caret-position="166">
+          <caret line="174" column="13" lean-forward="true" selection-start-line="174" selection-start-column="13" selection-end-line="174" selection-end-column="13" />
           <folding>
-            <element signature="method#getAlarmByTypeAndTime#0;class#PgAlarmManager#0" />
-            <element signature="method#getAlarmNum#0;class#PgAlarmManager#0" />
             <element signature="method#getDayAlarmStatistic#0;class#PgAlarmManager#0" />
+            <element signature="method#getAlarmList#0;class#PgAlarmManager#0" />
             <element signature="method#createDTO#0;class#PgAlarmManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="364">
+          <caret line="46" column="56" lean-forward="true" selection-start-line="46" selection-start-column="56" selection-end-line="46" selection-end-column="56" />
+          <folding>
+            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
+            <element signature="method#getPgDev#0;class#PgDeviceRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
+            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+        <state relative-caret-position="396">
+          <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
           <folding>
             <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
             <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -1365,52 +1331,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="239">
-          <caret line="21" column="33" lean-forward="true" selection-start-line="21" selection-start-column="33" selection-end-line="21" selection-end-column="33" />
-        </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="352">
-          <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-        </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="99">
-          <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-          </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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-          <folding>
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-            <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>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
index c436c93..e913155 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
@@ -132,7 +132,10 @@
             this.setAlarmType("");
         else
             this.setAlarmType(pgAlarm.getAlarmTypeId().getAlarmType());
-        this.setAlarmValue(pgAlarm.getAlarmValue());
+        if(pgAlarm.getAlarmValue()==null)
+            this.setAlarmValue("");
+        else
+            this.setAlarmValue(pgAlarm.getAlarmValue());
         if (pgAlarm.getAlarmDate() != null)
             this.setAlarmDate(sdf.format(pgAlarm.getAlarmDate()));
         else
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
index a43965c..565cb41 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -159,11 +159,21 @@
     }
 
     //获取历史报警消息列表
-    public List<PgAlarmDto> getAllAlarm(String alarmType,String startDay,String endDay,String isNew,int page,int rows) {
-        try {
+    public  Map<String, Object> getAllAlarm(String alarmType,String partition,String startDay,String endDay,String isNew,int page,int rows) {
 
+        Map<String, Object> resultMap = new HashMap<>();
+        String msg="";
+
+        try {
             Criteria criteria = createCriteria(PgAlarm.class);
 
+            if (StringUtils.isNotBlank(partition)) {
+                DetachedCriteria inCriteria = DetachedCriteria.forClass(PgDevice.class);
+                inCriteria.add(Restrictions.eq("partition", partition));
+                inCriteria.setProjection(Property.forName("id"));
+                criteria.add(Property.forName("alarmDevId").in(inCriteria));
+            }
+
             if (StringUtils.isNotBlank(alarmType)&&!alarmType.contains("全部")&&pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
                 criteria.add(Restrictions.eq("alarmTypeId", pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)));
 
@@ -190,8 +200,16 @@
             for (PgAlarm pgAlarm : pgAlarmList) {
                 pgAlarmDtoList.add(new PgAlarmDto(pgAlarm));
             }
-
-            return pgAlarmDtoList;
+            if(pgAlarmDtoList==null||pgAlarmDtoList.size()==0) {
+                resultMap.put("msg", "没有报警信息");
+                resultMap.put("code","0");
+            }else {
+                resultMap.put("code","200");
+                resultMap.put("msg", "报警信息获取成功");
+            }
+            resultMap.put("count",pg.getTotalCount());
+            resultMap.put("result",pgAlarmDtoList);
+            return resultMap;
         }
         catch(Exception ex){
             ex.printStackTrace();
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index 7547560..654f49e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -24,11 +24,11 @@
 
         Criteria criteria = createCriteria(PgDevice.class);
 
-        if(road!=null)
+        if(StringUtils.isNotBlank(road))
             criteria.add(Restrictions.eq("road",road));
-        if(partition!=null)
+        if(StringUtils.isNotBlank(partition))
             criteria.add(Restrictions.eq("partition",partition));
-        if(devType!=null)
+        if(StringUtils.isNotBlank(devType))
             criteria.add(Restrictions.eq("devType",devType));
 
         criteria.add(Restrictions.eq("active", 1));
@@ -43,6 +43,29 @@
         return pgDeviceDtoList;
     }
 
+    public List<PgDeviceDto> getAllDev(String road,String partition,String devType) {
+
+        Criteria criteria = createCriteria(PgDevice.class);
+
+        if(StringUtils.isNotBlank(road))
+            criteria.add(Restrictions.eq("road",road));
+        if(StringUtils.isNotBlank(partition))
+            criteria.add(Restrictions.eq("partition",partition));
+        if(StringUtils.isNotBlank(devType))
+            criteria.add(Restrictions.like("devType","%"+devType+"%"));
+
+        criteria.add(Restrictions.eq("active", 1));
+        criteria.addOrder(Order.desc("id"));
+        List<PgDevice> pgDeviceList = criteria.list();
+
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
+        for (PgDevice pgDevice : pgDeviceList) {
+            pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
+        }
+
+        return pgDeviceDtoList;
+    }
+
     //根据名字获取当前设备
     public PgDevice getDeviceByAssetCode(String assetCode) {
         Criteria criteria=createCriteria(PgDevice.class);
@@ -56,9 +79,9 @@
     }
 
     //根据类型获取设备列表
-    public List<PgDeviceDto> getDeviceByDevTypee(String devType) {
+    public List<PgDeviceDto> getDeviceByDevType(String devType) {
         Criteria criteria=createCriteria(PgDevice.class);
-        criteria.add(Restrictions.eq("devType",devType));
+        criteria.add(Restrictions.like("devType","%"+devType+"%"));
 
         List<PgDevice> pgDeviceList=criteria.list();
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
@@ -106,7 +129,7 @@
         criteria.add(Restrictions.eq("partition",partition));
 
         List<PgDevice> pgDeviceList=criteria.list();
-        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<PgDeviceDto>();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
 
         for (PgDevice pgDevice : pgDeviceList) {
             pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
index 3a3bccd..595730e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
@@ -1,10 +1,13 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.devTable.domain.PgAlarmType;
 import com.casic.PgInterface.devTable.domain.PgPartition;
 import com.casic.PgInterface.devTable.domain.PgRoad;
 import com.casic.PgInterface.devTable.domain.PipeGallery;
 import com.casic.PgInterface.devTable.dto.PgPartitionDto;
+import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
@@ -12,7 +15,9 @@
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Created by yxw on 2017/11/4.
@@ -21,7 +26,8 @@
 public class PgPartitionManager extends HibernateEntityDao<PgPartition> {
 
     @Resource
-    PgRoadManager pgRoadManager;
+    private PgRoadManager pgRoadManager;
+
 
     public PgPartition getPartitionByParName(String parName) {
         Criteria criteria = getSession().createCriteria(PgPartition.class);
@@ -99,4 +105,5 @@
         return pgPartitionDtoList;
     }
 
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
index f216360..a6928f1 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
@@ -5,6 +5,7 @@
 public class PgPlanResultRe {
 
     private String taskKey;
+    private List<String> pileAcuList;
     private List<PgPlanResult> pgPlanResultList;
 
     public String getTaskKey() {
@@ -15,6 +16,14 @@
         this.taskKey = taskKey;
     }
 
+    public List<String> getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(List<String> pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+
     public List<PgPlanResult> getPgPlanResultList() {
         return pgPlanResultList;
     }
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
index 71ea765..47eea07 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
@@ -54,9 +54,7 @@
 
         List<PgLineHole> pgLineHoleList=criteria.list();
         List<PgLineHoleDTO> pgLineHoleDTOList=new ArrayList<>();
-        if(pgLineHoleList==null||pgLineHoleList.size()==0)
-            return null;
-        else
+        if(pgLineHoleList!=null&&pgLineHoleList.size()!=0)
             pgLineHoleDTOList=PgLineHoleDTO.ConvertToDTOList(pgLineHoleList,pgPileAcuManager,pgRoadManager);
         return pgLineHoleDTOList;
     }
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
index 0fd9e1f..841a386 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
@@ -1,12 +1,15 @@
 package com.casic.PgInterface.intelPlan.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.devTable.domain.PgPartition;
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
 import com.casic.PgInterface.intelPlan.domain.PgLineHole;
 import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
 import com.casic.PgInterface.intelPlan.domain.PgSection;
 import com.casic.PgInterface.intelPlan.dto.PgPlanResult;
 import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
 import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -22,6 +25,9 @@
     @Resource
     private PgLineHoleManager pgLineHoleManager;
 
+    @Resource
+    private PgRoadManager pgRoadManager;
+
     public PgPileAcu getPgPileAcuByCode(String acuCode){
         List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
 
@@ -58,7 +64,9 @@
         for(PgPlanTask pgPlanTask:pgPlanTaskList){
             List<PgPlanResult> pgPlanResultList=getPgPlanResultByPlantask(pgPlanTask);
             PgPlanResultRe pgPlanResultRe=new PgPlanResultRe();
+
             pgPlanResultRe.setTaskKey(pgPlanTask.getTaskKey());
+            pgPlanResultRe.setPileAcuList(pgPlanTask.getPileAcuList());
             pgPlanResultRe.setPgPlanResultList(pgPlanResultList);
 
             pgPlanResultReList.add(pgPlanResultRe);
@@ -142,4 +150,57 @@
         return length;
     }
 
+    private PgPileAcu getPgPileAcuByAcuCode(String acuCode){
+        List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
+
+        if(pgPileAcuList==null||pgPileAcuList.size()==0)
+            return null;
+        else
+            return pgPileAcuList.get(0);
+    }
+
+    public List<PgAcuTask> getACUTask(String pileAcuList){
+        String[] acuArray=pileAcuList.split(",");
+        List<PgAcuTask> pgAcuTaskList=new ArrayList<>();
+
+        for(String acu:acuArray){
+            PgPileAcu pgPileAcu=this.getPgPileAcuByCode(acu);
+            String roadName=pgRoadManager.get(pgPileAcu.getRoadId()).getRoadName();
+
+            if(!containRoad(roadName,pgAcuTaskList))
+            {
+                PgAcuTask pgAcuTask=new PgAcuTask();
+                pgAcuTask.setRoadName(roadName);
+                pgAcuTask.setPileAcuList(acu);
+                pgAcuTaskList.add(pgAcuTask);
+            }
+            else{
+                PgAcuTask pgAcuTask=getIndexRoad(roadName,pgAcuTaskList);
+                if(pgAcuTask!=null)
+                    pgAcuTask.setPileAcuList(pgAcuTask.getPileAcuList()+","+acu);
+            }
+        }
+
+        return pgAcuTaskList;
+    }
+
+    private boolean containRoad(String roadName,List<PgAcuTask> pgAcuTaskList){
+        if(pgAcuTaskList==null||pgAcuTaskList.size()==0) return false;
+        for(PgAcuTask pgAcuTask:pgAcuTaskList){
+            if(pgAcuTask.getRoadName().equals(roadName))
+                return true;
+        }
+
+        return false;
+    }
+
+    private PgAcuTask getIndexRoad(String roadName, List<PgAcuTask> pgAcuTaskList){
+        for(PgAcuTask pgAcuTask:pgAcuTaskList){
+            if(pgAcuTask.getRoadName().equals(roadName))
+                return pgAcuTask;
+        }
+
+        return null;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java
new file mode 100644
index 0000000..323f7ef
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java
@@ -0,0 +1,25 @@
+package com.casic.PgInterface.reservePlan.dto;
+
+import java.util.List;
+
+public class PgAcuTask {
+
+    private String roadName;//道路
+    private String pileAcuList;//acu分区
+
+    public String getRoadName() {
+        return roadName;
+    }
+
+    public void setRoadName(String roadName) {
+        this.roadName = roadName;
+    }
+
+    public String getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(String pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
index c25e926..c7d7693 100644
--- a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
@@ -70,9 +70,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(Long.valueOf(inPgPersonId));
         PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("hostName",pgInPgPerson.getAssetCode());
-//        PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode());
-//        long maxId = pgTagPositionManager.getMaxId(pgTagMac.getTagMac());
-//        PGTagPosition pgTagPosition = pgTagPositionManager.get(maxId);
+
         PGTagPosition pgTagPosition = tagmacRun.GetTagStatus(pgTagMac);
         boolean bExist = false;
         bExist = pgTagPositionManager.findTagPosition(pgTagPosition.getPositionUpdatetime(),pgTagPosition.getHostId());
@@ -104,8 +102,7 @@
         PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(Long.valueOf(inPgPersonId));
         PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pgInPgPersonId",pgInPgPerson);
         System.out.println("time:"+pgInPgStatus.getInTime());
-//        PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pgInPgPersonId",inPgPersonId);
-//        PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode());
+
         PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("hostName",pgInPgPerson.getAssetCode());
 
         Map<Object,Object> mapPosition = new HashMap<>();
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
index 082ba5d..3eed00a 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
@@ -48,6 +48,7 @@
     public Map<String, Object> linkDevice(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         PgDeviceDto pgDeviceDto = null;
         try {
@@ -62,6 +63,7 @@
                     else {
                         pgDeviceDto = new PgDeviceDto(pgDevice);
                         msg = "报警关联设备获取成功";
+                        code="200";
                     }
                 }
             }
@@ -71,6 +73,7 @@
             e.printStackTrace();
             msg = "获取关联设备失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceDto);
 
@@ -86,6 +89,7 @@
     public Map<String, Object> linkPartitionCamera(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
         try {
@@ -106,6 +110,7 @@
 
                         pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(partition,position);
                         msg = "关联设备获取成功";
+                        code="200";
                     }
                 }
             }
@@ -115,6 +120,7 @@
             e.printStackTrace();
             msg = "分区设备关联失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceDtoList);
         return resultMap;
@@ -129,6 +135,7 @@
     public Map<String, Object> linkReservePlan(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgReservePlanDto> pgReservePlanDtoList=new ArrayList<>();
         try{
@@ -139,10 +146,12 @@
                 else {
                     pgReservePlanDtoList = pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
 
-                    if(pgReservePlanDtoList==null||pgReservePlanDtoList.size()==0)
-                        msg="不存在关联的报警预案";
-                    else
+                    if (pgReservePlanDtoList == null || pgReservePlanDtoList.size() == 0)
+                        msg = "不存在关联的报警预案";
+                    else {
                         msg = "关联预案获取成功";
+                        code="200";
+                    }
                 }
             }
             else
@@ -153,6 +162,7 @@
             e.printStackTrace();
             msg="预案关联失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgReservePlanDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
index 0ddbc4d..0ce886b 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
@@ -41,25 +41,19 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getAlarmList(@FormParam("alarmType") String alarmType,
                                             @FormParam("startDay") String startDay,
+                                            @FormParam("partition") String partition,
                                             @FormParam("endDay") String endDay,
                                             @FormParam("isNew") String isNew,
                                             @FormParam("page") int page,
                                             @FormParam("rows") int rows) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
         try {
-            pgAlarmDtoList = pgAlarmManager.getAllAlarm(alarmType,startDay,endDay,isNew,page,rows);
-            if (pgAlarmDtoList==null||pgAlarmDtoList.size() == 0)
-                msg = "没有报警信息";
-            else
-                msg = "报警信息获取成功";
+            resultMap = pgAlarmManager.getAllAlarm(alarmType,partition,startDay,endDay,isNew,page,rows);
+
         } catch (Exception e) {
             e.printStackTrace();
-            msg = "报警信息获取失败";
         }
-        resultMap.put("msg", msg);
-        resultMap.put("result", pgAlarmDtoList);
         return resultMap;
     }
 
@@ -71,9 +65,10 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> clearAlarmList(@FormParam("id") String id) throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        String result = "false";
+        String result = "";
+        String code="0";
 
         try {
             PgAlarm pgAlarm = new PgAlarm();
@@ -86,12 +81,14 @@
                 pgAlarmManager.save(pgAlarm);
                 msg = "报警信息清除成功";
                 result = "true";
+                code = "200";
             }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警信息清除失败";
             result = "false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
@@ -106,21 +103,26 @@
     public Map<String, Object> getAlarmByTypeOrTime(@FormParam("alarmType") String alarmType,
                                                     @FormParam("startTime") String startTime,
                                                     @FormParam("endTime") String endTime) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
-        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<PgAlarmDto>();
+        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
         try {
             pgAlarmDtoList = pgAlarmManager.getAlarmByTypeAndTime(alarmType, startTime, endTime);
             if (pgAlarmDtoList == null || pgAlarmDtoList.size() == 0)
                 msg = "报警信息不存在";
             else
+            {
                 msg = "报警信息获取成功";
+                code="200";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警信息获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
index 29ce8a4..ed0bf34 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
@@ -39,8 +39,8 @@
     public Map<String, Object> getAlarmRule(@FormParam("devType") String devType) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
-        System.out.println("devType:"+devType);
         List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<>();
         try {
             pgAlarmRuleDtoList = pgAlarmRuleManager.getAlarmRuleDto(devType);
@@ -52,6 +52,7 @@
             e.printStackTrace();
             msg = "报警阈值信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmRuleDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
index 24ab894..abef1b1 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
@@ -39,16 +39,21 @@
                                                      @FormParam("endDate") String endDate)throws Exception{
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
+
         List<PgAlarmTjDto> pgAlarmTjDtoList=null;
         try{
             pgAlarmTjDtoList=pgAlarmTjManager.getAlarmTjResultByType(startDate,endDate);
             msg="获取成功";
+            code="200";
         }
         catch(Exception ex) {
             msg = "统计失败";
         }
-        resultMap.put("result",pgAlarmTjDtoList);
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
+        resultMap.put("result",pgAlarmTjDtoList);
+
         return resultMap;
     }
 
@@ -61,23 +66,27 @@
     public Map<String, Object> getAlarmByTime(@FormParam("startTime") String startTime,
                                               @FormParam("endTime") String endTime,
                                               @FormParam("statisticType") String statisticType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code = "0";
 
-        List<PgAlarmTjDto> pgAlarmTjDtoList = new ArrayList<PgAlarmTjDto>();
+        List<PgAlarmTjDto> pgAlarmTjDtoList = new ArrayList<>();
         try {
             pgAlarmTjDtoList = pgAlarmTjManager.getAlarmByTime(startTime, endTime, statisticType);
             if(pgAlarmTjDtoList==null)
                 msg="报警统计信息获取失败";
-            else
-                msg="报警统计信息获取成功";
+            else {
+                msg = "报警统计信息获取成功";
+                code="200";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警统计信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmTjDtoList);
         return resultMap;
     }
 
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
index 28bc811..b6278a9 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
@@ -30,7 +30,6 @@
     @Resource
     private PgAlarmTypeManager pgAlarmTypeManager;
 
-
     /**
      * 获取报警类型
      */
@@ -38,19 +37,24 @@
     @Path("getAlarmType")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getAlarmTypeList()throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
-        List<PgAlarmTypeDto> pgAlarmTypeDtoList=new ArrayList<PgAlarmTypeDto>();
+        String code="";
+
+        List<PgAlarmTypeDto> pgAlarmTypeDtoList=new ArrayList<>();
         try {
             pgAlarmTypeDtoList = pgAlarmTypeManager.getAllAlarmTypeDto();
             if(pgAlarmTypeDtoList.size()==0)
                 msg="没有报警类型信息";
-            else
-                msg="报警类型信息获取成功";
+            else {
+                code="200";
+                msg = "报警类型信息获取成功";
+            }
         }catch(Exception e){
             e.printStackTrace();
             msg="报警类型信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAlarmTypeDtoList);
         return resultMap;
@@ -66,6 +70,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
@@ -83,6 +88,7 @@
                 logger.info("成功保存");
                 result = "true";
                 msg = "保存成功";
+                code="200";
             }
         } catch (Exception e) {
             result = "false";
@@ -90,6 +96,7 @@
             e.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -106,6 +113,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try{
             if(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
@@ -119,6 +127,7 @@
                 pgAlarmTypeManager.save(pgAlarmType);
                 result = "true";
                 msg = "编辑成功";
+                code="200";
             }
         }
         catch(Exception e)
@@ -128,6 +137,7 @@
             e.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("result",result);
         resultMap.put("msg",msg);
 
@@ -146,6 +156,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
         String result="false";
+        String code="0";
 
         try {
             PgAlarmType pgAlarmType=pgAlarmTypeManager.get(Long.valueOf(id));
@@ -157,6 +168,7 @@
             {
                 pgAlarmType.setActive(0);
                 pgAlarmTypeManager.save(pgAlarmType);
+                code="200";
                 msg="报警类型删除成功";
                 result="true";
             }
@@ -165,6 +177,7 @@
             msg="报警类型删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
index 4533e1a..85940bb 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
@@ -33,12 +33,15 @@
                                                  @FormParam("inSpectionPlace") String inSpectionPlace){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
         List<PgAssetPlanDto> pgAssetPlanDtoList=new ArrayList<>();
         try{
             pgAssetPlanDtoList=pgAssetPlanManager.getPgAssetPlanDtoList(startDay,endDay,inSpectionPlace);
-            if(pgAssetPlanDtoList!=null&&pgAssetPlanDtoList.size()!=0)
-                msg="巡检信息获取成功";
+            if(pgAssetPlanDtoList!=null&&pgAssetPlanDtoList.size()!=0) {
+                code="200";
+                msg = "巡检信息获取成功";
+            }
             else
                 msg="不存在巡检信息";
         }
@@ -47,6 +50,7 @@
             msg="巡检信息获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAssetPlanDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
index 47ef9d1..5cbdfcb 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
@@ -30,12 +30,15 @@
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
         String result="";
+        String code="0";
 
         List<PgAssetPlanStatic> pgAssetPlanStaticList = null;
         try{
             pgAssetPlanStaticList=pgAssetPlanManager.getPgAssetPlanStaticLisByTime(startTime,endTime,staticType);
-            if(pgAssetPlanStaticList!=null&&pgAssetPlanStaticList.size()!=0)
-                msg="巡检统计信息获取成功";
+            if(pgAssetPlanStaticList!=null&&pgAssetPlanStaticList.size()!=0) {
+                code = "200";
+                msg = "巡检统计信息获取成功";
+            }
             else
                 msg="统计信息获取失败";
         }
@@ -44,6 +47,7 @@
             msg="统计失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAssetPlanStaticList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
index 26f5d6a..503bfe3 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
@@ -40,6 +40,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="";
 
         try{
             PgAuthority pgAuthority=new PgAuthority();
@@ -50,6 +51,7 @@
 
             pgAuthorityManager.save(pgAuthority);
             msg="用户权限保存成功";
+            code="200";
             result="true";
         }
         catch(Exception e) {
@@ -57,6 +59,7 @@
             msg = "新增权限失败";
             result = "false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -65,22 +68,25 @@
 
     /*
        *编辑角权限信息
-        */
+    */
     @POST
     @Path("editAuthority")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> editAuthority(@FormParam("id") String id,
                                        @FormParam("authority") String authority,
                                        @FormParam("concent") String concent) throws Exception{
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
+
         try {
             PgAuthority pgAuthority=pgAuthorityManager.get(Long.valueOf(id));
             pgAuthority.setAuthority(authority);
             pgAuthority.setConcent(concent);
 
             pgAuthorityManager.save(pgAuthority);
+            code="200";
             msg="权限保存成功";
             result="true";
         }
@@ -90,7 +96,7 @@
             msg="权限编辑失败";
             result="false";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -105,9 +111,10 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> deleteAuthority(@FormParam("id") String id)throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
-        String result="false";
+        String result="";
+        String code="0";
 
         try {
             PgAuthority pgAuthority= pgAuthorityManager.get(Long.valueOf(id));
@@ -119,6 +126,7 @@
             {
                 pgAuthority.setActive(0);
                 pgAuthorityManager.save(pgAuthority);
+                code="200";
                 msg="删除权限成功";
                 result="true";
             }
@@ -127,37 +135,40 @@
             msg="删除权限失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
     }
 
     /*
-* 获取权限信息
- */
+    * 获取权限信息
+    */
     @POST
     @Path("getAuthorityList")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> getAuthorityList() {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgAuthorityDto> pgAuthorityDtoList = new ArrayList<PgAuthorityDto>();
         try {
             pgAuthorityDtoList = pgAuthorityManager.getAuthorityList();
             if (pgAuthorityDtoList == null)
                 msg = "不存在权限信息";
-            else
+            else {
+                code = "200";
                 msg = "权限信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "权限信息获取是失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAuthorityDtoList);
         return resultMap;
     }
 
 
-
-
 }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
index a9ef521..a74ecc7 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
@@ -45,6 +45,7 @@
                                                @FormParam("endDate") String endDate)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgHistoryDataDto> pgHistoryDataDtoList=new ArrayList<>();
 
         try {
@@ -55,13 +56,16 @@
                 pgHistoryDataDtoList=pgCh4Manager.getAllCH4Data(pgDevice,startDate,endDate);
                 if(pgHistoryDataDtoList==null)
                     msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+                else {
+                    code = "200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgHistoryDataDtoList);
         return resultMap;
@@ -75,8 +79,9 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getNewestCh4InfoByDev(@FormParam("assetCode") String assetCode)throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
+        String code="0";
         PgCh4Dto pgCh4Dto=new PgCh4Dto(null);
 
         try {
@@ -87,13 +92,17 @@
                 pgCh4Dto=pgCh4Manager.getNewestCH4Data(pgDevice);
                 if(pgCh4Dto==null)
                     msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgCh4Dto);
         return resultMap;
@@ -111,6 +120,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
@@ -127,6 +137,7 @@
                 pgCh4.setPgDeviceId(pgDevice);
 
                 pgCh4Manager.save(pgCh4);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -135,7 +146,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
index a7eac39..dfc8ca5 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
@@ -43,23 +43,27 @@
                                                       @FormParam("endDate") String endDate)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgHistoryDataDto> pgHistoryDataDtoList=new ArrayList<>();
 
         try {
             PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
                 msg="设备不存在";
-            else{
-                pgHistoryDataDtoList=pgCoManager.getAllCoData(pgDevice, startDate, endDate);
-                if(pgHistoryDataDtoList==null)
-                    msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+            else {
+                pgHistoryDataDtoList = pgCoManager.getAllCoData(pgDevice, startDate, endDate);
+                if (pgHistoryDataDtoList == null)
+                    msg = "没有满足要求的数据";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgHistoryDataDtoList);
         return resultMap;
@@ -75,6 +79,7 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         PgCoDto pgCoDto=new PgCoDto(null);
 
         try {
@@ -85,13 +90,16 @@
                 pgCoDto=pgCoManager.getNewestCoData(pgDevice);
                 if(pgCoDto==null)
                     msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgCoDto);
         return resultMap;
@@ -110,6 +118,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         try {
@@ -126,6 +135,7 @@
 
                 pgCoManager.save(pgCo);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
         } catch (Exception e) {
@@ -133,7 +143,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
index b4b826e..9af98a3 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
@@ -60,6 +60,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         try {
 
@@ -80,8 +81,8 @@
                 pgConstruction.setPgConstructionTypeId(pgConstructionType.getId());
                 pgConstruction.setActive(1);
                 pgConstruction.setParName(parName);
-                logger.info("保存成功");
                 pgConstructionManager.save(pgConstruction);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -90,6 +91,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("success", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -116,6 +118,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
@@ -140,6 +143,7 @@
                 pgConstruction.setParName(parName);
 
                 pgConstructionManager.save(pgConstruction);
+                code="200";
                 result = "true";
                 msg = "编辑成功";
             }
@@ -150,7 +154,7 @@
             e.printStackTrace();
 
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -167,6 +171,8 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
+
         try {
             PgConstruction pgConstruction = pgConstructionManager.get(Long.valueOf(id));
             if (pgConstruction == null)
@@ -177,6 +183,7 @@
             {
                 pgConstruction.setActive(0);
                 pgConstructionManager.save(pgConstruction);
+                code="200";
                 result = "true";
                 msg = "成功删除信息";
             }
@@ -185,6 +192,7 @@
             result = "false";
             msg = "删除失败";
         }
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -204,9 +212,11 @@
                                                   @FormParam("rows") int rows)throws Exception{
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
         List<PgConstructionDto> pgConstructionDtoList=new ArrayList<>();
         try{
             pgConstructionDtoList=pgConstructionManager.getPgContructionDto(cs_name,cs_type,startTime,endTime,page,rows);
+            code="200";
             msg="信息获取成功";
         }
         catch(Exception e)
@@ -214,6 +224,7 @@
             e.printStackTrace();
             msg="查询失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
 
@@ -231,18 +242,22 @@
                                                               @FormParam("statisticType") String statisticType) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgConstructionStiatistic> pgConstructionStiatisticList=new ArrayList<>();
         try {
             pgConstructionStiatisticList = pgConstructionManager.getConstructionByTimeAndStatus(startTime, endTime, statisticType);
             if(pgConstructionStiatisticList==null)
                 msg="施工统计信息获取失败";
-            else
-                msg="施工统计信息获取成功";
+            else {
+                code="200";
+                msg = "施工统计信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "施工统计信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgConstructionStiatisticList);
         return resultMap;
@@ -257,6 +272,7 @@
     public Map<String, Object> getConstructionByType(@FormParam("statisticType") String statisticType){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
         List<PgConstructionStiatistic> pgConstructionStiatisticList=new ArrayList<>();
 
         try{
@@ -268,6 +284,7 @@
                 resultMap.put("result",null);
             }
             else {
+                code="200";
                 msg = "统计信息获取成功";
                 resultMap.put("result", pgConstructionStiatisticList);
             }
@@ -278,6 +295,7 @@
             msg="统计失败";
             resultMap.put("result",null);
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         return resultMap;
     }
@@ -291,9 +309,11 @@
     public Map<String, Object> getConstructionToday() throws Exception{
         Map<String,Object> resultMap=new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgConstructionDto> pgConstructionDtoList=new ArrayList<PgConstructionDto>();
         try {
             pgConstructionDtoList = pgConstructionManager.getConstructionToday();
+            code="200";
             msg = "当天施工信息获取成功";
         }
         catch(Exception e)
@@ -301,7 +321,7 @@
             e.printStackTrace();
             msg="获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
         return resultMap;
@@ -316,6 +336,7 @@
     public Map<String, Object> getConstructionDev(@FormParam("id") String id) throws Exception{
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
         List<PgDeviceDto> pgDeviceDtoList =new ArrayList<>();
         try{
@@ -325,14 +346,17 @@
 
             if(pgDeviceDtoList==null)
                 msg="信息获取失败";
-            else
-                msg="信息获取成功";
+            else {
+                code="200";
+                msg = "信息获取成功";
+            }
         }
         catch(Exception e)
         {
             e.printStackTrace();
-            msg="设备信息获取成功";
+            msg="信息获取是被";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgDeviceDtoList);
 
@@ -346,17 +370,21 @@
     @Path("getConstruction")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getConstruction() throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
-        List<PgConstructionDto> pgConstructionDtoList=new ArrayList<PgConstructionDto>();
+        String code="0";
+
+        List<PgConstructionDto> pgConstructionDtoList=new ArrayList<>();
 
         try{
             pgConstructionDtoList=pgConstructionManager.getPgConstructionList();
             if(pgConstructionDtoList==null||pgConstructionDtoList.size()==0)
                 msg="不存在施工记录";
-            else
-                msg="施工信息获取成功";
+            else {
+                code = "200";
+                msg = "施工信息获取成功";
+            }
         }
         catch(Exception e)
         {
@@ -364,6 +392,7 @@
             msg="施工信息获取失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java
index fd3d53e..2019502 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java
@@ -39,12 +39,12 @@
         try {
             pgConstructionTypeDtoList = pgConstructionTypeManager.getAllConstructionTypeDto();
             if (pgConstructionTypeDtoList.size() == 0)
-                msg = "没有项目类型信息";
+                msg = "获取失败";
             else
-                msg = "项目类型获取成功";
+                msg = "获取成功";
         } catch (Exception e) {
             e.printStackTrace();
-            msg = "项目类型信息获取失败";
+            msg = "获取失败";
         }
         resultMap.put("msg", msg);
         resultMap.put("result", pgConstructionTypeDtoList);
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
index 90d001c..037a399 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
@@ -51,6 +51,7 @@
 
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if (StringUtils.isBlank(construct_doc)||StringUtils.isBlank(doc_name))
@@ -65,6 +66,7 @@
             pgCsDocument.setActive(1);
             pgCsDocumentManager.save(pgCsDocument);
 
+            code="200";
             result = "true";
             msg = "保存成功";
 
@@ -74,6 +76,7 @@
             ex.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("success", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -90,6 +93,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             PgCsDocument pgCsDocument = pgCsDocumentManager.get(Long.valueOf(id));
@@ -103,6 +107,7 @@
 
                 pgCsDocumentManager.save(pgCsDocument);
 
+                code="200";
                 result = "true";
                 msg = "编辑成功";
             }
@@ -112,6 +117,7 @@
             msg = "编辑失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -125,9 +131,9 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
         String result="";
+        String code="0";
 
         try{
-
             PgCsDocument pgCsDocument = pgCsDocumentManager.get(Long.valueOf(id));
             if(pgCsDocument==null)
             {
@@ -137,6 +143,7 @@
             else{
                 pgCsDocument.setActive(0);
                 pgCsDocumentManager.save(pgCsDocument);
+                code="200";
                 result="true";
                 msg="删除成功";
             }
@@ -147,7 +154,7 @@
             msg="预案删除失败";
             result="false";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -168,18 +175,21 @@
 
         String msg="";
         String result="";
+        String code="0";
 
         try {
             pgCsDocumentDtoList = pgCsDocumentManager.getAllDocData(cs_name);
-            if (pgCsDocumentDtoList != null)
+            if (pgCsDocumentDtoList != null) {
+                code="200";
                 msg = "获取数据成功";
+            }
             else
                 msg = "没有满足条件的数据";
         }catch (Exception e){
             e.printStackTrace();
             msg = "获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgCsDocumentDtoList);
         return resultMap;
@@ -192,20 +202,22 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
 
         String msg = "";
+        String code="0";
         ResponseEntity<byte[]> path = null;
         try {
             PgCsDocument pgCsDocument = pgCsDocumentManager.get(Long.valueOf(id));
             path = pgCsDocumentManager.downloadFile(pgCsDocument);
             if (path == null)
                 msg = "不存在该文档";
-            else
+            else {
+                code = "200";
                 msg = "下载成功";
-
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "下载失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", path.getBody());
         resultMap.put("msg", msg);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
index 94c5c84..ffc8b95 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
@@ -41,22 +41,24 @@
     public Map<String, Object> getPgDeviceByDevType(@FormParam("devType") String devType) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
         try {
-            pgDeviceDtoList = pgDeviceManager.getDeviceByDevTypee(devType);
+            pgDeviceDtoList = pgDeviceManager.getDeviceByDevType(devType);
             if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0){
                 msg="不存在满足要求的数据";
-                resultMap.put("result",null);
             }
             else{
-                resultMap.put("result", pgDeviceDtoList);
+                code="200";
                 msg = "获取成功";
             }
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", pgDeviceDtoList);
         return resultMap;
     }
 
@@ -69,25 +71,26 @@
     public Map<String, Object> getPgDeviceByAssetCode(@FormParam("assetCode") String assetCode) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         PgDeviceDto pgDeviceDto=null;
         try {
             PgDevice pgDevice = pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
             {
                 msg="不存在设备信息";
-                resultMap.put("result",null);
             }
             else {
                 pgDeviceDto = new PgDeviceDto(pgDevice);
                 msg = "获取成功";
-                resultMap.put("result", pgDeviceDto);
+                code="200";
             }
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", pgDeviceDto);
         return resultMap;
     }
 
@@ -102,27 +105,61 @@
                                              @FormParam("devType") String devType)throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
         try {
             pgDeviceDtoList = pgDeviceManager.getAllDevice(road,partition,devType);
             if(pgDeviceDtoList.size()==0) {
                 msg = "没有找到设备信息";
-                resultMap.put("result",null);
             }
             else {
                 msg = "设备信息获取成功";
-                resultMap.put("result", pgDeviceDtoList);
+                code="200";
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result", pgDeviceDtoList);
         return resultMap;
     }
 
     /**
+     * 显示设备列表
+     */
+    @POST
+    @Path("getPgDev")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String, Object> getPgDev(@FormParam("road") String road,
+                                             @FormParam("partition") String partition,
+                                             @FormParam("devType") String devType)throws Exception {
+        Map<String, Object> resultMap = new HashMap<>();
+        String msg="";
+        String code="0";
+        List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
+        try {
+            pgDeviceDtoList = pgDeviceManager.getAllDev(road,partition,devType);
+            if(pgDeviceDtoList.size()==0) {
+                msg = "没有找到设备信息";
+            }
+            else {
+                code="200";
+                msg = "设备信息获取成功";
+            }
+        }catch(Exception e){
+            e.printStackTrace();
+            msg="设备信息获取失败";
+        }
+        resultMap.put("code",code);
+        resultMap.put("msg",msg);
+        resultMap.put("result", pgDeviceDtoList);
+        return resultMap;
+    }
+
+
+    /**
      * 新增设备
      */
     @POST
@@ -145,6 +182,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if (pgDeviceManager.getDeviceByAssetCode(assetCode)!=null) {
@@ -169,6 +207,7 @@
 
                 pgDeviceManager.save(pgDevice);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
 
@@ -177,10 +216,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -208,14 +246,9 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
-            /*
-            if (pgDeviceManager.getDeviceByAssetCode(assetCode)!=null) {
-                result = "false";
-                msg = "已存在同名设备";
-            } else {
-            */
             PgDevice pgDevice = pgDeviceManager.get(Long.valueOf(id));
             pgDevice.setPipeGallery(pipeGallery);
             pgDevice.setPartition(partition);
@@ -233,14 +266,14 @@
 
             pgDeviceManager.save(pgDevice);
             result = "true";
+            code="200";
             msg = "编辑成功";
-            //}
         } catch (Exception e) {
             result = "false";
             msg = "编辑失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("result",result);
         resultMap.put("msg",msg);
         return resultMap;
@@ -256,7 +289,8 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
-        String result="false";
+        String result="";
+        String code="0";
 
         try {
             PgDevice pgDevice=pgDeviceManager.get(Long.valueOf(id));
@@ -268,6 +302,7 @@
             {
                 pgDevice.setActive(0);
                 pgDeviceManager.save(pgDevice);
+                code="200";
                 msg="设备删除成功";
                 result="true";
             }
@@ -276,6 +311,7 @@
             msg="设备删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -291,18 +327,18 @@
     {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         PgDeviceDto pgDeviceDto=null;
 
         try{
             PgDevice pgDevice=pgDeviceManager.getDeviceBydevCode(devCode);
             if(pgDevice==null) {
                 msg = "设备信息获取失败";
-                resultMap.put("result",null);
             }
             else{
                 pgDeviceDto = new PgDeviceDto(pgDevice);
                 msg = "设备信息获取成功";
-                resultMap.put("result",pgDeviceDto);
+                code="200";
             }
         }
         catch(Exception ex)
@@ -310,8 +346,9 @@
             ex.printStackTrace();
             msg="设备状态获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgDeviceDto);
         return resultMap;
     }
 
@@ -324,17 +361,17 @@
     public Map<String,Object> getDeviceByPartition(@FormParam("partition") String partition) throws Exception{
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<PgDeviceDto>();
 
         try{
             pgDeviceDtoList=pgDeviceManager.getPgDeviceDtoListByPartition(partition);
             if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0) {
                 msg = "设备信息获取失败";
-                resultMap.put("result",null);
             }
             else {
+                code="200";
                 msg = "设备信息获取成功";
-                resultMap.put("result",pgDeviceDtoList);
             }
         }
         catch(Exception e)
@@ -342,8 +379,9 @@
             e.printStackTrace();
             msg="设备信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgDeviceDtoList);
         return resultMap;
     }
 
@@ -353,17 +391,16 @@
     public Map<String,Object> getDeviceByOldDAssetCodeCode(@FormParam("assetCode") String assetCode) throws Exception{
         Map<String, Object> resultMap = new HashMap<>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
 
         try{
             pgDeviceDtoList=pgDeviceManager.getDeviceByOldDAssetCodeCode(assetCode);
-            if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0) {
-                msg = "设备信息获取失败";;
-                resultMap.put("result",null);
-            }
+            if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0)
+                msg = "设备信息获取失败";
             else {
                 msg = "设备信息获取成功";
-                resultMap.put("result",pgDeviceDtoList);
+                code="200";
             }
         }
         catch(Exception e)
@@ -372,8 +409,9 @@
             msg="设备信息获取失败";
             resultMap.put("result",null);
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgDeviceDtoList);
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java
index 421d249..f6f167d 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java
@@ -38,17 +38,21 @@
     public Map<String, Object> getDeviceTpeyList()throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgDeviceTypeDto> pgDeviceTypeDtoList=new ArrayList<PgDeviceTypeDto>();
         try {
             pgDeviceTypeDtoList = pgDeviceTypeManager.getAllDeviceType();
             if(pgDeviceTypeDtoList.size()==0)
                 msg="没有找到设备类型信息";
-            else
-                msg="设备类型信息获取成功";
+            else {
+                code="200";
+                msg = "设备类型信息获取成功";
+            }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备类型信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgDeviceTypeDtoList);
         return resultMap;
@@ -66,6 +70,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if (pgDeviceTypeManager.getDeviceTypeByDeType(devType)!=null) {
@@ -79,6 +84,7 @@
 
                 pgDeviceTypeManager.save(pgDeviceType);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
 
@@ -87,10 +93,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 25ded8a..283d7ab 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,20 +7,56 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" 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/construction/manager/PgCsDocumentManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/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/manager/PgAlarmManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/~$说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/~$说明20191207.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.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$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/接口说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明20191207.docx" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
@@ -51,7 +87,7 @@
         <counts>
           <entry key="class" value="4" />
           <entry key="iml" value="2" />
-          <entry key="java" value="707" />
+          <entry key="java" value="820" />
           <entry key="properties" value="14" />
           <entry key="xml" value="7" />
         </counts>
@@ -60,7 +96,7 @@
         <counts>
           <entry key="CLASS" value="4" />
           <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="707" />
+          <entry key="JAVA" value="820" />
           <entry key="Properties" value="14" />
           <entry key="XML" value="7" />
         </counts>
@@ -68,32 +104,32 @@
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
           <entry key="dummy" value="38" />
-          <entry key="java" value="30161" />
+          <entry key="java" value="40859" />
           <entry key="properties" value="100" />
-          <entry key="txt" value="176" />
+          <entry key="txt" value="186" />
           <entry key="xml" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="30161" />
-          <entry key="PLAIN_TEXT" value="214" />
+          <entry key="JAVA" value="40859" />
+          <entry key="PLAIN_TEXT" value="224" />
           <entry key="Properties" value="100" />
           <entry key="XML" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="48" />
+          <entry key="project.closed" value="51" />
           <entry key="project.open.time.1" value="5" />
           <entry key="project.open.time.12" value="2" />
           <entry key="project.open.time.13" value="1" />
           <entry key="project.open.time.15" value="1" />
           <entry key="project.open.time.16" value="1" />
           <entry key="project.open.time.17" value="1" />
-          <entry key="project.open.time.2" value="1" />
+          <entry key="project.open.time.2" value="2" />
           <entry key="project.open.time.20" value="1" />
-          <entry key="project.open.time.23" value="1" />
+          <entry key="project.open.time.23" value="2" />
           <entry key="project.open.time.24" value="2" />
           <entry key="project.open.time.251" value="1" />
           <entry key="project.open.time.27" value="2" />
@@ -106,8 +142,8 @@
           <entry key="project.open.time.36" value="1" />
           <entry key="project.open.time.37" value="1" />
           <entry key="project.open.time.39" value="2" />
-          <entry key="project.open.time.4" value="2" />
-          <entry key="project.open.time.40" value="1" />
+          <entry key="project.open.time.4" value="3" />
+          <entry key="project.open.time.40" value="2" />
           <entry key="project.open.time.41" value="2" />
           <entry key="project.open.time.42" value="2" />
           <entry key="project.open.time.43" value="2" />
@@ -122,23 +158,25 @@
           <entry key="project.open.time.6" value="3" />
           <entry key="project.open.time.63" value="2" />
           <entry key="project.open.time.64" value="1" />
+          <entry key="project.open.time.66" value="1" />
           <entry key="project.open.time.71" value="2" />
+          <entry key="project.open.time.74" value="1" />
           <entry key="project.open.time.76" value="1" />
           <entry key="project.open.time.8" value="2" />
           <entry key="project.open.time.9" value="1" />
           <entry key="project.open.time.97" value="1" />
-          <entry key="project.opened" value="78" />
+          <entry key="project.opened" value="84" />
         </counts>
       </usages-collector>
     </session>
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+            <state relative-caret-position="396">
+              <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
               <folding>
                 <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
                 <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -147,73 +185,6 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <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="99">
-              <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-              <folding>
-                <element signature="imports" expanded="true" />
-                <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-1170">
-              <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state>
-              <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
-              <folding>
-                <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-                <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="true">
-        <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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-              <folding>
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-                <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>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <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="352">
-              <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -225,18 +196,9 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>inCriteria</find>
-      <find>getPgPlanResulList</find>
-      <find>getPileAcuListByPileAcuStr</find>
-      <find>distinct</find>
-      <find>order</find>
-      <find>canPlanLine</find>
-      <find>isExistLine</find>
-      <find>getPlanResult</find>
       <find>pgPipeLine</find>
       <find>getPipeLineBylineName</find>
       <find>StringU</find>
-      <find>getAllAlarm</find>
       <find>getAlarmList</find>
       <find>getPgInPersonListByDay</find>
       <find>getDayInPgStatistic</find>
@@ -254,7 +216,16 @@
       <find>getPgContructionByNameOrType</find>
       <find>&quot;&quot;,&quot;&quot;,</find>
       <find>getPgContructionDtoByNameOrType</find>
+      <find>addConstruction</find>
+      <find>getPgLineAcuHole</find>
+      <find>getPlanResult</find>
       <find>getConstruction</find>
+      <find>addPipeLine</find>
+      <find>未找到入廊数据</find>
+      <find>getCurrentHoleByAcu</find>
+      <find>getAllAlarm</find>
+      <find>getPgDeviceDtoListByPartition</find>
+      <find>getPgDeviceByDevType</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -263,57 +234,57 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlan.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileHoleManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/planData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/PlanData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
       </list>
     </option>
   </component>
@@ -359,7 +330,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -421,53 +391,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="dto" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="manager" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -479,29 +402,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="rs" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -516,6 +416,7 @@
         </subPane>
       </pane>
       <pane id="Scope" />
+      <pane id="PackagesPane" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -710,7 +611,13 @@
       <workItem from="1574902733573" duration="1829000" />
       <workItem from="1574998240004" duration="7016000" />
       <workItem from="1575247959683" duration="6997000" />
-      <workItem from="1575704345590" duration="40473000" />
+      <workItem from="1575704345590" duration="69381000" />
+      <workItem from="1575869479666" duration="721000" />
+      <workItem from="1575947104878" duration="6101000" />
+      <workItem from="1576128264436" duration="3347000" />
+      <workItem from="1576208571543" duration="22000" />
+      <workItem from="1576227513917" duration="862000" />
+      <workItem from="1576293721220" duration="18246000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -817,11 +724,18 @@
       <option name="project" value="LOCAL" />
       <updated>1575775489149</updated>
     </task>
-    <option name="localTasksCounter" value="16" />
+    <task id="LOCAL-00016" summary="整改施工信息">
+      <created>1575791780774</created>
+      <option name="number" value="00016" />
+      <option name="presentableId" value="LOCAL-00016" />
+      <option name="project" value="LOCAL" />
+      <updated>1575791780774</updated>
+    </task>
+    <option name="localTasksCounter" value="17" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="452131000" />
+    <option name="totallyTimeSpent" value="510338000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -834,9 +748,8 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
-    <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.24205749" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2647504" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -847,7 +760,7 @@
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.3295082" />
       <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.4819672" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.65737706" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.3295082" />
@@ -939,7 +852,8 @@
     <MESSAGE value="重新设计智能规划部分" />
     <MESSAGE value="完成智能规划对接" />
     <MESSAGE value="修改报警统计" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改报警统计" />
+    <MESSAGE value="整改施工信息" />
+    <option name="LAST_COMMIT_MESSAGE" value="整改施工信息" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -951,16 +865,10 @@
           <option name="timeStamp" value="3" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java</url>
-          <line>69</line>
+          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java</url>
+          <line>40</line>
           <properties />
-          <option name="timeStamp" value="21" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java</url>
-          <line>96</line>
-          <properties />
-          <option name="timeStamp" value="38" />
+          <option name="timeStamp" value="122" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
@@ -970,394 +878,452 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <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="2068">
-          <caret line="154" column="35" selection-start-line="154" selection-start-column="35" selection-end-line="154" selection-end-column="35" />
-        </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="3300">
-          <caret line="297" column="22" selection-start-line="297" selection-start-column="22" selection-end-line="297" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/StringUtils.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
-          <caret line="13" column="48" lean-forward="true" selection-start-line="13" selection-start-column="48" selection-end-line="13" selection-end-column="48" />
+          <caret line="11" column="5" selection-start-line="11" selection-start-column="5" selection-end-line="11" selection-end-column="5" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="78" lean-forward="true" selection-start-line="78" selection-end-line="78" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="616">
-          <caret line="41" column="1" selection-start-line="41" selection-start-column="1" selection-end-line="41" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="110">
-          <caret line="12" column="23" selection-start-line="12" selection-start-column="23" selection-end-line="12" selection-end-column="23" />
+        <state relative-caret-position="516">
+          <caret line="114" column="12" selection-start-line="114" selection-start-column="12" selection-end-line="114" selection-end-column="12" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="164">
-          <caret line="56" lean-forward="true" selection-start-line="56" selection-end-line="56" />
+        <state relative-caret-position="418">
+          <caret line="33" column="44" selection-start-line="33" selection-start-column="44" selection-end-line="33" selection-end-column="44" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="258">
-          <caret line="27" column="12" lean-forward="true" selection-start-line="27" selection-start-column="12" selection-end-line="27" selection-end-column="12" />
+        <state relative-caret-position="132">
+          <caret line="11" column="20" lean-forward="true" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="20" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.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="-12">
-          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        <state relative-caret-position="516">
+          <caret line="142" column="54" selection-start-line="142" selection-start-column="54" selection-end-line="142" selection-end-column="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="858">
-          <caret line="55" column="27" lean-forward="true" selection-start-line="55" selection-start-column="27" selection-end-line="55" selection-end-column="27" />
+        <state relative-caret-position="66">
+          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="58">
+          <caret line="18" column="28" selection-start-line="18" selection-start-column="19" selection-end-line="18" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="305">
+          <caret line="24" column="31" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="714">
+          <caret line="58" column="5" lean-forward="true" selection-start-line="58" selection-start-column="5" selection-end-line="58" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="924">
+          <caret line="134" column="92" selection-start-line="134" selection-start-column="92" selection-end-line="134" selection-end-column="92" />
+          <folding>
+            <element signature="method#linkDevice#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkPartitionCamera#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkReservePlan#0;class#PgAlarmLinkRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1066">
+          <caret line="90" lean-forward="true" selection-start-line="90" selection-end-line="90" />
+          <folding>
+            <element signature="method#getTjResultByAlarmType#0;class#PgAlarmTjRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="946">
+          <caret line="148" column="11" lean-forward="true" selection-start-line="148" selection-start-column="11" selection-end-line="148" selection-end-column="11" />
+          <folding>
+            <element signature="method#getAlarmTypeList#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#addAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#editAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#deleteAlarmType#0;class#PgAlarmTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="208">
+          <caret line="46" column="23" lean-forward="true" selection-start-line="46" selection-start-column="23" selection-end-line="46" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="113" column="9" lean-forward="true" selection-start-line="113" selection-start-column="9" selection-end-line="113" selection-end-column="9" />
+          <folding>
+            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
+            <element signature="method#getNewestCh4InfoByDev#0;class#PgCh4Rs#0" />
+            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="145" column="6" lean-forward="true" selection-start-line="145" selection-start-column="6" selection-end-line="145" selection-end-column="6" />
+          <folding>
+            <element signature="method#addAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#editAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#deleteAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#getAuthorityList#0;class#PgAuthorityRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="58" column="1" lean-forward="true" selection-start-line="58" selection-start-column="1" selection-end-line="58" selection-end-column="1" />
+          <folding>
+            <element signature="method#getPgAssetPlanList#0;class#PgAssetPlanRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="370">
+          <caret line="371" column="66" selection-start-line="371" selection-start-column="66" selection-end-line="371" selection-end-column="66" />
+          <folding>
+            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#searchConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionDev#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="139" column="13" lean-forward="true" selection-start-line="139" selection-start-column="13" selection-end-line="139" selection-end-column="13" />
+          <folding>
+            <element signature="method#getCoInfoByDevAndDate#0;class#PgCoRs#0" />
+            <element signature="method#getNewestCoInfoByDev#0;class#PgCoRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="540">
+          <caret line="223" column="5" lean-forward="true" selection-start-line="223" selection-start-column="5" selection-end-line="223" selection-end-column="5" />
+          <folding>
+            <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="682">
+          <caret line="100" lean-forward="true" selection-start-line="100" selection-end-line="100" />
+          <folding>
+            <element signature="method#getDeviceTpeyList#0;class#PgDeviceTypeRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="377">
+          <caret line="225" column="35" selection-start-line="225" selection-start-column="35" selection-end-line="225" selection-end-column="35" />
+          <folding>
+            <element signature="method#addEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#addEquipment#1;class#PgEquipmentRs#0" />
+            <element signature="method#getEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#deleteEquipment#0;class#PgEquipmentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="406">
+          <caret line="109" lean-forward="true" selection-start-line="109" selection-end-line="109" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="154">
+          <caret line="28" column="19" selection-start-line="28" selection-start-column="19" selection-end-line="28" selection-end-column="19" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="748">
-          <caret line="49" column="5" lean-forward="true" selection-start-line="49" selection-start-column="5" selection-end-line="49" selection-end-column="5" />
+        <state relative-caret-position="296">
+          <caret line="161" column="35" selection-start-line="161" selection-start-column="35" selection-end-line="161" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="384">
+          <caret line="99" column="5" lean-forward="true" selection-start-line="99" selection-start-column="5" selection-end-line="99" selection-end-column="5" />
+        </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="362">
+          <caret line="340" column="35" selection-start-line="340" selection-start-column="35" selection-end-line="340" selection-end-column="35" />
+          <folding>
+            <element signature="method#addInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPersonInPg#0;class#PgInPgPersonRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-606">
+          <caret line="76" column="20" lean-forward="true" selection-start-line="76" selection-start-column="20" selection-end-line="76" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="65" column="35" selection-start-line="65" selection-start-column="35" selection-end-line="65" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="101" column="35" selection-start-line="101" selection-start-column="35" selection-end-line="101" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="84" column="35" selection-start-line="84" selection-start-column="35" selection-end-line="84" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="59" lean-forward="true" selection-start-line="59" selection-end-line="59" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="60" column="1" lean-forward="true" selection-start-line="60" selection-start-column="1" selection-end-line="60" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="145" column="35" selection-start-line="145" selection-start-column="35" selection-end-line="145" selection-end-column="35" />
+        </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="274">
+          <caret line="350" column="35" selection-start-line="350" selection-start-column="35" selection-end-line="350" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="121" column="39" selection-start-line="121" selection-start-column="39" selection-end-line="121" selection-end-column="39" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="28" column="8" lean-forward="true" selection-start-line="28" selection-start-column="8" selection-end-line="28" selection-end-column="8" />
+        <state relative-caret-position="340">
+          <caret line="103" selection-start-line="103" selection-end-line="103" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="226" column="35" selection-start-line="226" selection-start-column="35" selection-end-line="226" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="203" column="35" selection-start-line="203" selection-start-column="35" selection-end-line="203" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="241" column="35" selection-start-line="241" selection-start-column="35" selection-end-line="241" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="225" column="1" lean-forward="true" selection-start-line="225" selection-start-column="1" selection-end-line="225" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="176" column="5" lean-forward="true" selection-start-line="176" selection-start-column="5" selection-end-line="176" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="178" column="35" lean-forward="true" selection-start-line="178" selection-start-column="35" selection-end-line="178" selection-end-column="35" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="516">
-          <caret line="94" column="53" selection-start-line="94" selection-start-column="53" selection-end-line="94" selection-end-column="53" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="814">
-          <caret line="52" column="9" lean-forward="true" selection-start-line="52" selection-start-column="9" selection-end-line="52" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="182">
-          <caret line="58" column="12" lean-forward="true" selection-start-line="58" selection-start-column="12" selection-end-line="58" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="34" lean-forward="true" selection-start-line="34" selection-end-line="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="32" lean-forward="true" selection-start-line="32" selection-end-line="32" />
-          <folding>
-            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
-            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="185">
-          <caret line="63" column="13" selection-start-line="63" selection-start-column="13" selection-end-line="63" selection-end-column="13" />
-          <folding>
-            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
-            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
-            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="e#6319#6324#0" />
-            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
-          </folding>
+          <caret line="240" lean-forward="true" selection-start-line="240" selection-end-line="240" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
-          <caret line="58" column="28" lean-forward="true" selection-start-line="58" selection-start-column="28" selection-end-line="58" selection-end-column="28" />
-          <folding>
-            <element signature="method#addTempHumData#0;class#PgTempHumRs#0" />
-          </folding>
+        <state relative-caret-position="340">
+          <caret line="148" column="34" selection-start-line="148" selection-start-column="34" selection-end-line="148" selection-end-column="34" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
+        <state relative-caret-position="458">
+          <caret line="99" column="35" selection-start-line="99" selection-start-column="35" selection-end-line="99" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+        <state relative-caret-position="384">
+          <caret line="145" column="32" lean-forward="true" selection-start-line="145" selection-start-column="32" selection-end-line="145" selection-end-column="32" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="414">
-          <caret line="22" column="46" lean-forward="true" selection-start-line="22" selection-start-column="46" selection-end-line="22" selection-end-column="46" />
-        </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="396">
-          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" column="83" selection-start-line="11" selection-start-column="83" selection-end-line="11" selection-end-column="83" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="26">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
-          <folding>
-            <element signature="method#getPgInPgStatusByPerson#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNumByName#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNum#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPersonListByDay#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPgStatusByPgInPgPerson#0;class#PgInPgStatusManager#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="44">
-          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-12">
-          <caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="87" lean-forward="true" selection-start-line="87" selection-end-line="87" />
-          <folding>
-            <element signature="method#getConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#addConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#deleteConstructionType#0;class#PgConstructionTypeRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
-          <folding>
-            <element signature="method#getConstructionTypeByType#0;class#PgConstructionTypeManager#0" />
-            <element signature="method#getAllConstructionTypeDto#0;class#PgConstructionTypeManager#0" />
-          </folding>
-        </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="145">
-          <caret line="258" column="9" lean-forward="true" selection-start-line="258" selection-start-column="9" selection-end-line="258" selection-end-column="9" />
-          <folding>
-            <element signature="method#getMonthInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayInPgStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgOverViewRs#0" />
-            <element signature="method#getAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getMonthAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayAlarmStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgOverViewRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="103">
-          <caret line="105" column="50" lean-forward="true" selection-start-line="105" selection-start-column="50" selection-end-line="105" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateBasicDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="99">
-          <caret line="125" selection-start-line="125" selection-end-line="125" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="190">
-          <caret line="24" column="35" lean-forward="true" selection-start-line="24" selection-start-column="35" selection-end-line="24" selection-end-column="35" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="436">
-          <caret line="24" lean-forward="true" selection-start-line="24" selection-end-line="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" lean-forward="true" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="300">
-          <caret line="34" column="31" lean-forward="true" selection-start-line="34" selection-start-column="31" selection-end-line="34" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="42" column="13" lean-forward="true" selection-start-line="42" selection-start-column="13" selection-end-line="42" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="120" column="72" lean-forward="true" selection-start-line="120" selection-start-column="72" selection-end-line="120" selection-end-column="72" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="293">
-          <caret line="58" column="73" lean-forward="true" selection-start-line="58" selection-start-column="73" selection-end-line="58" selection-end-column="73" />
-          <folding>
-            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
-            <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
-          </folding>
-        </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="307">
-          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
+        <state relative-caret-position="758">
+          <caret line="130" column="5" lean-forward="true" selection-start-line="130" selection-start-column="5" selection-end-line="130" selection-end-column="5" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1170">
-          <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
+        <state relative-caret-position="494">
+          <caret line="86" column="62" lean-forward="true" selection-start-line="86" selection-start-column="62" selection-end-line="86" selection-end-column="62" />
           <folding>
-            <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-            <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+            <element signature="method#getAllDevice#0;class#PgDeviceManager#0" />
+            <element signature="method#getAllDev#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="195" column="28" lean-forward="true" selection-start-line="195" selection-start-column="28" selection-end-line="195" selection-end-column="28" />
+        <state relative-caret-position="166">
+          <caret line="174" column="13" lean-forward="true" selection-start-line="174" selection-start-column="13" selection-end-line="174" selection-end-column="13" />
           <folding>
-            <element signature="method#getAlarmByTypeAndTime#0;class#PgAlarmManager#0" />
-            <element signature="method#getAlarmNum#0;class#PgAlarmManager#0" />
             <element signature="method#getDayAlarmStatistic#0;class#PgAlarmManager#0" />
+            <element signature="method#getAlarmList#0;class#PgAlarmManager#0" />
             <element signature="method#createDTO#0;class#PgAlarmManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="364">
+          <caret line="46" column="56" lean-forward="true" selection-start-line="46" selection-start-column="56" selection-end-line="46" selection-end-column="56" />
+          <folding>
+            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
+            <element signature="method#getPgDev#0;class#PgDeviceRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
+            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+        <state relative-caret-position="396">
+          <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
           <folding>
             <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
             <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -1365,52 +1331,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="239">
-          <caret line="21" column="33" lean-forward="true" selection-start-line="21" selection-start-column="33" selection-end-line="21" selection-end-column="33" />
-        </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="352">
-          <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-        </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="99">
-          <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-          </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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-          <folding>
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-            <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>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
index c436c93..e913155 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
@@ -132,7 +132,10 @@
             this.setAlarmType("");
         else
             this.setAlarmType(pgAlarm.getAlarmTypeId().getAlarmType());
-        this.setAlarmValue(pgAlarm.getAlarmValue());
+        if(pgAlarm.getAlarmValue()==null)
+            this.setAlarmValue("");
+        else
+            this.setAlarmValue(pgAlarm.getAlarmValue());
         if (pgAlarm.getAlarmDate() != null)
             this.setAlarmDate(sdf.format(pgAlarm.getAlarmDate()));
         else
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
index a43965c..565cb41 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -159,11 +159,21 @@
     }
 
     //获取历史报警消息列表
-    public List<PgAlarmDto> getAllAlarm(String alarmType,String startDay,String endDay,String isNew,int page,int rows) {
-        try {
+    public  Map<String, Object> getAllAlarm(String alarmType,String partition,String startDay,String endDay,String isNew,int page,int rows) {
 
+        Map<String, Object> resultMap = new HashMap<>();
+        String msg="";
+
+        try {
             Criteria criteria = createCriteria(PgAlarm.class);
 
+            if (StringUtils.isNotBlank(partition)) {
+                DetachedCriteria inCriteria = DetachedCriteria.forClass(PgDevice.class);
+                inCriteria.add(Restrictions.eq("partition", partition));
+                inCriteria.setProjection(Property.forName("id"));
+                criteria.add(Property.forName("alarmDevId").in(inCriteria));
+            }
+
             if (StringUtils.isNotBlank(alarmType)&&!alarmType.contains("全部")&&pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
                 criteria.add(Restrictions.eq("alarmTypeId", pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)));
 
@@ -190,8 +200,16 @@
             for (PgAlarm pgAlarm : pgAlarmList) {
                 pgAlarmDtoList.add(new PgAlarmDto(pgAlarm));
             }
-
-            return pgAlarmDtoList;
+            if(pgAlarmDtoList==null||pgAlarmDtoList.size()==0) {
+                resultMap.put("msg", "没有报警信息");
+                resultMap.put("code","0");
+            }else {
+                resultMap.put("code","200");
+                resultMap.put("msg", "报警信息获取成功");
+            }
+            resultMap.put("count",pg.getTotalCount());
+            resultMap.put("result",pgAlarmDtoList);
+            return resultMap;
         }
         catch(Exception ex){
             ex.printStackTrace();
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index 7547560..654f49e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -24,11 +24,11 @@
 
         Criteria criteria = createCriteria(PgDevice.class);
 
-        if(road!=null)
+        if(StringUtils.isNotBlank(road))
             criteria.add(Restrictions.eq("road",road));
-        if(partition!=null)
+        if(StringUtils.isNotBlank(partition))
             criteria.add(Restrictions.eq("partition",partition));
-        if(devType!=null)
+        if(StringUtils.isNotBlank(devType))
             criteria.add(Restrictions.eq("devType",devType));
 
         criteria.add(Restrictions.eq("active", 1));
@@ -43,6 +43,29 @@
         return pgDeviceDtoList;
     }
 
+    public List<PgDeviceDto> getAllDev(String road,String partition,String devType) {
+
+        Criteria criteria = createCriteria(PgDevice.class);
+
+        if(StringUtils.isNotBlank(road))
+            criteria.add(Restrictions.eq("road",road));
+        if(StringUtils.isNotBlank(partition))
+            criteria.add(Restrictions.eq("partition",partition));
+        if(StringUtils.isNotBlank(devType))
+            criteria.add(Restrictions.like("devType","%"+devType+"%"));
+
+        criteria.add(Restrictions.eq("active", 1));
+        criteria.addOrder(Order.desc("id"));
+        List<PgDevice> pgDeviceList = criteria.list();
+
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
+        for (PgDevice pgDevice : pgDeviceList) {
+            pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
+        }
+
+        return pgDeviceDtoList;
+    }
+
     //根据名字获取当前设备
     public PgDevice getDeviceByAssetCode(String assetCode) {
         Criteria criteria=createCriteria(PgDevice.class);
@@ -56,9 +79,9 @@
     }
 
     //根据类型获取设备列表
-    public List<PgDeviceDto> getDeviceByDevTypee(String devType) {
+    public List<PgDeviceDto> getDeviceByDevType(String devType) {
         Criteria criteria=createCriteria(PgDevice.class);
-        criteria.add(Restrictions.eq("devType",devType));
+        criteria.add(Restrictions.like("devType","%"+devType+"%"));
 
         List<PgDevice> pgDeviceList=criteria.list();
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
@@ -106,7 +129,7 @@
         criteria.add(Restrictions.eq("partition",partition));
 
         List<PgDevice> pgDeviceList=criteria.list();
-        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<PgDeviceDto>();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
 
         for (PgDevice pgDevice : pgDeviceList) {
             pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
index 3a3bccd..595730e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
@@ -1,10 +1,13 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.devTable.domain.PgAlarmType;
 import com.casic.PgInterface.devTable.domain.PgPartition;
 import com.casic.PgInterface.devTable.domain.PgRoad;
 import com.casic.PgInterface.devTable.domain.PipeGallery;
 import com.casic.PgInterface.devTable.dto.PgPartitionDto;
+import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
@@ -12,7 +15,9 @@
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Created by yxw on 2017/11/4.
@@ -21,7 +26,8 @@
 public class PgPartitionManager extends HibernateEntityDao<PgPartition> {
 
     @Resource
-    PgRoadManager pgRoadManager;
+    private PgRoadManager pgRoadManager;
+
 
     public PgPartition getPartitionByParName(String parName) {
         Criteria criteria = getSession().createCriteria(PgPartition.class);
@@ -99,4 +105,5 @@
         return pgPartitionDtoList;
     }
 
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
index f216360..a6928f1 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
@@ -5,6 +5,7 @@
 public class PgPlanResultRe {
 
     private String taskKey;
+    private List<String> pileAcuList;
     private List<PgPlanResult> pgPlanResultList;
 
     public String getTaskKey() {
@@ -15,6 +16,14 @@
         this.taskKey = taskKey;
     }
 
+    public List<String> getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(List<String> pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+
     public List<PgPlanResult> getPgPlanResultList() {
         return pgPlanResultList;
     }
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
index 71ea765..47eea07 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
@@ -54,9 +54,7 @@
 
         List<PgLineHole> pgLineHoleList=criteria.list();
         List<PgLineHoleDTO> pgLineHoleDTOList=new ArrayList<>();
-        if(pgLineHoleList==null||pgLineHoleList.size()==0)
-            return null;
-        else
+        if(pgLineHoleList!=null&&pgLineHoleList.size()!=0)
             pgLineHoleDTOList=PgLineHoleDTO.ConvertToDTOList(pgLineHoleList,pgPileAcuManager,pgRoadManager);
         return pgLineHoleDTOList;
     }
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
index 0fd9e1f..841a386 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
@@ -1,12 +1,15 @@
 package com.casic.PgInterface.intelPlan.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.devTable.domain.PgPartition;
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
 import com.casic.PgInterface.intelPlan.domain.PgLineHole;
 import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
 import com.casic.PgInterface.intelPlan.domain.PgSection;
 import com.casic.PgInterface.intelPlan.dto.PgPlanResult;
 import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
 import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -22,6 +25,9 @@
     @Resource
     private PgLineHoleManager pgLineHoleManager;
 
+    @Resource
+    private PgRoadManager pgRoadManager;
+
     public PgPileAcu getPgPileAcuByCode(String acuCode){
         List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
 
@@ -58,7 +64,9 @@
         for(PgPlanTask pgPlanTask:pgPlanTaskList){
             List<PgPlanResult> pgPlanResultList=getPgPlanResultByPlantask(pgPlanTask);
             PgPlanResultRe pgPlanResultRe=new PgPlanResultRe();
+
             pgPlanResultRe.setTaskKey(pgPlanTask.getTaskKey());
+            pgPlanResultRe.setPileAcuList(pgPlanTask.getPileAcuList());
             pgPlanResultRe.setPgPlanResultList(pgPlanResultList);
 
             pgPlanResultReList.add(pgPlanResultRe);
@@ -142,4 +150,57 @@
         return length;
     }
 
+    private PgPileAcu getPgPileAcuByAcuCode(String acuCode){
+        List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
+
+        if(pgPileAcuList==null||pgPileAcuList.size()==0)
+            return null;
+        else
+            return pgPileAcuList.get(0);
+    }
+
+    public List<PgAcuTask> getACUTask(String pileAcuList){
+        String[] acuArray=pileAcuList.split(",");
+        List<PgAcuTask> pgAcuTaskList=new ArrayList<>();
+
+        for(String acu:acuArray){
+            PgPileAcu pgPileAcu=this.getPgPileAcuByCode(acu);
+            String roadName=pgRoadManager.get(pgPileAcu.getRoadId()).getRoadName();
+
+            if(!containRoad(roadName,pgAcuTaskList))
+            {
+                PgAcuTask pgAcuTask=new PgAcuTask();
+                pgAcuTask.setRoadName(roadName);
+                pgAcuTask.setPileAcuList(acu);
+                pgAcuTaskList.add(pgAcuTask);
+            }
+            else{
+                PgAcuTask pgAcuTask=getIndexRoad(roadName,pgAcuTaskList);
+                if(pgAcuTask!=null)
+                    pgAcuTask.setPileAcuList(pgAcuTask.getPileAcuList()+","+acu);
+            }
+        }
+
+        return pgAcuTaskList;
+    }
+
+    private boolean containRoad(String roadName,List<PgAcuTask> pgAcuTaskList){
+        if(pgAcuTaskList==null||pgAcuTaskList.size()==0) return false;
+        for(PgAcuTask pgAcuTask:pgAcuTaskList){
+            if(pgAcuTask.getRoadName().equals(roadName))
+                return true;
+        }
+
+        return false;
+    }
+
+    private PgAcuTask getIndexRoad(String roadName, List<PgAcuTask> pgAcuTaskList){
+        for(PgAcuTask pgAcuTask:pgAcuTaskList){
+            if(pgAcuTask.getRoadName().equals(roadName))
+                return pgAcuTask;
+        }
+
+        return null;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java
new file mode 100644
index 0000000..323f7ef
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java
@@ -0,0 +1,25 @@
+package com.casic.PgInterface.reservePlan.dto;
+
+import java.util.List;
+
+public class PgAcuTask {
+
+    private String roadName;//道路
+    private String pileAcuList;//acu分区
+
+    public String getRoadName() {
+        return roadName;
+    }
+
+    public void setRoadName(String roadName) {
+        this.roadName = roadName;
+    }
+
+    public String getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(String pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
index c25e926..c7d7693 100644
--- a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
@@ -70,9 +70,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(Long.valueOf(inPgPersonId));
         PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("hostName",pgInPgPerson.getAssetCode());
-//        PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode());
-//        long maxId = pgTagPositionManager.getMaxId(pgTagMac.getTagMac());
-//        PGTagPosition pgTagPosition = pgTagPositionManager.get(maxId);
+
         PGTagPosition pgTagPosition = tagmacRun.GetTagStatus(pgTagMac);
         boolean bExist = false;
         bExist = pgTagPositionManager.findTagPosition(pgTagPosition.getPositionUpdatetime(),pgTagPosition.getHostId());
@@ -104,8 +102,7 @@
         PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(Long.valueOf(inPgPersonId));
         PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pgInPgPersonId",pgInPgPerson);
         System.out.println("time:"+pgInPgStatus.getInTime());
-//        PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pgInPgPersonId",inPgPersonId);
-//        PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode());
+
         PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("hostName",pgInPgPerson.getAssetCode());
 
         Map<Object,Object> mapPosition = new HashMap<>();
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
index 082ba5d..3eed00a 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
@@ -48,6 +48,7 @@
     public Map<String, Object> linkDevice(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         PgDeviceDto pgDeviceDto = null;
         try {
@@ -62,6 +63,7 @@
                     else {
                         pgDeviceDto = new PgDeviceDto(pgDevice);
                         msg = "报警关联设备获取成功";
+                        code="200";
                     }
                 }
             }
@@ -71,6 +73,7 @@
             e.printStackTrace();
             msg = "获取关联设备失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceDto);
 
@@ -86,6 +89,7 @@
     public Map<String, Object> linkPartitionCamera(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
         try {
@@ -106,6 +110,7 @@
 
                         pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(partition,position);
                         msg = "关联设备获取成功";
+                        code="200";
                     }
                 }
             }
@@ -115,6 +120,7 @@
             e.printStackTrace();
             msg = "分区设备关联失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceDtoList);
         return resultMap;
@@ -129,6 +135,7 @@
     public Map<String, Object> linkReservePlan(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgReservePlanDto> pgReservePlanDtoList=new ArrayList<>();
         try{
@@ -139,10 +146,12 @@
                 else {
                     pgReservePlanDtoList = pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
 
-                    if(pgReservePlanDtoList==null||pgReservePlanDtoList.size()==0)
-                        msg="不存在关联的报警预案";
-                    else
+                    if (pgReservePlanDtoList == null || pgReservePlanDtoList.size() == 0)
+                        msg = "不存在关联的报警预案";
+                    else {
                         msg = "关联预案获取成功";
+                        code="200";
+                    }
                 }
             }
             else
@@ -153,6 +162,7 @@
             e.printStackTrace();
             msg="预案关联失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgReservePlanDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
index 0ddbc4d..0ce886b 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
@@ -41,25 +41,19 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getAlarmList(@FormParam("alarmType") String alarmType,
                                             @FormParam("startDay") String startDay,
+                                            @FormParam("partition") String partition,
                                             @FormParam("endDay") String endDay,
                                             @FormParam("isNew") String isNew,
                                             @FormParam("page") int page,
                                             @FormParam("rows") int rows) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
         try {
-            pgAlarmDtoList = pgAlarmManager.getAllAlarm(alarmType,startDay,endDay,isNew,page,rows);
-            if (pgAlarmDtoList==null||pgAlarmDtoList.size() == 0)
-                msg = "没有报警信息";
-            else
-                msg = "报警信息获取成功";
+            resultMap = pgAlarmManager.getAllAlarm(alarmType,partition,startDay,endDay,isNew,page,rows);
+
         } catch (Exception e) {
             e.printStackTrace();
-            msg = "报警信息获取失败";
         }
-        resultMap.put("msg", msg);
-        resultMap.put("result", pgAlarmDtoList);
         return resultMap;
     }
 
@@ -71,9 +65,10 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> clearAlarmList(@FormParam("id") String id) throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        String result = "false";
+        String result = "";
+        String code="0";
 
         try {
             PgAlarm pgAlarm = new PgAlarm();
@@ -86,12 +81,14 @@
                 pgAlarmManager.save(pgAlarm);
                 msg = "报警信息清除成功";
                 result = "true";
+                code = "200";
             }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警信息清除失败";
             result = "false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
@@ -106,21 +103,26 @@
     public Map<String, Object> getAlarmByTypeOrTime(@FormParam("alarmType") String alarmType,
                                                     @FormParam("startTime") String startTime,
                                                     @FormParam("endTime") String endTime) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
-        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<PgAlarmDto>();
+        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
         try {
             pgAlarmDtoList = pgAlarmManager.getAlarmByTypeAndTime(alarmType, startTime, endTime);
             if (pgAlarmDtoList == null || pgAlarmDtoList.size() == 0)
                 msg = "报警信息不存在";
             else
+            {
                 msg = "报警信息获取成功";
+                code="200";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警信息获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
index 29ce8a4..ed0bf34 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
@@ -39,8 +39,8 @@
     public Map<String, Object> getAlarmRule(@FormParam("devType") String devType) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
-        System.out.println("devType:"+devType);
         List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<>();
         try {
             pgAlarmRuleDtoList = pgAlarmRuleManager.getAlarmRuleDto(devType);
@@ -52,6 +52,7 @@
             e.printStackTrace();
             msg = "报警阈值信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmRuleDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
index 24ab894..abef1b1 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
@@ -39,16 +39,21 @@
                                                      @FormParam("endDate") String endDate)throws Exception{
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
+
         List<PgAlarmTjDto> pgAlarmTjDtoList=null;
         try{
             pgAlarmTjDtoList=pgAlarmTjManager.getAlarmTjResultByType(startDate,endDate);
             msg="获取成功";
+            code="200";
         }
         catch(Exception ex) {
             msg = "统计失败";
         }
-        resultMap.put("result",pgAlarmTjDtoList);
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
+        resultMap.put("result",pgAlarmTjDtoList);
+
         return resultMap;
     }
 
@@ -61,23 +66,27 @@
     public Map<String, Object> getAlarmByTime(@FormParam("startTime") String startTime,
                                               @FormParam("endTime") String endTime,
                                               @FormParam("statisticType") String statisticType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code = "0";
 
-        List<PgAlarmTjDto> pgAlarmTjDtoList = new ArrayList<PgAlarmTjDto>();
+        List<PgAlarmTjDto> pgAlarmTjDtoList = new ArrayList<>();
         try {
             pgAlarmTjDtoList = pgAlarmTjManager.getAlarmByTime(startTime, endTime, statisticType);
             if(pgAlarmTjDtoList==null)
                 msg="报警统计信息获取失败";
-            else
-                msg="报警统计信息获取成功";
+            else {
+                msg = "报警统计信息获取成功";
+                code="200";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警统计信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmTjDtoList);
         return resultMap;
     }
 
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
index 28bc811..b6278a9 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
@@ -30,7 +30,6 @@
     @Resource
     private PgAlarmTypeManager pgAlarmTypeManager;
 
-
     /**
      * 获取报警类型
      */
@@ -38,19 +37,24 @@
     @Path("getAlarmType")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getAlarmTypeList()throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
-        List<PgAlarmTypeDto> pgAlarmTypeDtoList=new ArrayList<PgAlarmTypeDto>();
+        String code="";
+
+        List<PgAlarmTypeDto> pgAlarmTypeDtoList=new ArrayList<>();
         try {
             pgAlarmTypeDtoList = pgAlarmTypeManager.getAllAlarmTypeDto();
             if(pgAlarmTypeDtoList.size()==0)
                 msg="没有报警类型信息";
-            else
-                msg="报警类型信息获取成功";
+            else {
+                code="200";
+                msg = "报警类型信息获取成功";
+            }
         }catch(Exception e){
             e.printStackTrace();
             msg="报警类型信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAlarmTypeDtoList);
         return resultMap;
@@ -66,6 +70,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
@@ -83,6 +88,7 @@
                 logger.info("成功保存");
                 result = "true";
                 msg = "保存成功";
+                code="200";
             }
         } catch (Exception e) {
             result = "false";
@@ -90,6 +96,7 @@
             e.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -106,6 +113,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try{
             if(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
@@ -119,6 +127,7 @@
                 pgAlarmTypeManager.save(pgAlarmType);
                 result = "true";
                 msg = "编辑成功";
+                code="200";
             }
         }
         catch(Exception e)
@@ -128,6 +137,7 @@
             e.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("result",result);
         resultMap.put("msg",msg);
 
@@ -146,6 +156,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
         String result="false";
+        String code="0";
 
         try {
             PgAlarmType pgAlarmType=pgAlarmTypeManager.get(Long.valueOf(id));
@@ -157,6 +168,7 @@
             {
                 pgAlarmType.setActive(0);
                 pgAlarmTypeManager.save(pgAlarmType);
+                code="200";
                 msg="报警类型删除成功";
                 result="true";
             }
@@ -165,6 +177,7 @@
             msg="报警类型删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
index 4533e1a..85940bb 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
@@ -33,12 +33,15 @@
                                                  @FormParam("inSpectionPlace") String inSpectionPlace){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
         List<PgAssetPlanDto> pgAssetPlanDtoList=new ArrayList<>();
         try{
             pgAssetPlanDtoList=pgAssetPlanManager.getPgAssetPlanDtoList(startDay,endDay,inSpectionPlace);
-            if(pgAssetPlanDtoList!=null&&pgAssetPlanDtoList.size()!=0)
-                msg="巡检信息获取成功";
+            if(pgAssetPlanDtoList!=null&&pgAssetPlanDtoList.size()!=0) {
+                code="200";
+                msg = "巡检信息获取成功";
+            }
             else
                 msg="不存在巡检信息";
         }
@@ -47,6 +50,7 @@
             msg="巡检信息获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAssetPlanDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
index 47ef9d1..5cbdfcb 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
@@ -30,12 +30,15 @@
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
         String result="";
+        String code="0";
 
         List<PgAssetPlanStatic> pgAssetPlanStaticList = null;
         try{
             pgAssetPlanStaticList=pgAssetPlanManager.getPgAssetPlanStaticLisByTime(startTime,endTime,staticType);
-            if(pgAssetPlanStaticList!=null&&pgAssetPlanStaticList.size()!=0)
-                msg="巡检统计信息获取成功";
+            if(pgAssetPlanStaticList!=null&&pgAssetPlanStaticList.size()!=0) {
+                code = "200";
+                msg = "巡检统计信息获取成功";
+            }
             else
                 msg="统计信息获取失败";
         }
@@ -44,6 +47,7 @@
             msg="统计失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAssetPlanStaticList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
index 26f5d6a..503bfe3 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
@@ -40,6 +40,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="";
 
         try{
             PgAuthority pgAuthority=new PgAuthority();
@@ -50,6 +51,7 @@
 
             pgAuthorityManager.save(pgAuthority);
             msg="用户权限保存成功";
+            code="200";
             result="true";
         }
         catch(Exception e) {
@@ -57,6 +59,7 @@
             msg = "新增权限失败";
             result = "false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -65,22 +68,25 @@
 
     /*
        *编辑角权限信息
-        */
+    */
     @POST
     @Path("editAuthority")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> editAuthority(@FormParam("id") String id,
                                        @FormParam("authority") String authority,
                                        @FormParam("concent") String concent) throws Exception{
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
+
         try {
             PgAuthority pgAuthority=pgAuthorityManager.get(Long.valueOf(id));
             pgAuthority.setAuthority(authority);
             pgAuthority.setConcent(concent);
 
             pgAuthorityManager.save(pgAuthority);
+            code="200";
             msg="权限保存成功";
             result="true";
         }
@@ -90,7 +96,7 @@
             msg="权限编辑失败";
             result="false";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -105,9 +111,10 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> deleteAuthority(@FormParam("id") String id)throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
-        String result="false";
+        String result="";
+        String code="0";
 
         try {
             PgAuthority pgAuthority= pgAuthorityManager.get(Long.valueOf(id));
@@ -119,6 +126,7 @@
             {
                 pgAuthority.setActive(0);
                 pgAuthorityManager.save(pgAuthority);
+                code="200";
                 msg="删除权限成功";
                 result="true";
             }
@@ -127,37 +135,40 @@
             msg="删除权限失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
     }
 
     /*
-* 获取权限信息
- */
+    * 获取权限信息
+    */
     @POST
     @Path("getAuthorityList")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> getAuthorityList() {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgAuthorityDto> pgAuthorityDtoList = new ArrayList<PgAuthorityDto>();
         try {
             pgAuthorityDtoList = pgAuthorityManager.getAuthorityList();
             if (pgAuthorityDtoList == null)
                 msg = "不存在权限信息";
-            else
+            else {
+                code = "200";
                 msg = "权限信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "权限信息获取是失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAuthorityDtoList);
         return resultMap;
     }
 
 
-
-
 }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
index a9ef521..a74ecc7 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
@@ -45,6 +45,7 @@
                                                @FormParam("endDate") String endDate)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgHistoryDataDto> pgHistoryDataDtoList=new ArrayList<>();
 
         try {
@@ -55,13 +56,16 @@
                 pgHistoryDataDtoList=pgCh4Manager.getAllCH4Data(pgDevice,startDate,endDate);
                 if(pgHistoryDataDtoList==null)
                     msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+                else {
+                    code = "200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgHistoryDataDtoList);
         return resultMap;
@@ -75,8 +79,9 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getNewestCh4InfoByDev(@FormParam("assetCode") String assetCode)throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
+        String code="0";
         PgCh4Dto pgCh4Dto=new PgCh4Dto(null);
 
         try {
@@ -87,13 +92,17 @@
                 pgCh4Dto=pgCh4Manager.getNewestCH4Data(pgDevice);
                 if(pgCh4Dto==null)
                     msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgCh4Dto);
         return resultMap;
@@ -111,6 +120,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
@@ -127,6 +137,7 @@
                 pgCh4.setPgDeviceId(pgDevice);
 
                 pgCh4Manager.save(pgCh4);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -135,7 +146,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
index a7eac39..dfc8ca5 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
@@ -43,23 +43,27 @@
                                                       @FormParam("endDate") String endDate)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgHistoryDataDto> pgHistoryDataDtoList=new ArrayList<>();
 
         try {
             PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
                 msg="设备不存在";
-            else{
-                pgHistoryDataDtoList=pgCoManager.getAllCoData(pgDevice, startDate, endDate);
-                if(pgHistoryDataDtoList==null)
-                    msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+            else {
+                pgHistoryDataDtoList = pgCoManager.getAllCoData(pgDevice, startDate, endDate);
+                if (pgHistoryDataDtoList == null)
+                    msg = "没有满足要求的数据";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgHistoryDataDtoList);
         return resultMap;
@@ -75,6 +79,7 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         PgCoDto pgCoDto=new PgCoDto(null);
 
         try {
@@ -85,13 +90,16 @@
                 pgCoDto=pgCoManager.getNewestCoData(pgDevice);
                 if(pgCoDto==null)
                     msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgCoDto);
         return resultMap;
@@ -110,6 +118,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         try {
@@ -126,6 +135,7 @@
 
                 pgCoManager.save(pgCo);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
         } catch (Exception e) {
@@ -133,7 +143,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
index b4b826e..9af98a3 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
@@ -60,6 +60,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         try {
 
@@ -80,8 +81,8 @@
                 pgConstruction.setPgConstructionTypeId(pgConstructionType.getId());
                 pgConstruction.setActive(1);
                 pgConstruction.setParName(parName);
-                logger.info("保存成功");
                 pgConstructionManager.save(pgConstruction);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -90,6 +91,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("success", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -116,6 +118,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
@@ -140,6 +143,7 @@
                 pgConstruction.setParName(parName);
 
                 pgConstructionManager.save(pgConstruction);
+                code="200";
                 result = "true";
                 msg = "编辑成功";
             }
@@ -150,7 +154,7 @@
             e.printStackTrace();
 
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -167,6 +171,8 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
+
         try {
             PgConstruction pgConstruction = pgConstructionManager.get(Long.valueOf(id));
             if (pgConstruction == null)
@@ -177,6 +183,7 @@
             {
                 pgConstruction.setActive(0);
                 pgConstructionManager.save(pgConstruction);
+                code="200";
                 result = "true";
                 msg = "成功删除信息";
             }
@@ -185,6 +192,7 @@
             result = "false";
             msg = "删除失败";
         }
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -204,9 +212,11 @@
                                                   @FormParam("rows") int rows)throws Exception{
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
         List<PgConstructionDto> pgConstructionDtoList=new ArrayList<>();
         try{
             pgConstructionDtoList=pgConstructionManager.getPgContructionDto(cs_name,cs_type,startTime,endTime,page,rows);
+            code="200";
             msg="信息获取成功";
         }
         catch(Exception e)
@@ -214,6 +224,7 @@
             e.printStackTrace();
             msg="查询失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
 
@@ -231,18 +242,22 @@
                                                               @FormParam("statisticType") String statisticType) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgConstructionStiatistic> pgConstructionStiatisticList=new ArrayList<>();
         try {
             pgConstructionStiatisticList = pgConstructionManager.getConstructionByTimeAndStatus(startTime, endTime, statisticType);
             if(pgConstructionStiatisticList==null)
                 msg="施工统计信息获取失败";
-            else
-                msg="施工统计信息获取成功";
+            else {
+                code="200";
+                msg = "施工统计信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "施工统计信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgConstructionStiatisticList);
         return resultMap;
@@ -257,6 +272,7 @@
     public Map<String, Object> getConstructionByType(@FormParam("statisticType") String statisticType){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
         List<PgConstructionStiatistic> pgConstructionStiatisticList=new ArrayList<>();
 
         try{
@@ -268,6 +284,7 @@
                 resultMap.put("result",null);
             }
             else {
+                code="200";
                 msg = "统计信息获取成功";
                 resultMap.put("result", pgConstructionStiatisticList);
             }
@@ -278,6 +295,7 @@
             msg="统计失败";
             resultMap.put("result",null);
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         return resultMap;
     }
@@ -291,9 +309,11 @@
     public Map<String, Object> getConstructionToday() throws Exception{
         Map<String,Object> resultMap=new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgConstructionDto> pgConstructionDtoList=new ArrayList<PgConstructionDto>();
         try {
             pgConstructionDtoList = pgConstructionManager.getConstructionToday();
+            code="200";
             msg = "当天施工信息获取成功";
         }
         catch(Exception e)
@@ -301,7 +321,7 @@
             e.printStackTrace();
             msg="获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
         return resultMap;
@@ -316,6 +336,7 @@
     public Map<String, Object> getConstructionDev(@FormParam("id") String id) throws Exception{
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
         List<PgDeviceDto> pgDeviceDtoList =new ArrayList<>();
         try{
@@ -325,14 +346,17 @@
 
             if(pgDeviceDtoList==null)
                 msg="信息获取失败";
-            else
-                msg="信息获取成功";
+            else {
+                code="200";
+                msg = "信息获取成功";
+            }
         }
         catch(Exception e)
         {
             e.printStackTrace();
-            msg="设备信息获取成功";
+            msg="信息获取是被";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgDeviceDtoList);
 
@@ -346,17 +370,21 @@
     @Path("getConstruction")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getConstruction() throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
-        List<PgConstructionDto> pgConstructionDtoList=new ArrayList<PgConstructionDto>();
+        String code="0";
+
+        List<PgConstructionDto> pgConstructionDtoList=new ArrayList<>();
 
         try{
             pgConstructionDtoList=pgConstructionManager.getPgConstructionList();
             if(pgConstructionDtoList==null||pgConstructionDtoList.size()==0)
                 msg="不存在施工记录";
-            else
-                msg="施工信息获取成功";
+            else {
+                code = "200";
+                msg = "施工信息获取成功";
+            }
         }
         catch(Exception e)
         {
@@ -364,6 +392,7 @@
             msg="施工信息获取失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java
index fd3d53e..2019502 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java
@@ -39,12 +39,12 @@
         try {
             pgConstructionTypeDtoList = pgConstructionTypeManager.getAllConstructionTypeDto();
             if (pgConstructionTypeDtoList.size() == 0)
-                msg = "没有项目类型信息";
+                msg = "获取失败";
             else
-                msg = "项目类型获取成功";
+                msg = "获取成功";
         } catch (Exception e) {
             e.printStackTrace();
-            msg = "项目类型信息获取失败";
+            msg = "获取失败";
         }
         resultMap.put("msg", msg);
         resultMap.put("result", pgConstructionTypeDtoList);
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
index 90d001c..037a399 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
@@ -51,6 +51,7 @@
 
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if (StringUtils.isBlank(construct_doc)||StringUtils.isBlank(doc_name))
@@ -65,6 +66,7 @@
             pgCsDocument.setActive(1);
             pgCsDocumentManager.save(pgCsDocument);
 
+            code="200";
             result = "true";
             msg = "保存成功";
 
@@ -74,6 +76,7 @@
             ex.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("success", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -90,6 +93,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             PgCsDocument pgCsDocument = pgCsDocumentManager.get(Long.valueOf(id));
@@ -103,6 +107,7 @@
 
                 pgCsDocumentManager.save(pgCsDocument);
 
+                code="200";
                 result = "true";
                 msg = "编辑成功";
             }
@@ -112,6 +117,7 @@
             msg = "编辑失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -125,9 +131,9 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
         String result="";
+        String code="0";
 
         try{
-
             PgCsDocument pgCsDocument = pgCsDocumentManager.get(Long.valueOf(id));
             if(pgCsDocument==null)
             {
@@ -137,6 +143,7 @@
             else{
                 pgCsDocument.setActive(0);
                 pgCsDocumentManager.save(pgCsDocument);
+                code="200";
                 result="true";
                 msg="删除成功";
             }
@@ -147,7 +154,7 @@
             msg="预案删除失败";
             result="false";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -168,18 +175,21 @@
 
         String msg="";
         String result="";
+        String code="0";
 
         try {
             pgCsDocumentDtoList = pgCsDocumentManager.getAllDocData(cs_name);
-            if (pgCsDocumentDtoList != null)
+            if (pgCsDocumentDtoList != null) {
+                code="200";
                 msg = "获取数据成功";
+            }
             else
                 msg = "没有满足条件的数据";
         }catch (Exception e){
             e.printStackTrace();
             msg = "获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgCsDocumentDtoList);
         return resultMap;
@@ -192,20 +202,22 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
 
         String msg = "";
+        String code="0";
         ResponseEntity<byte[]> path = null;
         try {
             PgCsDocument pgCsDocument = pgCsDocumentManager.get(Long.valueOf(id));
             path = pgCsDocumentManager.downloadFile(pgCsDocument);
             if (path == null)
                 msg = "不存在该文档";
-            else
+            else {
+                code = "200";
                 msg = "下载成功";
-
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "下载失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", path.getBody());
         resultMap.put("msg", msg);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
index 94c5c84..ffc8b95 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
@@ -41,22 +41,24 @@
     public Map<String, Object> getPgDeviceByDevType(@FormParam("devType") String devType) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
         try {
-            pgDeviceDtoList = pgDeviceManager.getDeviceByDevTypee(devType);
+            pgDeviceDtoList = pgDeviceManager.getDeviceByDevType(devType);
             if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0){
                 msg="不存在满足要求的数据";
-                resultMap.put("result",null);
             }
             else{
-                resultMap.put("result", pgDeviceDtoList);
+                code="200";
                 msg = "获取成功";
             }
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", pgDeviceDtoList);
         return resultMap;
     }
 
@@ -69,25 +71,26 @@
     public Map<String, Object> getPgDeviceByAssetCode(@FormParam("assetCode") String assetCode) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         PgDeviceDto pgDeviceDto=null;
         try {
             PgDevice pgDevice = pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
             {
                 msg="不存在设备信息";
-                resultMap.put("result",null);
             }
             else {
                 pgDeviceDto = new PgDeviceDto(pgDevice);
                 msg = "获取成功";
-                resultMap.put("result", pgDeviceDto);
+                code="200";
             }
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", pgDeviceDto);
         return resultMap;
     }
 
@@ -102,27 +105,61 @@
                                              @FormParam("devType") String devType)throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
         try {
             pgDeviceDtoList = pgDeviceManager.getAllDevice(road,partition,devType);
             if(pgDeviceDtoList.size()==0) {
                 msg = "没有找到设备信息";
-                resultMap.put("result",null);
             }
             else {
                 msg = "设备信息获取成功";
-                resultMap.put("result", pgDeviceDtoList);
+                code="200";
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result", pgDeviceDtoList);
         return resultMap;
     }
 
     /**
+     * 显示设备列表
+     */
+    @POST
+    @Path("getPgDev")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String, Object> getPgDev(@FormParam("road") String road,
+                                             @FormParam("partition") String partition,
+                                             @FormParam("devType") String devType)throws Exception {
+        Map<String, Object> resultMap = new HashMap<>();
+        String msg="";
+        String code="0";
+        List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
+        try {
+            pgDeviceDtoList = pgDeviceManager.getAllDev(road,partition,devType);
+            if(pgDeviceDtoList.size()==0) {
+                msg = "没有找到设备信息";
+            }
+            else {
+                code="200";
+                msg = "设备信息获取成功";
+            }
+        }catch(Exception e){
+            e.printStackTrace();
+            msg="设备信息获取失败";
+        }
+        resultMap.put("code",code);
+        resultMap.put("msg",msg);
+        resultMap.put("result", pgDeviceDtoList);
+        return resultMap;
+    }
+
+
+    /**
      * 新增设备
      */
     @POST
@@ -145,6 +182,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if (pgDeviceManager.getDeviceByAssetCode(assetCode)!=null) {
@@ -169,6 +207,7 @@
 
                 pgDeviceManager.save(pgDevice);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
 
@@ -177,10 +216,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -208,14 +246,9 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
-            /*
-            if (pgDeviceManager.getDeviceByAssetCode(assetCode)!=null) {
-                result = "false";
-                msg = "已存在同名设备";
-            } else {
-            */
             PgDevice pgDevice = pgDeviceManager.get(Long.valueOf(id));
             pgDevice.setPipeGallery(pipeGallery);
             pgDevice.setPartition(partition);
@@ -233,14 +266,14 @@
 
             pgDeviceManager.save(pgDevice);
             result = "true";
+            code="200";
             msg = "编辑成功";
-            //}
         } catch (Exception e) {
             result = "false";
             msg = "编辑失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("result",result);
         resultMap.put("msg",msg);
         return resultMap;
@@ -256,7 +289,8 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
-        String result="false";
+        String result="";
+        String code="0";
 
         try {
             PgDevice pgDevice=pgDeviceManager.get(Long.valueOf(id));
@@ -268,6 +302,7 @@
             {
                 pgDevice.setActive(0);
                 pgDeviceManager.save(pgDevice);
+                code="200";
                 msg="设备删除成功";
                 result="true";
             }
@@ -276,6 +311,7 @@
             msg="设备删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -291,18 +327,18 @@
     {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         PgDeviceDto pgDeviceDto=null;
 
         try{
             PgDevice pgDevice=pgDeviceManager.getDeviceBydevCode(devCode);
             if(pgDevice==null) {
                 msg = "设备信息获取失败";
-                resultMap.put("result",null);
             }
             else{
                 pgDeviceDto = new PgDeviceDto(pgDevice);
                 msg = "设备信息获取成功";
-                resultMap.put("result",pgDeviceDto);
+                code="200";
             }
         }
         catch(Exception ex)
@@ -310,8 +346,9 @@
             ex.printStackTrace();
             msg="设备状态获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgDeviceDto);
         return resultMap;
     }
 
@@ -324,17 +361,17 @@
     public Map<String,Object> getDeviceByPartition(@FormParam("partition") String partition) throws Exception{
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<PgDeviceDto>();
 
         try{
             pgDeviceDtoList=pgDeviceManager.getPgDeviceDtoListByPartition(partition);
             if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0) {
                 msg = "设备信息获取失败";
-                resultMap.put("result",null);
             }
             else {
+                code="200";
                 msg = "设备信息获取成功";
-                resultMap.put("result",pgDeviceDtoList);
             }
         }
         catch(Exception e)
@@ -342,8 +379,9 @@
             e.printStackTrace();
             msg="设备信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgDeviceDtoList);
         return resultMap;
     }
 
@@ -353,17 +391,16 @@
     public Map<String,Object> getDeviceByOldDAssetCodeCode(@FormParam("assetCode") String assetCode) throws Exception{
         Map<String, Object> resultMap = new HashMap<>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
 
         try{
             pgDeviceDtoList=pgDeviceManager.getDeviceByOldDAssetCodeCode(assetCode);
-            if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0) {
-                msg = "设备信息获取失败";;
-                resultMap.put("result",null);
-            }
+            if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0)
+                msg = "设备信息获取失败";
             else {
                 msg = "设备信息获取成功";
-                resultMap.put("result",pgDeviceDtoList);
+                code="200";
             }
         }
         catch(Exception e)
@@ -372,8 +409,9 @@
             msg="设备信息获取失败";
             resultMap.put("result",null);
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgDeviceDtoList);
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java
index 421d249..f6f167d 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java
@@ -38,17 +38,21 @@
     public Map<String, Object> getDeviceTpeyList()throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgDeviceTypeDto> pgDeviceTypeDtoList=new ArrayList<PgDeviceTypeDto>();
         try {
             pgDeviceTypeDtoList = pgDeviceTypeManager.getAllDeviceType();
             if(pgDeviceTypeDtoList.size()==0)
                 msg="没有找到设备类型信息";
-            else
-                msg="设备类型信息获取成功";
+            else {
+                code="200";
+                msg = "设备类型信息获取成功";
+            }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备类型信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgDeviceTypeDtoList);
         return resultMap;
@@ -66,6 +70,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if (pgDeviceTypeManager.getDeviceTypeByDeType(devType)!=null) {
@@ -79,6 +84,7 @@
 
                 pgDeviceTypeManager.save(pgDeviceType);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
 
@@ -87,10 +93,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
index c276fb3..c789960 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
@@ -44,6 +44,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 
         try {
@@ -62,6 +63,7 @@
                 pgEquipment.setActive(1);
 
                 pgEquipmentManager.save(pgEquipment);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -70,9 +72,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -89,9 +91,10 @@
                                             @FormParam("ownerUnit") String ownerUnit,
                                             @FormParam("enterDate") String enterDate,
                                             @FormParam("curUser") String curUser) {
-        HashMap<String, Object> resultMap = new HashMap<String, Object>();
+        HashMap<String, Object> resultMap = new HashMap<>();
         String msg = "";
         String result = "";
+        String code="0";
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 
         try {
@@ -111,6 +114,7 @@
                 pgEquipment.setEnterDate(sdf.parse(enterDate));
 
                 pgEquipmentManager.save(pgEquipment);
+                code="200";
                 msg="编辑成功";
                 result="true";
             }
@@ -119,9 +123,9 @@
             result = "false";
             msg = "编辑失败";
         }
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -134,16 +138,19 @@
     public Map<String, Object> getEquipment(@FormParam("eqName") String eqName,
                                             @FormParam("eqCode") String eqCode,
                                             @FormParam("eqType") String eqType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        List<PgEquipmentDto> pgEquipmentDtoList=new ArrayList<PgEquipmentDto>();
+        String code="0";
+        List<PgEquipmentDto> pgEquipmentDtoList=new ArrayList<>();
 
         try{
             pgEquipmentDtoList=pgEquipmentManager.getEquipmentDtiList(eqName,eqCode,eqType);
             if(pgEquipmentDtoList==null||pgEquipmentDtoList.size()==0)
                 msg="不存在工器具记录";
-            else
-                msg="维获取成功";
+            else {
+                code = "200";
+                msg = "维获取成功";
+            }
         }
         catch(Exception e)
         {
@@ -166,6 +173,7 @@
         HashMap<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
         String result = "";
+        String code="";
 
         try {
             PgEquipment pgEquipment=pgEquipmentManager.get(Long.valueOf(id));
@@ -178,6 +186,7 @@
             {
                 pgEquipment.setActive(0);
                 pgEquipmentManager.save(pgEquipment);
+                code="200";
                 msg="删除成功";
                 result="true";
             }
@@ -186,6 +195,7 @@
             msg="设备信息获取失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -201,16 +211,19 @@
             throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=new ArrayList<PgDeviceTypeStatisticDto>();
 
         try {
             pgDeviceTypeStatisticDtoList=pgEquipmentManager.getDeviceStatisticByDevType(eqType);
 
+            code="200";
             msg = "获取成功";
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceTypeStatisticDtoList);
         return resultMap;

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 25ded8a..283d7ab 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,20 +7,56 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" 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/construction/manager/PgCsDocumentManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/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/manager/PgAlarmManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/~$说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/~$说明20191207.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.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$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/接口说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明20191207.docx" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
@@ -51,7 +87,7 @@
         <counts>
           <entry key="class" value="4" />
           <entry key="iml" value="2" />
-          <entry key="java" value="707" />
+          <entry key="java" value="820" />
           <entry key="properties" value="14" />
           <entry key="xml" value="7" />
         </counts>
@@ -60,7 +96,7 @@
         <counts>
           <entry key="CLASS" value="4" />
           <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="707" />
+          <entry key="JAVA" value="820" />
           <entry key="Properties" value="14" />
           <entry key="XML" value="7" />
         </counts>
@@ -68,32 +104,32 @@
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
           <entry key="dummy" value="38" />
-          <entry key="java" value="30161" />
+          <entry key="java" value="40859" />
           <entry key="properties" value="100" />
-          <entry key="txt" value="176" />
+          <entry key="txt" value="186" />
           <entry key="xml" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="30161" />
-          <entry key="PLAIN_TEXT" value="214" />
+          <entry key="JAVA" value="40859" />
+          <entry key="PLAIN_TEXT" value="224" />
           <entry key="Properties" value="100" />
           <entry key="XML" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="48" />
+          <entry key="project.closed" value="51" />
           <entry key="project.open.time.1" value="5" />
           <entry key="project.open.time.12" value="2" />
           <entry key="project.open.time.13" value="1" />
           <entry key="project.open.time.15" value="1" />
           <entry key="project.open.time.16" value="1" />
           <entry key="project.open.time.17" value="1" />
-          <entry key="project.open.time.2" value="1" />
+          <entry key="project.open.time.2" value="2" />
           <entry key="project.open.time.20" value="1" />
-          <entry key="project.open.time.23" value="1" />
+          <entry key="project.open.time.23" value="2" />
           <entry key="project.open.time.24" value="2" />
           <entry key="project.open.time.251" value="1" />
           <entry key="project.open.time.27" value="2" />
@@ -106,8 +142,8 @@
           <entry key="project.open.time.36" value="1" />
           <entry key="project.open.time.37" value="1" />
           <entry key="project.open.time.39" value="2" />
-          <entry key="project.open.time.4" value="2" />
-          <entry key="project.open.time.40" value="1" />
+          <entry key="project.open.time.4" value="3" />
+          <entry key="project.open.time.40" value="2" />
           <entry key="project.open.time.41" value="2" />
           <entry key="project.open.time.42" value="2" />
           <entry key="project.open.time.43" value="2" />
@@ -122,23 +158,25 @@
           <entry key="project.open.time.6" value="3" />
           <entry key="project.open.time.63" value="2" />
           <entry key="project.open.time.64" value="1" />
+          <entry key="project.open.time.66" value="1" />
           <entry key="project.open.time.71" value="2" />
+          <entry key="project.open.time.74" value="1" />
           <entry key="project.open.time.76" value="1" />
           <entry key="project.open.time.8" value="2" />
           <entry key="project.open.time.9" value="1" />
           <entry key="project.open.time.97" value="1" />
-          <entry key="project.opened" value="78" />
+          <entry key="project.opened" value="84" />
         </counts>
       </usages-collector>
     </session>
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+            <state relative-caret-position="396">
+              <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
               <folding>
                 <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
                 <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -147,73 +185,6 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <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="99">
-              <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-              <folding>
-                <element signature="imports" expanded="true" />
-                <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-1170">
-              <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state>
-              <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
-              <folding>
-                <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-                <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="true">
-        <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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-              <folding>
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-                <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>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <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="352">
-              <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -225,18 +196,9 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>inCriteria</find>
-      <find>getPgPlanResulList</find>
-      <find>getPileAcuListByPileAcuStr</find>
-      <find>distinct</find>
-      <find>order</find>
-      <find>canPlanLine</find>
-      <find>isExistLine</find>
-      <find>getPlanResult</find>
       <find>pgPipeLine</find>
       <find>getPipeLineBylineName</find>
       <find>StringU</find>
-      <find>getAllAlarm</find>
       <find>getAlarmList</find>
       <find>getPgInPersonListByDay</find>
       <find>getDayInPgStatistic</find>
@@ -254,7 +216,16 @@
       <find>getPgContructionByNameOrType</find>
       <find>&quot;&quot;,&quot;&quot;,</find>
       <find>getPgContructionDtoByNameOrType</find>
+      <find>addConstruction</find>
+      <find>getPgLineAcuHole</find>
+      <find>getPlanResult</find>
       <find>getConstruction</find>
+      <find>addPipeLine</find>
+      <find>未找到入廊数据</find>
+      <find>getCurrentHoleByAcu</find>
+      <find>getAllAlarm</find>
+      <find>getPgDeviceDtoListByPartition</find>
+      <find>getPgDeviceByDevType</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -263,57 +234,57 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlan.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileHoleManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/planData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/PlanData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
       </list>
     </option>
   </component>
@@ -359,7 +330,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -421,53 +391,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="dto" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="manager" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -479,29 +402,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="rs" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -516,6 +416,7 @@
         </subPane>
       </pane>
       <pane id="Scope" />
+      <pane id="PackagesPane" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -710,7 +611,13 @@
       <workItem from="1574902733573" duration="1829000" />
       <workItem from="1574998240004" duration="7016000" />
       <workItem from="1575247959683" duration="6997000" />
-      <workItem from="1575704345590" duration="40473000" />
+      <workItem from="1575704345590" duration="69381000" />
+      <workItem from="1575869479666" duration="721000" />
+      <workItem from="1575947104878" duration="6101000" />
+      <workItem from="1576128264436" duration="3347000" />
+      <workItem from="1576208571543" duration="22000" />
+      <workItem from="1576227513917" duration="862000" />
+      <workItem from="1576293721220" duration="18246000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -817,11 +724,18 @@
       <option name="project" value="LOCAL" />
       <updated>1575775489149</updated>
     </task>
-    <option name="localTasksCounter" value="16" />
+    <task id="LOCAL-00016" summary="整改施工信息">
+      <created>1575791780774</created>
+      <option name="number" value="00016" />
+      <option name="presentableId" value="LOCAL-00016" />
+      <option name="project" value="LOCAL" />
+      <updated>1575791780774</updated>
+    </task>
+    <option name="localTasksCounter" value="17" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="452131000" />
+    <option name="totallyTimeSpent" value="510338000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -834,9 +748,8 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
-    <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.24205749" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2647504" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -847,7 +760,7 @@
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.3295082" />
       <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.4819672" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.65737706" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.3295082" />
@@ -939,7 +852,8 @@
     <MESSAGE value="重新设计智能规划部分" />
     <MESSAGE value="完成智能规划对接" />
     <MESSAGE value="修改报警统计" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改报警统计" />
+    <MESSAGE value="整改施工信息" />
+    <option name="LAST_COMMIT_MESSAGE" value="整改施工信息" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -951,16 +865,10 @@
           <option name="timeStamp" value="3" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java</url>
-          <line>69</line>
+          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java</url>
+          <line>40</line>
           <properties />
-          <option name="timeStamp" value="21" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java</url>
-          <line>96</line>
-          <properties />
-          <option name="timeStamp" value="38" />
+          <option name="timeStamp" value="122" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
@@ -970,394 +878,452 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <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="2068">
-          <caret line="154" column="35" selection-start-line="154" selection-start-column="35" selection-end-line="154" selection-end-column="35" />
-        </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="3300">
-          <caret line="297" column="22" selection-start-line="297" selection-start-column="22" selection-end-line="297" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/StringUtils.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
-          <caret line="13" column="48" lean-forward="true" selection-start-line="13" selection-start-column="48" selection-end-line="13" selection-end-column="48" />
+          <caret line="11" column="5" selection-start-line="11" selection-start-column="5" selection-end-line="11" selection-end-column="5" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="78" lean-forward="true" selection-start-line="78" selection-end-line="78" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="616">
-          <caret line="41" column="1" selection-start-line="41" selection-start-column="1" selection-end-line="41" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="110">
-          <caret line="12" column="23" selection-start-line="12" selection-start-column="23" selection-end-line="12" selection-end-column="23" />
+        <state relative-caret-position="516">
+          <caret line="114" column="12" selection-start-line="114" selection-start-column="12" selection-end-line="114" selection-end-column="12" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="164">
-          <caret line="56" lean-forward="true" selection-start-line="56" selection-end-line="56" />
+        <state relative-caret-position="418">
+          <caret line="33" column="44" selection-start-line="33" selection-start-column="44" selection-end-line="33" selection-end-column="44" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="258">
-          <caret line="27" column="12" lean-forward="true" selection-start-line="27" selection-start-column="12" selection-end-line="27" selection-end-column="12" />
+        <state relative-caret-position="132">
+          <caret line="11" column="20" lean-forward="true" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="20" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.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="-12">
-          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        <state relative-caret-position="516">
+          <caret line="142" column="54" selection-start-line="142" selection-start-column="54" selection-end-line="142" selection-end-column="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="858">
-          <caret line="55" column="27" lean-forward="true" selection-start-line="55" selection-start-column="27" selection-end-line="55" selection-end-column="27" />
+        <state relative-caret-position="66">
+          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="58">
+          <caret line="18" column="28" selection-start-line="18" selection-start-column="19" selection-end-line="18" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="305">
+          <caret line="24" column="31" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="714">
+          <caret line="58" column="5" lean-forward="true" selection-start-line="58" selection-start-column="5" selection-end-line="58" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="924">
+          <caret line="134" column="92" selection-start-line="134" selection-start-column="92" selection-end-line="134" selection-end-column="92" />
+          <folding>
+            <element signature="method#linkDevice#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkPartitionCamera#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkReservePlan#0;class#PgAlarmLinkRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1066">
+          <caret line="90" lean-forward="true" selection-start-line="90" selection-end-line="90" />
+          <folding>
+            <element signature="method#getTjResultByAlarmType#0;class#PgAlarmTjRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="946">
+          <caret line="148" column="11" lean-forward="true" selection-start-line="148" selection-start-column="11" selection-end-line="148" selection-end-column="11" />
+          <folding>
+            <element signature="method#getAlarmTypeList#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#addAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#editAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#deleteAlarmType#0;class#PgAlarmTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="208">
+          <caret line="46" column="23" lean-forward="true" selection-start-line="46" selection-start-column="23" selection-end-line="46" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="113" column="9" lean-forward="true" selection-start-line="113" selection-start-column="9" selection-end-line="113" selection-end-column="9" />
+          <folding>
+            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
+            <element signature="method#getNewestCh4InfoByDev#0;class#PgCh4Rs#0" />
+            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="145" column="6" lean-forward="true" selection-start-line="145" selection-start-column="6" selection-end-line="145" selection-end-column="6" />
+          <folding>
+            <element signature="method#addAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#editAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#deleteAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#getAuthorityList#0;class#PgAuthorityRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="58" column="1" lean-forward="true" selection-start-line="58" selection-start-column="1" selection-end-line="58" selection-end-column="1" />
+          <folding>
+            <element signature="method#getPgAssetPlanList#0;class#PgAssetPlanRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="370">
+          <caret line="371" column="66" selection-start-line="371" selection-start-column="66" selection-end-line="371" selection-end-column="66" />
+          <folding>
+            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#searchConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionDev#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="139" column="13" lean-forward="true" selection-start-line="139" selection-start-column="13" selection-end-line="139" selection-end-column="13" />
+          <folding>
+            <element signature="method#getCoInfoByDevAndDate#0;class#PgCoRs#0" />
+            <element signature="method#getNewestCoInfoByDev#0;class#PgCoRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="540">
+          <caret line="223" column="5" lean-forward="true" selection-start-line="223" selection-start-column="5" selection-end-line="223" selection-end-column="5" />
+          <folding>
+            <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="682">
+          <caret line="100" lean-forward="true" selection-start-line="100" selection-end-line="100" />
+          <folding>
+            <element signature="method#getDeviceTpeyList#0;class#PgDeviceTypeRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="377">
+          <caret line="225" column="35" selection-start-line="225" selection-start-column="35" selection-end-line="225" selection-end-column="35" />
+          <folding>
+            <element signature="method#addEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#addEquipment#1;class#PgEquipmentRs#0" />
+            <element signature="method#getEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#deleteEquipment#0;class#PgEquipmentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="406">
+          <caret line="109" lean-forward="true" selection-start-line="109" selection-end-line="109" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="154">
+          <caret line="28" column="19" selection-start-line="28" selection-start-column="19" selection-end-line="28" selection-end-column="19" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="748">
-          <caret line="49" column="5" lean-forward="true" selection-start-line="49" selection-start-column="5" selection-end-line="49" selection-end-column="5" />
+        <state relative-caret-position="296">
+          <caret line="161" column="35" selection-start-line="161" selection-start-column="35" selection-end-line="161" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="384">
+          <caret line="99" column="5" lean-forward="true" selection-start-line="99" selection-start-column="5" selection-end-line="99" selection-end-column="5" />
+        </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="362">
+          <caret line="340" column="35" selection-start-line="340" selection-start-column="35" selection-end-line="340" selection-end-column="35" />
+          <folding>
+            <element signature="method#addInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPersonInPg#0;class#PgInPgPersonRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-606">
+          <caret line="76" column="20" lean-forward="true" selection-start-line="76" selection-start-column="20" selection-end-line="76" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="65" column="35" selection-start-line="65" selection-start-column="35" selection-end-line="65" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="101" column="35" selection-start-line="101" selection-start-column="35" selection-end-line="101" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="84" column="35" selection-start-line="84" selection-start-column="35" selection-end-line="84" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="59" lean-forward="true" selection-start-line="59" selection-end-line="59" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="60" column="1" lean-forward="true" selection-start-line="60" selection-start-column="1" selection-end-line="60" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="145" column="35" selection-start-line="145" selection-start-column="35" selection-end-line="145" selection-end-column="35" />
+        </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="274">
+          <caret line="350" column="35" selection-start-line="350" selection-start-column="35" selection-end-line="350" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="121" column="39" selection-start-line="121" selection-start-column="39" selection-end-line="121" selection-end-column="39" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="28" column="8" lean-forward="true" selection-start-line="28" selection-start-column="8" selection-end-line="28" selection-end-column="8" />
+        <state relative-caret-position="340">
+          <caret line="103" selection-start-line="103" selection-end-line="103" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="226" column="35" selection-start-line="226" selection-start-column="35" selection-end-line="226" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="203" column="35" selection-start-line="203" selection-start-column="35" selection-end-line="203" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="241" column="35" selection-start-line="241" selection-start-column="35" selection-end-line="241" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="225" column="1" lean-forward="true" selection-start-line="225" selection-start-column="1" selection-end-line="225" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="176" column="5" lean-forward="true" selection-start-line="176" selection-start-column="5" selection-end-line="176" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="178" column="35" lean-forward="true" selection-start-line="178" selection-start-column="35" selection-end-line="178" selection-end-column="35" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="516">
-          <caret line="94" column="53" selection-start-line="94" selection-start-column="53" selection-end-line="94" selection-end-column="53" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="814">
-          <caret line="52" column="9" lean-forward="true" selection-start-line="52" selection-start-column="9" selection-end-line="52" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="182">
-          <caret line="58" column="12" lean-forward="true" selection-start-line="58" selection-start-column="12" selection-end-line="58" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="34" lean-forward="true" selection-start-line="34" selection-end-line="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="32" lean-forward="true" selection-start-line="32" selection-end-line="32" />
-          <folding>
-            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
-            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="185">
-          <caret line="63" column="13" selection-start-line="63" selection-start-column="13" selection-end-line="63" selection-end-column="13" />
-          <folding>
-            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
-            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
-            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="e#6319#6324#0" />
-            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
-          </folding>
+          <caret line="240" lean-forward="true" selection-start-line="240" selection-end-line="240" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
-          <caret line="58" column="28" lean-forward="true" selection-start-line="58" selection-start-column="28" selection-end-line="58" selection-end-column="28" />
-          <folding>
-            <element signature="method#addTempHumData#0;class#PgTempHumRs#0" />
-          </folding>
+        <state relative-caret-position="340">
+          <caret line="148" column="34" selection-start-line="148" selection-start-column="34" selection-end-line="148" selection-end-column="34" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
+        <state relative-caret-position="458">
+          <caret line="99" column="35" selection-start-line="99" selection-start-column="35" selection-end-line="99" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+        <state relative-caret-position="384">
+          <caret line="145" column="32" lean-forward="true" selection-start-line="145" selection-start-column="32" selection-end-line="145" selection-end-column="32" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="414">
-          <caret line="22" column="46" lean-forward="true" selection-start-line="22" selection-start-column="46" selection-end-line="22" selection-end-column="46" />
-        </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="396">
-          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" column="83" selection-start-line="11" selection-start-column="83" selection-end-line="11" selection-end-column="83" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="26">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
-          <folding>
-            <element signature="method#getPgInPgStatusByPerson#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNumByName#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNum#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPersonListByDay#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPgStatusByPgInPgPerson#0;class#PgInPgStatusManager#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="44">
-          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-12">
-          <caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="87" lean-forward="true" selection-start-line="87" selection-end-line="87" />
-          <folding>
-            <element signature="method#getConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#addConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#deleteConstructionType#0;class#PgConstructionTypeRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
-          <folding>
-            <element signature="method#getConstructionTypeByType#0;class#PgConstructionTypeManager#0" />
-            <element signature="method#getAllConstructionTypeDto#0;class#PgConstructionTypeManager#0" />
-          </folding>
-        </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="145">
-          <caret line="258" column="9" lean-forward="true" selection-start-line="258" selection-start-column="9" selection-end-line="258" selection-end-column="9" />
-          <folding>
-            <element signature="method#getMonthInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayInPgStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgOverViewRs#0" />
-            <element signature="method#getAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getMonthAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayAlarmStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgOverViewRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="103">
-          <caret line="105" column="50" lean-forward="true" selection-start-line="105" selection-start-column="50" selection-end-line="105" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateBasicDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="99">
-          <caret line="125" selection-start-line="125" selection-end-line="125" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="190">
-          <caret line="24" column="35" lean-forward="true" selection-start-line="24" selection-start-column="35" selection-end-line="24" selection-end-column="35" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="436">
-          <caret line="24" lean-forward="true" selection-start-line="24" selection-end-line="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" lean-forward="true" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="300">
-          <caret line="34" column="31" lean-forward="true" selection-start-line="34" selection-start-column="31" selection-end-line="34" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="42" column="13" lean-forward="true" selection-start-line="42" selection-start-column="13" selection-end-line="42" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="120" column="72" lean-forward="true" selection-start-line="120" selection-start-column="72" selection-end-line="120" selection-end-column="72" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="293">
-          <caret line="58" column="73" lean-forward="true" selection-start-line="58" selection-start-column="73" selection-end-line="58" selection-end-column="73" />
-          <folding>
-            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
-            <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
-          </folding>
-        </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="307">
-          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
+        <state relative-caret-position="758">
+          <caret line="130" column="5" lean-forward="true" selection-start-line="130" selection-start-column="5" selection-end-line="130" selection-end-column="5" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1170">
-          <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
+        <state relative-caret-position="494">
+          <caret line="86" column="62" lean-forward="true" selection-start-line="86" selection-start-column="62" selection-end-line="86" selection-end-column="62" />
           <folding>
-            <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-            <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+            <element signature="method#getAllDevice#0;class#PgDeviceManager#0" />
+            <element signature="method#getAllDev#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="195" column="28" lean-forward="true" selection-start-line="195" selection-start-column="28" selection-end-line="195" selection-end-column="28" />
+        <state relative-caret-position="166">
+          <caret line="174" column="13" lean-forward="true" selection-start-line="174" selection-start-column="13" selection-end-line="174" selection-end-column="13" />
           <folding>
-            <element signature="method#getAlarmByTypeAndTime#0;class#PgAlarmManager#0" />
-            <element signature="method#getAlarmNum#0;class#PgAlarmManager#0" />
             <element signature="method#getDayAlarmStatistic#0;class#PgAlarmManager#0" />
+            <element signature="method#getAlarmList#0;class#PgAlarmManager#0" />
             <element signature="method#createDTO#0;class#PgAlarmManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="364">
+          <caret line="46" column="56" lean-forward="true" selection-start-line="46" selection-start-column="56" selection-end-line="46" selection-end-column="56" />
+          <folding>
+            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
+            <element signature="method#getPgDev#0;class#PgDeviceRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
+            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+        <state relative-caret-position="396">
+          <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
           <folding>
             <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
             <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -1365,52 +1331,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="239">
-          <caret line="21" column="33" lean-forward="true" selection-start-line="21" selection-start-column="33" selection-end-line="21" selection-end-column="33" />
-        </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="352">
-          <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-        </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="99">
-          <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-          </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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-          <folding>
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-            <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>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
index c436c93..e913155 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
@@ -132,7 +132,10 @@
             this.setAlarmType("");
         else
             this.setAlarmType(pgAlarm.getAlarmTypeId().getAlarmType());
-        this.setAlarmValue(pgAlarm.getAlarmValue());
+        if(pgAlarm.getAlarmValue()==null)
+            this.setAlarmValue("");
+        else
+            this.setAlarmValue(pgAlarm.getAlarmValue());
         if (pgAlarm.getAlarmDate() != null)
             this.setAlarmDate(sdf.format(pgAlarm.getAlarmDate()));
         else
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
index a43965c..565cb41 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -159,11 +159,21 @@
     }
 
     //获取历史报警消息列表
-    public List<PgAlarmDto> getAllAlarm(String alarmType,String startDay,String endDay,String isNew,int page,int rows) {
-        try {
+    public  Map<String, Object> getAllAlarm(String alarmType,String partition,String startDay,String endDay,String isNew,int page,int rows) {
 
+        Map<String, Object> resultMap = new HashMap<>();
+        String msg="";
+
+        try {
             Criteria criteria = createCriteria(PgAlarm.class);
 
+            if (StringUtils.isNotBlank(partition)) {
+                DetachedCriteria inCriteria = DetachedCriteria.forClass(PgDevice.class);
+                inCriteria.add(Restrictions.eq("partition", partition));
+                inCriteria.setProjection(Property.forName("id"));
+                criteria.add(Property.forName("alarmDevId").in(inCriteria));
+            }
+
             if (StringUtils.isNotBlank(alarmType)&&!alarmType.contains("全部")&&pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
                 criteria.add(Restrictions.eq("alarmTypeId", pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)));
 
@@ -190,8 +200,16 @@
             for (PgAlarm pgAlarm : pgAlarmList) {
                 pgAlarmDtoList.add(new PgAlarmDto(pgAlarm));
             }
-
-            return pgAlarmDtoList;
+            if(pgAlarmDtoList==null||pgAlarmDtoList.size()==0) {
+                resultMap.put("msg", "没有报警信息");
+                resultMap.put("code","0");
+            }else {
+                resultMap.put("code","200");
+                resultMap.put("msg", "报警信息获取成功");
+            }
+            resultMap.put("count",pg.getTotalCount());
+            resultMap.put("result",pgAlarmDtoList);
+            return resultMap;
         }
         catch(Exception ex){
             ex.printStackTrace();
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index 7547560..654f49e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -24,11 +24,11 @@
 
         Criteria criteria = createCriteria(PgDevice.class);
 
-        if(road!=null)
+        if(StringUtils.isNotBlank(road))
             criteria.add(Restrictions.eq("road",road));
-        if(partition!=null)
+        if(StringUtils.isNotBlank(partition))
             criteria.add(Restrictions.eq("partition",partition));
-        if(devType!=null)
+        if(StringUtils.isNotBlank(devType))
             criteria.add(Restrictions.eq("devType",devType));
 
         criteria.add(Restrictions.eq("active", 1));
@@ -43,6 +43,29 @@
         return pgDeviceDtoList;
     }
 
+    public List<PgDeviceDto> getAllDev(String road,String partition,String devType) {
+
+        Criteria criteria = createCriteria(PgDevice.class);
+
+        if(StringUtils.isNotBlank(road))
+            criteria.add(Restrictions.eq("road",road));
+        if(StringUtils.isNotBlank(partition))
+            criteria.add(Restrictions.eq("partition",partition));
+        if(StringUtils.isNotBlank(devType))
+            criteria.add(Restrictions.like("devType","%"+devType+"%"));
+
+        criteria.add(Restrictions.eq("active", 1));
+        criteria.addOrder(Order.desc("id"));
+        List<PgDevice> pgDeviceList = criteria.list();
+
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
+        for (PgDevice pgDevice : pgDeviceList) {
+            pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
+        }
+
+        return pgDeviceDtoList;
+    }
+
     //根据名字获取当前设备
     public PgDevice getDeviceByAssetCode(String assetCode) {
         Criteria criteria=createCriteria(PgDevice.class);
@@ -56,9 +79,9 @@
     }
 
     //根据类型获取设备列表
-    public List<PgDeviceDto> getDeviceByDevTypee(String devType) {
+    public List<PgDeviceDto> getDeviceByDevType(String devType) {
         Criteria criteria=createCriteria(PgDevice.class);
-        criteria.add(Restrictions.eq("devType",devType));
+        criteria.add(Restrictions.like("devType","%"+devType+"%"));
 
         List<PgDevice> pgDeviceList=criteria.list();
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
@@ -106,7 +129,7 @@
         criteria.add(Restrictions.eq("partition",partition));
 
         List<PgDevice> pgDeviceList=criteria.list();
-        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<PgDeviceDto>();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
 
         for (PgDevice pgDevice : pgDeviceList) {
             pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
index 3a3bccd..595730e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
@@ -1,10 +1,13 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.devTable.domain.PgAlarmType;
 import com.casic.PgInterface.devTable.domain.PgPartition;
 import com.casic.PgInterface.devTable.domain.PgRoad;
 import com.casic.PgInterface.devTable.domain.PipeGallery;
 import com.casic.PgInterface.devTable.dto.PgPartitionDto;
+import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
@@ -12,7 +15,9 @@
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Created by yxw on 2017/11/4.
@@ -21,7 +26,8 @@
 public class PgPartitionManager extends HibernateEntityDao<PgPartition> {
 
     @Resource
-    PgRoadManager pgRoadManager;
+    private PgRoadManager pgRoadManager;
+
 
     public PgPartition getPartitionByParName(String parName) {
         Criteria criteria = getSession().createCriteria(PgPartition.class);
@@ -99,4 +105,5 @@
         return pgPartitionDtoList;
     }
 
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
index f216360..a6928f1 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
@@ -5,6 +5,7 @@
 public class PgPlanResultRe {
 
     private String taskKey;
+    private List<String> pileAcuList;
     private List<PgPlanResult> pgPlanResultList;
 
     public String getTaskKey() {
@@ -15,6 +16,14 @@
         this.taskKey = taskKey;
     }
 
+    public List<String> getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(List<String> pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+
     public List<PgPlanResult> getPgPlanResultList() {
         return pgPlanResultList;
     }
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
index 71ea765..47eea07 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
@@ -54,9 +54,7 @@
 
         List<PgLineHole> pgLineHoleList=criteria.list();
         List<PgLineHoleDTO> pgLineHoleDTOList=new ArrayList<>();
-        if(pgLineHoleList==null||pgLineHoleList.size()==0)
-            return null;
-        else
+        if(pgLineHoleList!=null&&pgLineHoleList.size()!=0)
             pgLineHoleDTOList=PgLineHoleDTO.ConvertToDTOList(pgLineHoleList,pgPileAcuManager,pgRoadManager);
         return pgLineHoleDTOList;
     }
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
index 0fd9e1f..841a386 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
@@ -1,12 +1,15 @@
 package com.casic.PgInterface.intelPlan.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.devTable.domain.PgPartition;
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
 import com.casic.PgInterface.intelPlan.domain.PgLineHole;
 import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
 import com.casic.PgInterface.intelPlan.domain.PgSection;
 import com.casic.PgInterface.intelPlan.dto.PgPlanResult;
 import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
 import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -22,6 +25,9 @@
     @Resource
     private PgLineHoleManager pgLineHoleManager;
 
+    @Resource
+    private PgRoadManager pgRoadManager;
+
     public PgPileAcu getPgPileAcuByCode(String acuCode){
         List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
 
@@ -58,7 +64,9 @@
         for(PgPlanTask pgPlanTask:pgPlanTaskList){
             List<PgPlanResult> pgPlanResultList=getPgPlanResultByPlantask(pgPlanTask);
             PgPlanResultRe pgPlanResultRe=new PgPlanResultRe();
+
             pgPlanResultRe.setTaskKey(pgPlanTask.getTaskKey());
+            pgPlanResultRe.setPileAcuList(pgPlanTask.getPileAcuList());
             pgPlanResultRe.setPgPlanResultList(pgPlanResultList);
 
             pgPlanResultReList.add(pgPlanResultRe);
@@ -142,4 +150,57 @@
         return length;
     }
 
+    private PgPileAcu getPgPileAcuByAcuCode(String acuCode){
+        List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
+
+        if(pgPileAcuList==null||pgPileAcuList.size()==0)
+            return null;
+        else
+            return pgPileAcuList.get(0);
+    }
+
+    public List<PgAcuTask> getACUTask(String pileAcuList){
+        String[] acuArray=pileAcuList.split(",");
+        List<PgAcuTask> pgAcuTaskList=new ArrayList<>();
+
+        for(String acu:acuArray){
+            PgPileAcu pgPileAcu=this.getPgPileAcuByCode(acu);
+            String roadName=pgRoadManager.get(pgPileAcu.getRoadId()).getRoadName();
+
+            if(!containRoad(roadName,pgAcuTaskList))
+            {
+                PgAcuTask pgAcuTask=new PgAcuTask();
+                pgAcuTask.setRoadName(roadName);
+                pgAcuTask.setPileAcuList(acu);
+                pgAcuTaskList.add(pgAcuTask);
+            }
+            else{
+                PgAcuTask pgAcuTask=getIndexRoad(roadName,pgAcuTaskList);
+                if(pgAcuTask!=null)
+                    pgAcuTask.setPileAcuList(pgAcuTask.getPileAcuList()+","+acu);
+            }
+        }
+
+        return pgAcuTaskList;
+    }
+
+    private boolean containRoad(String roadName,List<PgAcuTask> pgAcuTaskList){
+        if(pgAcuTaskList==null||pgAcuTaskList.size()==0) return false;
+        for(PgAcuTask pgAcuTask:pgAcuTaskList){
+            if(pgAcuTask.getRoadName().equals(roadName))
+                return true;
+        }
+
+        return false;
+    }
+
+    private PgAcuTask getIndexRoad(String roadName, List<PgAcuTask> pgAcuTaskList){
+        for(PgAcuTask pgAcuTask:pgAcuTaskList){
+            if(pgAcuTask.getRoadName().equals(roadName))
+                return pgAcuTask;
+        }
+
+        return null;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java
new file mode 100644
index 0000000..323f7ef
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java
@@ -0,0 +1,25 @@
+package com.casic.PgInterface.reservePlan.dto;
+
+import java.util.List;
+
+public class PgAcuTask {
+
+    private String roadName;//道路
+    private String pileAcuList;//acu分区
+
+    public String getRoadName() {
+        return roadName;
+    }
+
+    public void setRoadName(String roadName) {
+        this.roadName = roadName;
+    }
+
+    public String getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(String pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
index c25e926..c7d7693 100644
--- a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
@@ -70,9 +70,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(Long.valueOf(inPgPersonId));
         PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("hostName",pgInPgPerson.getAssetCode());
-//        PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode());
-//        long maxId = pgTagPositionManager.getMaxId(pgTagMac.getTagMac());
-//        PGTagPosition pgTagPosition = pgTagPositionManager.get(maxId);
+
         PGTagPosition pgTagPosition = tagmacRun.GetTagStatus(pgTagMac);
         boolean bExist = false;
         bExist = pgTagPositionManager.findTagPosition(pgTagPosition.getPositionUpdatetime(),pgTagPosition.getHostId());
@@ -104,8 +102,7 @@
         PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(Long.valueOf(inPgPersonId));
         PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pgInPgPersonId",pgInPgPerson);
         System.out.println("time:"+pgInPgStatus.getInTime());
-//        PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pgInPgPersonId",inPgPersonId);
-//        PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode());
+
         PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("hostName",pgInPgPerson.getAssetCode());
 
         Map<Object,Object> mapPosition = new HashMap<>();
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
index 082ba5d..3eed00a 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
@@ -48,6 +48,7 @@
     public Map<String, Object> linkDevice(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         PgDeviceDto pgDeviceDto = null;
         try {
@@ -62,6 +63,7 @@
                     else {
                         pgDeviceDto = new PgDeviceDto(pgDevice);
                         msg = "报警关联设备获取成功";
+                        code="200";
                     }
                 }
             }
@@ -71,6 +73,7 @@
             e.printStackTrace();
             msg = "获取关联设备失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceDto);
 
@@ -86,6 +89,7 @@
     public Map<String, Object> linkPartitionCamera(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
         try {
@@ -106,6 +110,7 @@
 
                         pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(partition,position);
                         msg = "关联设备获取成功";
+                        code="200";
                     }
                 }
             }
@@ -115,6 +120,7 @@
             e.printStackTrace();
             msg = "分区设备关联失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceDtoList);
         return resultMap;
@@ -129,6 +135,7 @@
     public Map<String, Object> linkReservePlan(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgReservePlanDto> pgReservePlanDtoList=new ArrayList<>();
         try{
@@ -139,10 +146,12 @@
                 else {
                     pgReservePlanDtoList = pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
 
-                    if(pgReservePlanDtoList==null||pgReservePlanDtoList.size()==0)
-                        msg="不存在关联的报警预案";
-                    else
+                    if (pgReservePlanDtoList == null || pgReservePlanDtoList.size() == 0)
+                        msg = "不存在关联的报警预案";
+                    else {
                         msg = "关联预案获取成功";
+                        code="200";
+                    }
                 }
             }
             else
@@ -153,6 +162,7 @@
             e.printStackTrace();
             msg="预案关联失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgReservePlanDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
index 0ddbc4d..0ce886b 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
@@ -41,25 +41,19 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getAlarmList(@FormParam("alarmType") String alarmType,
                                             @FormParam("startDay") String startDay,
+                                            @FormParam("partition") String partition,
                                             @FormParam("endDay") String endDay,
                                             @FormParam("isNew") String isNew,
                                             @FormParam("page") int page,
                                             @FormParam("rows") int rows) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
         try {
-            pgAlarmDtoList = pgAlarmManager.getAllAlarm(alarmType,startDay,endDay,isNew,page,rows);
-            if (pgAlarmDtoList==null||pgAlarmDtoList.size() == 0)
-                msg = "没有报警信息";
-            else
-                msg = "报警信息获取成功";
+            resultMap = pgAlarmManager.getAllAlarm(alarmType,partition,startDay,endDay,isNew,page,rows);
+
         } catch (Exception e) {
             e.printStackTrace();
-            msg = "报警信息获取失败";
         }
-        resultMap.put("msg", msg);
-        resultMap.put("result", pgAlarmDtoList);
         return resultMap;
     }
 
@@ -71,9 +65,10 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> clearAlarmList(@FormParam("id") String id) throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        String result = "false";
+        String result = "";
+        String code="0";
 
         try {
             PgAlarm pgAlarm = new PgAlarm();
@@ -86,12 +81,14 @@
                 pgAlarmManager.save(pgAlarm);
                 msg = "报警信息清除成功";
                 result = "true";
+                code = "200";
             }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警信息清除失败";
             result = "false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
@@ -106,21 +103,26 @@
     public Map<String, Object> getAlarmByTypeOrTime(@FormParam("alarmType") String alarmType,
                                                     @FormParam("startTime") String startTime,
                                                     @FormParam("endTime") String endTime) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
-        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<PgAlarmDto>();
+        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
         try {
             pgAlarmDtoList = pgAlarmManager.getAlarmByTypeAndTime(alarmType, startTime, endTime);
             if (pgAlarmDtoList == null || pgAlarmDtoList.size() == 0)
                 msg = "报警信息不存在";
             else
+            {
                 msg = "报警信息获取成功";
+                code="200";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警信息获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
index 29ce8a4..ed0bf34 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
@@ -39,8 +39,8 @@
     public Map<String, Object> getAlarmRule(@FormParam("devType") String devType) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
-        System.out.println("devType:"+devType);
         List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<>();
         try {
             pgAlarmRuleDtoList = pgAlarmRuleManager.getAlarmRuleDto(devType);
@@ -52,6 +52,7 @@
             e.printStackTrace();
             msg = "报警阈值信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmRuleDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
index 24ab894..abef1b1 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
@@ -39,16 +39,21 @@
                                                      @FormParam("endDate") String endDate)throws Exception{
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
+
         List<PgAlarmTjDto> pgAlarmTjDtoList=null;
         try{
             pgAlarmTjDtoList=pgAlarmTjManager.getAlarmTjResultByType(startDate,endDate);
             msg="获取成功";
+            code="200";
         }
         catch(Exception ex) {
             msg = "统计失败";
         }
-        resultMap.put("result",pgAlarmTjDtoList);
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
+        resultMap.put("result",pgAlarmTjDtoList);
+
         return resultMap;
     }
 
@@ -61,23 +66,27 @@
     public Map<String, Object> getAlarmByTime(@FormParam("startTime") String startTime,
                                               @FormParam("endTime") String endTime,
                                               @FormParam("statisticType") String statisticType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code = "0";
 
-        List<PgAlarmTjDto> pgAlarmTjDtoList = new ArrayList<PgAlarmTjDto>();
+        List<PgAlarmTjDto> pgAlarmTjDtoList = new ArrayList<>();
         try {
             pgAlarmTjDtoList = pgAlarmTjManager.getAlarmByTime(startTime, endTime, statisticType);
             if(pgAlarmTjDtoList==null)
                 msg="报警统计信息获取失败";
-            else
-                msg="报警统计信息获取成功";
+            else {
+                msg = "报警统计信息获取成功";
+                code="200";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警统计信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmTjDtoList);
         return resultMap;
     }
 
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
index 28bc811..b6278a9 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
@@ -30,7 +30,6 @@
     @Resource
     private PgAlarmTypeManager pgAlarmTypeManager;
 
-
     /**
      * 获取报警类型
      */
@@ -38,19 +37,24 @@
     @Path("getAlarmType")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getAlarmTypeList()throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
-        List<PgAlarmTypeDto> pgAlarmTypeDtoList=new ArrayList<PgAlarmTypeDto>();
+        String code="";
+
+        List<PgAlarmTypeDto> pgAlarmTypeDtoList=new ArrayList<>();
         try {
             pgAlarmTypeDtoList = pgAlarmTypeManager.getAllAlarmTypeDto();
             if(pgAlarmTypeDtoList.size()==0)
                 msg="没有报警类型信息";
-            else
-                msg="报警类型信息获取成功";
+            else {
+                code="200";
+                msg = "报警类型信息获取成功";
+            }
         }catch(Exception e){
             e.printStackTrace();
             msg="报警类型信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAlarmTypeDtoList);
         return resultMap;
@@ -66,6 +70,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
@@ -83,6 +88,7 @@
                 logger.info("成功保存");
                 result = "true";
                 msg = "保存成功";
+                code="200";
             }
         } catch (Exception e) {
             result = "false";
@@ -90,6 +96,7 @@
             e.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -106,6 +113,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try{
             if(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
@@ -119,6 +127,7 @@
                 pgAlarmTypeManager.save(pgAlarmType);
                 result = "true";
                 msg = "编辑成功";
+                code="200";
             }
         }
         catch(Exception e)
@@ -128,6 +137,7 @@
             e.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("result",result);
         resultMap.put("msg",msg);
 
@@ -146,6 +156,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
         String result="false";
+        String code="0";
 
         try {
             PgAlarmType pgAlarmType=pgAlarmTypeManager.get(Long.valueOf(id));
@@ -157,6 +168,7 @@
             {
                 pgAlarmType.setActive(0);
                 pgAlarmTypeManager.save(pgAlarmType);
+                code="200";
                 msg="报警类型删除成功";
                 result="true";
             }
@@ -165,6 +177,7 @@
             msg="报警类型删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
index 4533e1a..85940bb 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
@@ -33,12 +33,15 @@
                                                  @FormParam("inSpectionPlace") String inSpectionPlace){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
         List<PgAssetPlanDto> pgAssetPlanDtoList=new ArrayList<>();
         try{
             pgAssetPlanDtoList=pgAssetPlanManager.getPgAssetPlanDtoList(startDay,endDay,inSpectionPlace);
-            if(pgAssetPlanDtoList!=null&&pgAssetPlanDtoList.size()!=0)
-                msg="巡检信息获取成功";
+            if(pgAssetPlanDtoList!=null&&pgAssetPlanDtoList.size()!=0) {
+                code="200";
+                msg = "巡检信息获取成功";
+            }
             else
                 msg="不存在巡检信息";
         }
@@ -47,6 +50,7 @@
             msg="巡检信息获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAssetPlanDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
index 47ef9d1..5cbdfcb 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
@@ -30,12 +30,15 @@
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
         String result="";
+        String code="0";
 
         List<PgAssetPlanStatic> pgAssetPlanStaticList = null;
         try{
             pgAssetPlanStaticList=pgAssetPlanManager.getPgAssetPlanStaticLisByTime(startTime,endTime,staticType);
-            if(pgAssetPlanStaticList!=null&&pgAssetPlanStaticList.size()!=0)
-                msg="巡检统计信息获取成功";
+            if(pgAssetPlanStaticList!=null&&pgAssetPlanStaticList.size()!=0) {
+                code = "200";
+                msg = "巡检统计信息获取成功";
+            }
             else
                 msg="统计信息获取失败";
         }
@@ -44,6 +47,7 @@
             msg="统计失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAssetPlanStaticList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
index 26f5d6a..503bfe3 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
@@ -40,6 +40,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="";
 
         try{
             PgAuthority pgAuthority=new PgAuthority();
@@ -50,6 +51,7 @@
 
             pgAuthorityManager.save(pgAuthority);
             msg="用户权限保存成功";
+            code="200";
             result="true";
         }
         catch(Exception e) {
@@ -57,6 +59,7 @@
             msg = "新增权限失败";
             result = "false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -65,22 +68,25 @@
 
     /*
        *编辑角权限信息
-        */
+    */
     @POST
     @Path("editAuthority")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> editAuthority(@FormParam("id") String id,
                                        @FormParam("authority") String authority,
                                        @FormParam("concent") String concent) throws Exception{
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
+
         try {
             PgAuthority pgAuthority=pgAuthorityManager.get(Long.valueOf(id));
             pgAuthority.setAuthority(authority);
             pgAuthority.setConcent(concent);
 
             pgAuthorityManager.save(pgAuthority);
+            code="200";
             msg="权限保存成功";
             result="true";
         }
@@ -90,7 +96,7 @@
             msg="权限编辑失败";
             result="false";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -105,9 +111,10 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> deleteAuthority(@FormParam("id") String id)throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
-        String result="false";
+        String result="";
+        String code="0";
 
         try {
             PgAuthority pgAuthority= pgAuthorityManager.get(Long.valueOf(id));
@@ -119,6 +126,7 @@
             {
                 pgAuthority.setActive(0);
                 pgAuthorityManager.save(pgAuthority);
+                code="200";
                 msg="删除权限成功";
                 result="true";
             }
@@ -127,37 +135,40 @@
             msg="删除权限失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
     }
 
     /*
-* 获取权限信息
- */
+    * 获取权限信息
+    */
     @POST
     @Path("getAuthorityList")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> getAuthorityList() {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgAuthorityDto> pgAuthorityDtoList = new ArrayList<PgAuthorityDto>();
         try {
             pgAuthorityDtoList = pgAuthorityManager.getAuthorityList();
             if (pgAuthorityDtoList == null)
                 msg = "不存在权限信息";
-            else
+            else {
+                code = "200";
                 msg = "权限信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "权限信息获取是失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAuthorityDtoList);
         return resultMap;
     }
 
 
-
-
 }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
index a9ef521..a74ecc7 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
@@ -45,6 +45,7 @@
                                                @FormParam("endDate") String endDate)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgHistoryDataDto> pgHistoryDataDtoList=new ArrayList<>();
 
         try {
@@ -55,13 +56,16 @@
                 pgHistoryDataDtoList=pgCh4Manager.getAllCH4Data(pgDevice,startDate,endDate);
                 if(pgHistoryDataDtoList==null)
                     msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+                else {
+                    code = "200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgHistoryDataDtoList);
         return resultMap;
@@ -75,8 +79,9 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getNewestCh4InfoByDev(@FormParam("assetCode") String assetCode)throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
+        String code="0";
         PgCh4Dto pgCh4Dto=new PgCh4Dto(null);
 
         try {
@@ -87,13 +92,17 @@
                 pgCh4Dto=pgCh4Manager.getNewestCH4Data(pgDevice);
                 if(pgCh4Dto==null)
                     msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgCh4Dto);
         return resultMap;
@@ -111,6 +120,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
@@ -127,6 +137,7 @@
                 pgCh4.setPgDeviceId(pgDevice);
 
                 pgCh4Manager.save(pgCh4);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -135,7 +146,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
index a7eac39..dfc8ca5 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
@@ -43,23 +43,27 @@
                                                       @FormParam("endDate") String endDate)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgHistoryDataDto> pgHistoryDataDtoList=new ArrayList<>();
 
         try {
             PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
                 msg="设备不存在";
-            else{
-                pgHistoryDataDtoList=pgCoManager.getAllCoData(pgDevice, startDate, endDate);
-                if(pgHistoryDataDtoList==null)
-                    msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+            else {
+                pgHistoryDataDtoList = pgCoManager.getAllCoData(pgDevice, startDate, endDate);
+                if (pgHistoryDataDtoList == null)
+                    msg = "没有满足要求的数据";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgHistoryDataDtoList);
         return resultMap;
@@ -75,6 +79,7 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         PgCoDto pgCoDto=new PgCoDto(null);
 
         try {
@@ -85,13 +90,16 @@
                 pgCoDto=pgCoManager.getNewestCoData(pgDevice);
                 if(pgCoDto==null)
                     msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgCoDto);
         return resultMap;
@@ -110,6 +118,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         try {
@@ -126,6 +135,7 @@
 
                 pgCoManager.save(pgCo);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
         } catch (Exception e) {
@@ -133,7 +143,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
index b4b826e..9af98a3 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
@@ -60,6 +60,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         try {
 
@@ -80,8 +81,8 @@
                 pgConstruction.setPgConstructionTypeId(pgConstructionType.getId());
                 pgConstruction.setActive(1);
                 pgConstruction.setParName(parName);
-                logger.info("保存成功");
                 pgConstructionManager.save(pgConstruction);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -90,6 +91,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("success", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -116,6 +118,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
@@ -140,6 +143,7 @@
                 pgConstruction.setParName(parName);
 
                 pgConstructionManager.save(pgConstruction);
+                code="200";
                 result = "true";
                 msg = "编辑成功";
             }
@@ -150,7 +154,7 @@
             e.printStackTrace();
 
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -167,6 +171,8 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
+
         try {
             PgConstruction pgConstruction = pgConstructionManager.get(Long.valueOf(id));
             if (pgConstruction == null)
@@ -177,6 +183,7 @@
             {
                 pgConstruction.setActive(0);
                 pgConstructionManager.save(pgConstruction);
+                code="200";
                 result = "true";
                 msg = "成功删除信息";
             }
@@ -185,6 +192,7 @@
             result = "false";
             msg = "删除失败";
         }
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -204,9 +212,11 @@
                                                   @FormParam("rows") int rows)throws Exception{
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
         List<PgConstructionDto> pgConstructionDtoList=new ArrayList<>();
         try{
             pgConstructionDtoList=pgConstructionManager.getPgContructionDto(cs_name,cs_type,startTime,endTime,page,rows);
+            code="200";
             msg="信息获取成功";
         }
         catch(Exception e)
@@ -214,6 +224,7 @@
             e.printStackTrace();
             msg="查询失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
 
@@ -231,18 +242,22 @@
                                                               @FormParam("statisticType") String statisticType) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgConstructionStiatistic> pgConstructionStiatisticList=new ArrayList<>();
         try {
             pgConstructionStiatisticList = pgConstructionManager.getConstructionByTimeAndStatus(startTime, endTime, statisticType);
             if(pgConstructionStiatisticList==null)
                 msg="施工统计信息获取失败";
-            else
-                msg="施工统计信息获取成功";
+            else {
+                code="200";
+                msg = "施工统计信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "施工统计信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgConstructionStiatisticList);
         return resultMap;
@@ -257,6 +272,7 @@
     public Map<String, Object> getConstructionByType(@FormParam("statisticType") String statisticType){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
         List<PgConstructionStiatistic> pgConstructionStiatisticList=new ArrayList<>();
 
         try{
@@ -268,6 +284,7 @@
                 resultMap.put("result",null);
             }
             else {
+                code="200";
                 msg = "统计信息获取成功";
                 resultMap.put("result", pgConstructionStiatisticList);
             }
@@ -278,6 +295,7 @@
             msg="统计失败";
             resultMap.put("result",null);
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         return resultMap;
     }
@@ -291,9 +309,11 @@
     public Map<String, Object> getConstructionToday() throws Exception{
         Map<String,Object> resultMap=new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgConstructionDto> pgConstructionDtoList=new ArrayList<PgConstructionDto>();
         try {
             pgConstructionDtoList = pgConstructionManager.getConstructionToday();
+            code="200";
             msg = "当天施工信息获取成功";
         }
         catch(Exception e)
@@ -301,7 +321,7 @@
             e.printStackTrace();
             msg="获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
         return resultMap;
@@ -316,6 +336,7 @@
     public Map<String, Object> getConstructionDev(@FormParam("id") String id) throws Exception{
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
         List<PgDeviceDto> pgDeviceDtoList =new ArrayList<>();
         try{
@@ -325,14 +346,17 @@
 
             if(pgDeviceDtoList==null)
                 msg="信息获取失败";
-            else
-                msg="信息获取成功";
+            else {
+                code="200";
+                msg = "信息获取成功";
+            }
         }
         catch(Exception e)
         {
             e.printStackTrace();
-            msg="设备信息获取成功";
+            msg="信息获取是被";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgDeviceDtoList);
 
@@ -346,17 +370,21 @@
     @Path("getConstruction")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getConstruction() throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
-        List<PgConstructionDto> pgConstructionDtoList=new ArrayList<PgConstructionDto>();
+        String code="0";
+
+        List<PgConstructionDto> pgConstructionDtoList=new ArrayList<>();
 
         try{
             pgConstructionDtoList=pgConstructionManager.getPgConstructionList();
             if(pgConstructionDtoList==null||pgConstructionDtoList.size()==0)
                 msg="不存在施工记录";
-            else
-                msg="施工信息获取成功";
+            else {
+                code = "200";
+                msg = "施工信息获取成功";
+            }
         }
         catch(Exception e)
         {
@@ -364,6 +392,7 @@
             msg="施工信息获取失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java
index fd3d53e..2019502 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java
@@ -39,12 +39,12 @@
         try {
             pgConstructionTypeDtoList = pgConstructionTypeManager.getAllConstructionTypeDto();
             if (pgConstructionTypeDtoList.size() == 0)
-                msg = "没有项目类型信息";
+                msg = "获取失败";
             else
-                msg = "项目类型获取成功";
+                msg = "获取成功";
         } catch (Exception e) {
             e.printStackTrace();
-            msg = "项目类型信息获取失败";
+            msg = "获取失败";
         }
         resultMap.put("msg", msg);
         resultMap.put("result", pgConstructionTypeDtoList);
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
index 90d001c..037a399 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
@@ -51,6 +51,7 @@
 
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if (StringUtils.isBlank(construct_doc)||StringUtils.isBlank(doc_name))
@@ -65,6 +66,7 @@
             pgCsDocument.setActive(1);
             pgCsDocumentManager.save(pgCsDocument);
 
+            code="200";
             result = "true";
             msg = "保存成功";
 
@@ -74,6 +76,7 @@
             ex.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("success", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -90,6 +93,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             PgCsDocument pgCsDocument = pgCsDocumentManager.get(Long.valueOf(id));
@@ -103,6 +107,7 @@
 
                 pgCsDocumentManager.save(pgCsDocument);
 
+                code="200";
                 result = "true";
                 msg = "编辑成功";
             }
@@ -112,6 +117,7 @@
             msg = "编辑失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -125,9 +131,9 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
         String result="";
+        String code="0";
 
         try{
-
             PgCsDocument pgCsDocument = pgCsDocumentManager.get(Long.valueOf(id));
             if(pgCsDocument==null)
             {
@@ -137,6 +143,7 @@
             else{
                 pgCsDocument.setActive(0);
                 pgCsDocumentManager.save(pgCsDocument);
+                code="200";
                 result="true";
                 msg="删除成功";
             }
@@ -147,7 +154,7 @@
             msg="预案删除失败";
             result="false";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -168,18 +175,21 @@
 
         String msg="";
         String result="";
+        String code="0";
 
         try {
             pgCsDocumentDtoList = pgCsDocumentManager.getAllDocData(cs_name);
-            if (pgCsDocumentDtoList != null)
+            if (pgCsDocumentDtoList != null) {
+                code="200";
                 msg = "获取数据成功";
+            }
             else
                 msg = "没有满足条件的数据";
         }catch (Exception e){
             e.printStackTrace();
             msg = "获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgCsDocumentDtoList);
         return resultMap;
@@ -192,20 +202,22 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
 
         String msg = "";
+        String code="0";
         ResponseEntity<byte[]> path = null;
         try {
             PgCsDocument pgCsDocument = pgCsDocumentManager.get(Long.valueOf(id));
             path = pgCsDocumentManager.downloadFile(pgCsDocument);
             if (path == null)
                 msg = "不存在该文档";
-            else
+            else {
+                code = "200";
                 msg = "下载成功";
-
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "下载失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", path.getBody());
         resultMap.put("msg", msg);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
index 94c5c84..ffc8b95 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
@@ -41,22 +41,24 @@
     public Map<String, Object> getPgDeviceByDevType(@FormParam("devType") String devType) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
         try {
-            pgDeviceDtoList = pgDeviceManager.getDeviceByDevTypee(devType);
+            pgDeviceDtoList = pgDeviceManager.getDeviceByDevType(devType);
             if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0){
                 msg="不存在满足要求的数据";
-                resultMap.put("result",null);
             }
             else{
-                resultMap.put("result", pgDeviceDtoList);
+                code="200";
                 msg = "获取成功";
             }
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", pgDeviceDtoList);
         return resultMap;
     }
 
@@ -69,25 +71,26 @@
     public Map<String, Object> getPgDeviceByAssetCode(@FormParam("assetCode") String assetCode) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         PgDeviceDto pgDeviceDto=null;
         try {
             PgDevice pgDevice = pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
             {
                 msg="不存在设备信息";
-                resultMap.put("result",null);
             }
             else {
                 pgDeviceDto = new PgDeviceDto(pgDevice);
                 msg = "获取成功";
-                resultMap.put("result", pgDeviceDto);
+                code="200";
             }
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", pgDeviceDto);
         return resultMap;
     }
 
@@ -102,27 +105,61 @@
                                              @FormParam("devType") String devType)throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
         try {
             pgDeviceDtoList = pgDeviceManager.getAllDevice(road,partition,devType);
             if(pgDeviceDtoList.size()==0) {
                 msg = "没有找到设备信息";
-                resultMap.put("result",null);
             }
             else {
                 msg = "设备信息获取成功";
-                resultMap.put("result", pgDeviceDtoList);
+                code="200";
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result", pgDeviceDtoList);
         return resultMap;
     }
 
     /**
+     * 显示设备列表
+     */
+    @POST
+    @Path("getPgDev")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String, Object> getPgDev(@FormParam("road") String road,
+                                             @FormParam("partition") String partition,
+                                             @FormParam("devType") String devType)throws Exception {
+        Map<String, Object> resultMap = new HashMap<>();
+        String msg="";
+        String code="0";
+        List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
+        try {
+            pgDeviceDtoList = pgDeviceManager.getAllDev(road,partition,devType);
+            if(pgDeviceDtoList.size()==0) {
+                msg = "没有找到设备信息";
+            }
+            else {
+                code="200";
+                msg = "设备信息获取成功";
+            }
+        }catch(Exception e){
+            e.printStackTrace();
+            msg="设备信息获取失败";
+        }
+        resultMap.put("code",code);
+        resultMap.put("msg",msg);
+        resultMap.put("result", pgDeviceDtoList);
+        return resultMap;
+    }
+
+
+    /**
      * 新增设备
      */
     @POST
@@ -145,6 +182,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if (pgDeviceManager.getDeviceByAssetCode(assetCode)!=null) {
@@ -169,6 +207,7 @@
 
                 pgDeviceManager.save(pgDevice);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
 
@@ -177,10 +216,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -208,14 +246,9 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
-            /*
-            if (pgDeviceManager.getDeviceByAssetCode(assetCode)!=null) {
-                result = "false";
-                msg = "已存在同名设备";
-            } else {
-            */
             PgDevice pgDevice = pgDeviceManager.get(Long.valueOf(id));
             pgDevice.setPipeGallery(pipeGallery);
             pgDevice.setPartition(partition);
@@ -233,14 +266,14 @@
 
             pgDeviceManager.save(pgDevice);
             result = "true";
+            code="200";
             msg = "编辑成功";
-            //}
         } catch (Exception e) {
             result = "false";
             msg = "编辑失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("result",result);
         resultMap.put("msg",msg);
         return resultMap;
@@ -256,7 +289,8 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
-        String result="false";
+        String result="";
+        String code="0";
 
         try {
             PgDevice pgDevice=pgDeviceManager.get(Long.valueOf(id));
@@ -268,6 +302,7 @@
             {
                 pgDevice.setActive(0);
                 pgDeviceManager.save(pgDevice);
+                code="200";
                 msg="设备删除成功";
                 result="true";
             }
@@ -276,6 +311,7 @@
             msg="设备删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -291,18 +327,18 @@
     {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         PgDeviceDto pgDeviceDto=null;
 
         try{
             PgDevice pgDevice=pgDeviceManager.getDeviceBydevCode(devCode);
             if(pgDevice==null) {
                 msg = "设备信息获取失败";
-                resultMap.put("result",null);
             }
             else{
                 pgDeviceDto = new PgDeviceDto(pgDevice);
                 msg = "设备信息获取成功";
-                resultMap.put("result",pgDeviceDto);
+                code="200";
             }
         }
         catch(Exception ex)
@@ -310,8 +346,9 @@
             ex.printStackTrace();
             msg="设备状态获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgDeviceDto);
         return resultMap;
     }
 
@@ -324,17 +361,17 @@
     public Map<String,Object> getDeviceByPartition(@FormParam("partition") String partition) throws Exception{
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<PgDeviceDto>();
 
         try{
             pgDeviceDtoList=pgDeviceManager.getPgDeviceDtoListByPartition(partition);
             if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0) {
                 msg = "设备信息获取失败";
-                resultMap.put("result",null);
             }
             else {
+                code="200";
                 msg = "设备信息获取成功";
-                resultMap.put("result",pgDeviceDtoList);
             }
         }
         catch(Exception e)
@@ -342,8 +379,9 @@
             e.printStackTrace();
             msg="设备信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgDeviceDtoList);
         return resultMap;
     }
 
@@ -353,17 +391,16 @@
     public Map<String,Object> getDeviceByOldDAssetCodeCode(@FormParam("assetCode") String assetCode) throws Exception{
         Map<String, Object> resultMap = new HashMap<>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
 
         try{
             pgDeviceDtoList=pgDeviceManager.getDeviceByOldDAssetCodeCode(assetCode);
-            if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0) {
-                msg = "设备信息获取失败";;
-                resultMap.put("result",null);
-            }
+            if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0)
+                msg = "设备信息获取失败";
             else {
                 msg = "设备信息获取成功";
-                resultMap.put("result",pgDeviceDtoList);
+                code="200";
             }
         }
         catch(Exception e)
@@ -372,8 +409,9 @@
             msg="设备信息获取失败";
             resultMap.put("result",null);
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgDeviceDtoList);
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java
index 421d249..f6f167d 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java
@@ -38,17 +38,21 @@
     public Map<String, Object> getDeviceTpeyList()throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgDeviceTypeDto> pgDeviceTypeDtoList=new ArrayList<PgDeviceTypeDto>();
         try {
             pgDeviceTypeDtoList = pgDeviceTypeManager.getAllDeviceType();
             if(pgDeviceTypeDtoList.size()==0)
                 msg="没有找到设备类型信息";
-            else
-                msg="设备类型信息获取成功";
+            else {
+                code="200";
+                msg = "设备类型信息获取成功";
+            }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备类型信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgDeviceTypeDtoList);
         return resultMap;
@@ -66,6 +70,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if (pgDeviceTypeManager.getDeviceTypeByDeType(devType)!=null) {
@@ -79,6 +84,7 @@
 
                 pgDeviceTypeManager.save(pgDeviceType);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
 
@@ -87,10 +93,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
index c276fb3..c789960 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
@@ -44,6 +44,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 
         try {
@@ -62,6 +63,7 @@
                 pgEquipment.setActive(1);
 
                 pgEquipmentManager.save(pgEquipment);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -70,9 +72,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -89,9 +91,10 @@
                                             @FormParam("ownerUnit") String ownerUnit,
                                             @FormParam("enterDate") String enterDate,
                                             @FormParam("curUser") String curUser) {
-        HashMap<String, Object> resultMap = new HashMap<String, Object>();
+        HashMap<String, Object> resultMap = new HashMap<>();
         String msg = "";
         String result = "";
+        String code="0";
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 
         try {
@@ -111,6 +114,7 @@
                 pgEquipment.setEnterDate(sdf.parse(enterDate));
 
                 pgEquipmentManager.save(pgEquipment);
+                code="200";
                 msg="编辑成功";
                 result="true";
             }
@@ -119,9 +123,9 @@
             result = "false";
             msg = "编辑失败";
         }
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -134,16 +138,19 @@
     public Map<String, Object> getEquipment(@FormParam("eqName") String eqName,
                                             @FormParam("eqCode") String eqCode,
                                             @FormParam("eqType") String eqType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        List<PgEquipmentDto> pgEquipmentDtoList=new ArrayList<PgEquipmentDto>();
+        String code="0";
+        List<PgEquipmentDto> pgEquipmentDtoList=new ArrayList<>();
 
         try{
             pgEquipmentDtoList=pgEquipmentManager.getEquipmentDtiList(eqName,eqCode,eqType);
             if(pgEquipmentDtoList==null||pgEquipmentDtoList.size()==0)
                 msg="不存在工器具记录";
-            else
-                msg="维获取成功";
+            else {
+                code = "200";
+                msg = "维获取成功";
+            }
         }
         catch(Exception e)
         {
@@ -166,6 +173,7 @@
         HashMap<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
         String result = "";
+        String code="";
 
         try {
             PgEquipment pgEquipment=pgEquipmentManager.get(Long.valueOf(id));
@@ -178,6 +186,7 @@
             {
                 pgEquipment.setActive(0);
                 pgEquipmentManager.save(pgEquipment);
+                code="200";
                 msg="删除成功";
                 result="true";
             }
@@ -186,6 +195,7 @@
             msg="设备信息获取失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -201,16 +211,19 @@
             throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=new ArrayList<PgDeviceTypeStatisticDto>();
 
         try {
             pgDeviceTypeStatisticDtoList=pgEquipmentManager.getDeviceStatisticByDevType(eqType);
 
+            code="200";
             msg = "获取成功";
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceTypeStatisticDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
index 05a9709..a90fd6c 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
@@ -4,9 +4,9 @@
 import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
 import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
 import com.casic.PgInterface.intelPlan.manager.PgPileAcuManager;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import com.casic.PgInterface.test.PlanData;
 import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.ModelAttribute;
 
 import javax.annotation.Resource;
 import javax.ws.rs.FormParam;
@@ -32,23 +32,25 @@
     public Map<String,Object> getPlanResult(@FormParam("planParamStr") String planParamStr){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
-        //List<PgPlanTask> pgPlanTaskList=pgPlanParams.getPgPlanTaskList();
         List<PgPlanTask> pgPlanTaskList=new PgPlanParams().getPgPlanParamsByString(planParamStr);
         List<PgPlanResultRe> pgPlanResultReList=new ArrayList<>();
 
-        try{
-                pgPlanResultReList=pgPileAcuManager.getPgPlanResultList(pgPlanTaskList);
-                if(pgPlanResultReList==null)
-                    msg="管线智能规划出错";
-                else
-                    msg="管线智能规划完成";
+        try {
+            pgPlanResultReList = pgPileAcuManager.getPgPlanResultList(pgPlanTaskList);
+            if (pgPlanResultReList == null)
+                msg = "管线智能规划出错";
+            else {
+                code="200";
+                msg = "管线智能规划完成";
+            }
         }
         catch(Exception ex){
             msg="智能规划出错";
             ex.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgPlanResultReList);
 
@@ -80,4 +82,30 @@
         return resultMap;
     }
 
+    @POST
+    @Path("getPlanTask")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getACUTask(@FormParam("pileAcuList") String pileAcuList){
+
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        String code="0";
+        List<PgAcuTask> pgAcuTaskList=new ArrayList<>();
+
+        try{
+            pgAcuTaskList=pgPileAcuManager.getACUTask(pileAcuList);
+            code="200";
+            msg="任务获取成功";
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            msg="任务获取失败";
+        }
+        resultMap.put("code",code);
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgAcuTaskList);
+
+        return resultMap;
+    }
+
 }
\ No newline at end of file

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 25ded8a..283d7ab 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,20 +7,56 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" 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/construction/manager/PgCsDocumentManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/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/manager/PgAlarmManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/~$说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/~$说明20191207.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.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$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/接口说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明20191207.docx" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
@@ -51,7 +87,7 @@
         <counts>
           <entry key="class" value="4" />
           <entry key="iml" value="2" />
-          <entry key="java" value="707" />
+          <entry key="java" value="820" />
           <entry key="properties" value="14" />
           <entry key="xml" value="7" />
         </counts>
@@ -60,7 +96,7 @@
         <counts>
           <entry key="CLASS" value="4" />
           <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="707" />
+          <entry key="JAVA" value="820" />
           <entry key="Properties" value="14" />
           <entry key="XML" value="7" />
         </counts>
@@ -68,32 +104,32 @@
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
           <entry key="dummy" value="38" />
-          <entry key="java" value="30161" />
+          <entry key="java" value="40859" />
           <entry key="properties" value="100" />
-          <entry key="txt" value="176" />
+          <entry key="txt" value="186" />
           <entry key="xml" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="30161" />
-          <entry key="PLAIN_TEXT" value="214" />
+          <entry key="JAVA" value="40859" />
+          <entry key="PLAIN_TEXT" value="224" />
           <entry key="Properties" value="100" />
           <entry key="XML" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="48" />
+          <entry key="project.closed" value="51" />
           <entry key="project.open.time.1" value="5" />
           <entry key="project.open.time.12" value="2" />
           <entry key="project.open.time.13" value="1" />
           <entry key="project.open.time.15" value="1" />
           <entry key="project.open.time.16" value="1" />
           <entry key="project.open.time.17" value="1" />
-          <entry key="project.open.time.2" value="1" />
+          <entry key="project.open.time.2" value="2" />
           <entry key="project.open.time.20" value="1" />
-          <entry key="project.open.time.23" value="1" />
+          <entry key="project.open.time.23" value="2" />
           <entry key="project.open.time.24" value="2" />
           <entry key="project.open.time.251" value="1" />
           <entry key="project.open.time.27" value="2" />
@@ -106,8 +142,8 @@
           <entry key="project.open.time.36" value="1" />
           <entry key="project.open.time.37" value="1" />
           <entry key="project.open.time.39" value="2" />
-          <entry key="project.open.time.4" value="2" />
-          <entry key="project.open.time.40" value="1" />
+          <entry key="project.open.time.4" value="3" />
+          <entry key="project.open.time.40" value="2" />
           <entry key="project.open.time.41" value="2" />
           <entry key="project.open.time.42" value="2" />
           <entry key="project.open.time.43" value="2" />
@@ -122,23 +158,25 @@
           <entry key="project.open.time.6" value="3" />
           <entry key="project.open.time.63" value="2" />
           <entry key="project.open.time.64" value="1" />
+          <entry key="project.open.time.66" value="1" />
           <entry key="project.open.time.71" value="2" />
+          <entry key="project.open.time.74" value="1" />
           <entry key="project.open.time.76" value="1" />
           <entry key="project.open.time.8" value="2" />
           <entry key="project.open.time.9" value="1" />
           <entry key="project.open.time.97" value="1" />
-          <entry key="project.opened" value="78" />
+          <entry key="project.opened" value="84" />
         </counts>
       </usages-collector>
     </session>
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+            <state relative-caret-position="396">
+              <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
               <folding>
                 <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
                 <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -147,73 +185,6 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <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="99">
-              <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-              <folding>
-                <element signature="imports" expanded="true" />
-                <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-1170">
-              <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state>
-              <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
-              <folding>
-                <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-                <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="true">
-        <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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-              <folding>
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-                <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>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <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="352">
-              <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -225,18 +196,9 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>inCriteria</find>
-      <find>getPgPlanResulList</find>
-      <find>getPileAcuListByPileAcuStr</find>
-      <find>distinct</find>
-      <find>order</find>
-      <find>canPlanLine</find>
-      <find>isExistLine</find>
-      <find>getPlanResult</find>
       <find>pgPipeLine</find>
       <find>getPipeLineBylineName</find>
       <find>StringU</find>
-      <find>getAllAlarm</find>
       <find>getAlarmList</find>
       <find>getPgInPersonListByDay</find>
       <find>getDayInPgStatistic</find>
@@ -254,7 +216,16 @@
       <find>getPgContructionByNameOrType</find>
       <find>&quot;&quot;,&quot;&quot;,</find>
       <find>getPgContructionDtoByNameOrType</find>
+      <find>addConstruction</find>
+      <find>getPgLineAcuHole</find>
+      <find>getPlanResult</find>
       <find>getConstruction</find>
+      <find>addPipeLine</find>
+      <find>未找到入廊数据</find>
+      <find>getCurrentHoleByAcu</find>
+      <find>getAllAlarm</find>
+      <find>getPgDeviceDtoListByPartition</find>
+      <find>getPgDeviceByDevType</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -263,57 +234,57 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlan.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileHoleManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/planData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/PlanData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
       </list>
     </option>
   </component>
@@ -359,7 +330,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -421,53 +391,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="dto" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="manager" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -479,29 +402,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="rs" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -516,6 +416,7 @@
         </subPane>
       </pane>
       <pane id="Scope" />
+      <pane id="PackagesPane" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -710,7 +611,13 @@
       <workItem from="1574902733573" duration="1829000" />
       <workItem from="1574998240004" duration="7016000" />
       <workItem from="1575247959683" duration="6997000" />
-      <workItem from="1575704345590" duration="40473000" />
+      <workItem from="1575704345590" duration="69381000" />
+      <workItem from="1575869479666" duration="721000" />
+      <workItem from="1575947104878" duration="6101000" />
+      <workItem from="1576128264436" duration="3347000" />
+      <workItem from="1576208571543" duration="22000" />
+      <workItem from="1576227513917" duration="862000" />
+      <workItem from="1576293721220" duration="18246000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -817,11 +724,18 @@
       <option name="project" value="LOCAL" />
       <updated>1575775489149</updated>
     </task>
-    <option name="localTasksCounter" value="16" />
+    <task id="LOCAL-00016" summary="整改施工信息">
+      <created>1575791780774</created>
+      <option name="number" value="00016" />
+      <option name="presentableId" value="LOCAL-00016" />
+      <option name="project" value="LOCAL" />
+      <updated>1575791780774</updated>
+    </task>
+    <option name="localTasksCounter" value="17" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="452131000" />
+    <option name="totallyTimeSpent" value="510338000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -834,9 +748,8 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
-    <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.24205749" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2647504" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -847,7 +760,7 @@
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.3295082" />
       <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.4819672" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.65737706" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.3295082" />
@@ -939,7 +852,8 @@
     <MESSAGE value="重新设计智能规划部分" />
     <MESSAGE value="完成智能规划对接" />
     <MESSAGE value="修改报警统计" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改报警统计" />
+    <MESSAGE value="整改施工信息" />
+    <option name="LAST_COMMIT_MESSAGE" value="整改施工信息" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -951,16 +865,10 @@
           <option name="timeStamp" value="3" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java</url>
-          <line>69</line>
+          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java</url>
+          <line>40</line>
           <properties />
-          <option name="timeStamp" value="21" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java</url>
-          <line>96</line>
-          <properties />
-          <option name="timeStamp" value="38" />
+          <option name="timeStamp" value="122" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
@@ -970,394 +878,452 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <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="2068">
-          <caret line="154" column="35" selection-start-line="154" selection-start-column="35" selection-end-line="154" selection-end-column="35" />
-        </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="3300">
-          <caret line="297" column="22" selection-start-line="297" selection-start-column="22" selection-end-line="297" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/StringUtils.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
-          <caret line="13" column="48" lean-forward="true" selection-start-line="13" selection-start-column="48" selection-end-line="13" selection-end-column="48" />
+          <caret line="11" column="5" selection-start-line="11" selection-start-column="5" selection-end-line="11" selection-end-column="5" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="78" lean-forward="true" selection-start-line="78" selection-end-line="78" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="616">
-          <caret line="41" column="1" selection-start-line="41" selection-start-column="1" selection-end-line="41" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="110">
-          <caret line="12" column="23" selection-start-line="12" selection-start-column="23" selection-end-line="12" selection-end-column="23" />
+        <state relative-caret-position="516">
+          <caret line="114" column="12" selection-start-line="114" selection-start-column="12" selection-end-line="114" selection-end-column="12" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="164">
-          <caret line="56" lean-forward="true" selection-start-line="56" selection-end-line="56" />
+        <state relative-caret-position="418">
+          <caret line="33" column="44" selection-start-line="33" selection-start-column="44" selection-end-line="33" selection-end-column="44" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="258">
-          <caret line="27" column="12" lean-forward="true" selection-start-line="27" selection-start-column="12" selection-end-line="27" selection-end-column="12" />
+        <state relative-caret-position="132">
+          <caret line="11" column="20" lean-forward="true" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="20" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.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="-12">
-          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        <state relative-caret-position="516">
+          <caret line="142" column="54" selection-start-line="142" selection-start-column="54" selection-end-line="142" selection-end-column="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="858">
-          <caret line="55" column="27" lean-forward="true" selection-start-line="55" selection-start-column="27" selection-end-line="55" selection-end-column="27" />
+        <state relative-caret-position="66">
+          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="58">
+          <caret line="18" column="28" selection-start-line="18" selection-start-column="19" selection-end-line="18" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="305">
+          <caret line="24" column="31" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="714">
+          <caret line="58" column="5" lean-forward="true" selection-start-line="58" selection-start-column="5" selection-end-line="58" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="924">
+          <caret line="134" column="92" selection-start-line="134" selection-start-column="92" selection-end-line="134" selection-end-column="92" />
+          <folding>
+            <element signature="method#linkDevice#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkPartitionCamera#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkReservePlan#0;class#PgAlarmLinkRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1066">
+          <caret line="90" lean-forward="true" selection-start-line="90" selection-end-line="90" />
+          <folding>
+            <element signature="method#getTjResultByAlarmType#0;class#PgAlarmTjRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="946">
+          <caret line="148" column="11" lean-forward="true" selection-start-line="148" selection-start-column="11" selection-end-line="148" selection-end-column="11" />
+          <folding>
+            <element signature="method#getAlarmTypeList#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#addAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#editAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#deleteAlarmType#0;class#PgAlarmTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="208">
+          <caret line="46" column="23" lean-forward="true" selection-start-line="46" selection-start-column="23" selection-end-line="46" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="113" column="9" lean-forward="true" selection-start-line="113" selection-start-column="9" selection-end-line="113" selection-end-column="9" />
+          <folding>
+            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
+            <element signature="method#getNewestCh4InfoByDev#0;class#PgCh4Rs#0" />
+            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="145" column="6" lean-forward="true" selection-start-line="145" selection-start-column="6" selection-end-line="145" selection-end-column="6" />
+          <folding>
+            <element signature="method#addAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#editAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#deleteAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#getAuthorityList#0;class#PgAuthorityRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="58" column="1" lean-forward="true" selection-start-line="58" selection-start-column="1" selection-end-line="58" selection-end-column="1" />
+          <folding>
+            <element signature="method#getPgAssetPlanList#0;class#PgAssetPlanRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="370">
+          <caret line="371" column="66" selection-start-line="371" selection-start-column="66" selection-end-line="371" selection-end-column="66" />
+          <folding>
+            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#searchConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionDev#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="139" column="13" lean-forward="true" selection-start-line="139" selection-start-column="13" selection-end-line="139" selection-end-column="13" />
+          <folding>
+            <element signature="method#getCoInfoByDevAndDate#0;class#PgCoRs#0" />
+            <element signature="method#getNewestCoInfoByDev#0;class#PgCoRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="540">
+          <caret line="223" column="5" lean-forward="true" selection-start-line="223" selection-start-column="5" selection-end-line="223" selection-end-column="5" />
+          <folding>
+            <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="682">
+          <caret line="100" lean-forward="true" selection-start-line="100" selection-end-line="100" />
+          <folding>
+            <element signature="method#getDeviceTpeyList#0;class#PgDeviceTypeRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="377">
+          <caret line="225" column="35" selection-start-line="225" selection-start-column="35" selection-end-line="225" selection-end-column="35" />
+          <folding>
+            <element signature="method#addEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#addEquipment#1;class#PgEquipmentRs#0" />
+            <element signature="method#getEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#deleteEquipment#0;class#PgEquipmentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="406">
+          <caret line="109" lean-forward="true" selection-start-line="109" selection-end-line="109" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="154">
+          <caret line="28" column="19" selection-start-line="28" selection-start-column="19" selection-end-line="28" selection-end-column="19" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="748">
-          <caret line="49" column="5" lean-forward="true" selection-start-line="49" selection-start-column="5" selection-end-line="49" selection-end-column="5" />
+        <state relative-caret-position="296">
+          <caret line="161" column="35" selection-start-line="161" selection-start-column="35" selection-end-line="161" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="384">
+          <caret line="99" column="5" lean-forward="true" selection-start-line="99" selection-start-column="5" selection-end-line="99" selection-end-column="5" />
+        </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="362">
+          <caret line="340" column="35" selection-start-line="340" selection-start-column="35" selection-end-line="340" selection-end-column="35" />
+          <folding>
+            <element signature="method#addInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPersonInPg#0;class#PgInPgPersonRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-606">
+          <caret line="76" column="20" lean-forward="true" selection-start-line="76" selection-start-column="20" selection-end-line="76" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="65" column="35" selection-start-line="65" selection-start-column="35" selection-end-line="65" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="101" column="35" selection-start-line="101" selection-start-column="35" selection-end-line="101" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="84" column="35" selection-start-line="84" selection-start-column="35" selection-end-line="84" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="59" lean-forward="true" selection-start-line="59" selection-end-line="59" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="60" column="1" lean-forward="true" selection-start-line="60" selection-start-column="1" selection-end-line="60" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="145" column="35" selection-start-line="145" selection-start-column="35" selection-end-line="145" selection-end-column="35" />
+        </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="274">
+          <caret line="350" column="35" selection-start-line="350" selection-start-column="35" selection-end-line="350" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="121" column="39" selection-start-line="121" selection-start-column="39" selection-end-line="121" selection-end-column="39" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="28" column="8" lean-forward="true" selection-start-line="28" selection-start-column="8" selection-end-line="28" selection-end-column="8" />
+        <state relative-caret-position="340">
+          <caret line="103" selection-start-line="103" selection-end-line="103" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="226" column="35" selection-start-line="226" selection-start-column="35" selection-end-line="226" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="203" column="35" selection-start-line="203" selection-start-column="35" selection-end-line="203" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="241" column="35" selection-start-line="241" selection-start-column="35" selection-end-line="241" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="225" column="1" lean-forward="true" selection-start-line="225" selection-start-column="1" selection-end-line="225" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="176" column="5" lean-forward="true" selection-start-line="176" selection-start-column="5" selection-end-line="176" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="178" column="35" lean-forward="true" selection-start-line="178" selection-start-column="35" selection-end-line="178" selection-end-column="35" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="516">
-          <caret line="94" column="53" selection-start-line="94" selection-start-column="53" selection-end-line="94" selection-end-column="53" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="814">
-          <caret line="52" column="9" lean-forward="true" selection-start-line="52" selection-start-column="9" selection-end-line="52" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="182">
-          <caret line="58" column="12" lean-forward="true" selection-start-line="58" selection-start-column="12" selection-end-line="58" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="34" lean-forward="true" selection-start-line="34" selection-end-line="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="32" lean-forward="true" selection-start-line="32" selection-end-line="32" />
-          <folding>
-            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
-            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="185">
-          <caret line="63" column="13" selection-start-line="63" selection-start-column="13" selection-end-line="63" selection-end-column="13" />
-          <folding>
-            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
-            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
-            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="e#6319#6324#0" />
-            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
-          </folding>
+          <caret line="240" lean-forward="true" selection-start-line="240" selection-end-line="240" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
-          <caret line="58" column="28" lean-forward="true" selection-start-line="58" selection-start-column="28" selection-end-line="58" selection-end-column="28" />
-          <folding>
-            <element signature="method#addTempHumData#0;class#PgTempHumRs#0" />
-          </folding>
+        <state relative-caret-position="340">
+          <caret line="148" column="34" selection-start-line="148" selection-start-column="34" selection-end-line="148" selection-end-column="34" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
+        <state relative-caret-position="458">
+          <caret line="99" column="35" selection-start-line="99" selection-start-column="35" selection-end-line="99" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+        <state relative-caret-position="384">
+          <caret line="145" column="32" lean-forward="true" selection-start-line="145" selection-start-column="32" selection-end-line="145" selection-end-column="32" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="414">
-          <caret line="22" column="46" lean-forward="true" selection-start-line="22" selection-start-column="46" selection-end-line="22" selection-end-column="46" />
-        </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="396">
-          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" column="83" selection-start-line="11" selection-start-column="83" selection-end-line="11" selection-end-column="83" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="26">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
-          <folding>
-            <element signature="method#getPgInPgStatusByPerson#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNumByName#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNum#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPersonListByDay#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPgStatusByPgInPgPerson#0;class#PgInPgStatusManager#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="44">
-          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-12">
-          <caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="87" lean-forward="true" selection-start-line="87" selection-end-line="87" />
-          <folding>
-            <element signature="method#getConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#addConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#deleteConstructionType#0;class#PgConstructionTypeRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
-          <folding>
-            <element signature="method#getConstructionTypeByType#0;class#PgConstructionTypeManager#0" />
-            <element signature="method#getAllConstructionTypeDto#0;class#PgConstructionTypeManager#0" />
-          </folding>
-        </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="145">
-          <caret line="258" column="9" lean-forward="true" selection-start-line="258" selection-start-column="9" selection-end-line="258" selection-end-column="9" />
-          <folding>
-            <element signature="method#getMonthInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayInPgStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgOverViewRs#0" />
-            <element signature="method#getAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getMonthAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayAlarmStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgOverViewRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="103">
-          <caret line="105" column="50" lean-forward="true" selection-start-line="105" selection-start-column="50" selection-end-line="105" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateBasicDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="99">
-          <caret line="125" selection-start-line="125" selection-end-line="125" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="190">
-          <caret line="24" column="35" lean-forward="true" selection-start-line="24" selection-start-column="35" selection-end-line="24" selection-end-column="35" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="436">
-          <caret line="24" lean-forward="true" selection-start-line="24" selection-end-line="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" lean-forward="true" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="300">
-          <caret line="34" column="31" lean-forward="true" selection-start-line="34" selection-start-column="31" selection-end-line="34" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="42" column="13" lean-forward="true" selection-start-line="42" selection-start-column="13" selection-end-line="42" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="120" column="72" lean-forward="true" selection-start-line="120" selection-start-column="72" selection-end-line="120" selection-end-column="72" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="293">
-          <caret line="58" column="73" lean-forward="true" selection-start-line="58" selection-start-column="73" selection-end-line="58" selection-end-column="73" />
-          <folding>
-            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
-            <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
-          </folding>
-        </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="307">
-          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
+        <state relative-caret-position="758">
+          <caret line="130" column="5" lean-forward="true" selection-start-line="130" selection-start-column="5" selection-end-line="130" selection-end-column="5" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1170">
-          <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
+        <state relative-caret-position="494">
+          <caret line="86" column="62" lean-forward="true" selection-start-line="86" selection-start-column="62" selection-end-line="86" selection-end-column="62" />
           <folding>
-            <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-            <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+            <element signature="method#getAllDevice#0;class#PgDeviceManager#0" />
+            <element signature="method#getAllDev#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="195" column="28" lean-forward="true" selection-start-line="195" selection-start-column="28" selection-end-line="195" selection-end-column="28" />
+        <state relative-caret-position="166">
+          <caret line="174" column="13" lean-forward="true" selection-start-line="174" selection-start-column="13" selection-end-line="174" selection-end-column="13" />
           <folding>
-            <element signature="method#getAlarmByTypeAndTime#0;class#PgAlarmManager#0" />
-            <element signature="method#getAlarmNum#0;class#PgAlarmManager#0" />
             <element signature="method#getDayAlarmStatistic#0;class#PgAlarmManager#0" />
+            <element signature="method#getAlarmList#0;class#PgAlarmManager#0" />
             <element signature="method#createDTO#0;class#PgAlarmManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="364">
+          <caret line="46" column="56" lean-forward="true" selection-start-line="46" selection-start-column="56" selection-end-line="46" selection-end-column="56" />
+          <folding>
+            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
+            <element signature="method#getPgDev#0;class#PgDeviceRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
+            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+        <state relative-caret-position="396">
+          <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
           <folding>
             <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
             <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -1365,52 +1331,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="239">
-          <caret line="21" column="33" lean-forward="true" selection-start-line="21" selection-start-column="33" selection-end-line="21" selection-end-column="33" />
-        </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="352">
-          <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-        </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="99">
-          <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-          </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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-          <folding>
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-            <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>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
index c436c93..e913155 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
@@ -132,7 +132,10 @@
             this.setAlarmType("");
         else
             this.setAlarmType(pgAlarm.getAlarmTypeId().getAlarmType());
-        this.setAlarmValue(pgAlarm.getAlarmValue());
+        if(pgAlarm.getAlarmValue()==null)
+            this.setAlarmValue("");
+        else
+            this.setAlarmValue(pgAlarm.getAlarmValue());
         if (pgAlarm.getAlarmDate() != null)
             this.setAlarmDate(sdf.format(pgAlarm.getAlarmDate()));
         else
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
index a43965c..565cb41 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -159,11 +159,21 @@
     }
 
     //获取历史报警消息列表
-    public List<PgAlarmDto> getAllAlarm(String alarmType,String startDay,String endDay,String isNew,int page,int rows) {
-        try {
+    public  Map<String, Object> getAllAlarm(String alarmType,String partition,String startDay,String endDay,String isNew,int page,int rows) {
 
+        Map<String, Object> resultMap = new HashMap<>();
+        String msg="";
+
+        try {
             Criteria criteria = createCriteria(PgAlarm.class);
 
+            if (StringUtils.isNotBlank(partition)) {
+                DetachedCriteria inCriteria = DetachedCriteria.forClass(PgDevice.class);
+                inCriteria.add(Restrictions.eq("partition", partition));
+                inCriteria.setProjection(Property.forName("id"));
+                criteria.add(Property.forName("alarmDevId").in(inCriteria));
+            }
+
             if (StringUtils.isNotBlank(alarmType)&&!alarmType.contains("全部")&&pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
                 criteria.add(Restrictions.eq("alarmTypeId", pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)));
 
@@ -190,8 +200,16 @@
             for (PgAlarm pgAlarm : pgAlarmList) {
                 pgAlarmDtoList.add(new PgAlarmDto(pgAlarm));
             }
-
-            return pgAlarmDtoList;
+            if(pgAlarmDtoList==null||pgAlarmDtoList.size()==0) {
+                resultMap.put("msg", "没有报警信息");
+                resultMap.put("code","0");
+            }else {
+                resultMap.put("code","200");
+                resultMap.put("msg", "报警信息获取成功");
+            }
+            resultMap.put("count",pg.getTotalCount());
+            resultMap.put("result",pgAlarmDtoList);
+            return resultMap;
         }
         catch(Exception ex){
             ex.printStackTrace();
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index 7547560..654f49e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -24,11 +24,11 @@
 
         Criteria criteria = createCriteria(PgDevice.class);
 
-        if(road!=null)
+        if(StringUtils.isNotBlank(road))
             criteria.add(Restrictions.eq("road",road));
-        if(partition!=null)
+        if(StringUtils.isNotBlank(partition))
             criteria.add(Restrictions.eq("partition",partition));
-        if(devType!=null)
+        if(StringUtils.isNotBlank(devType))
             criteria.add(Restrictions.eq("devType",devType));
 
         criteria.add(Restrictions.eq("active", 1));
@@ -43,6 +43,29 @@
         return pgDeviceDtoList;
     }
 
+    public List<PgDeviceDto> getAllDev(String road,String partition,String devType) {
+
+        Criteria criteria = createCriteria(PgDevice.class);
+
+        if(StringUtils.isNotBlank(road))
+            criteria.add(Restrictions.eq("road",road));
+        if(StringUtils.isNotBlank(partition))
+            criteria.add(Restrictions.eq("partition",partition));
+        if(StringUtils.isNotBlank(devType))
+            criteria.add(Restrictions.like("devType","%"+devType+"%"));
+
+        criteria.add(Restrictions.eq("active", 1));
+        criteria.addOrder(Order.desc("id"));
+        List<PgDevice> pgDeviceList = criteria.list();
+
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
+        for (PgDevice pgDevice : pgDeviceList) {
+            pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
+        }
+
+        return pgDeviceDtoList;
+    }
+
     //根据名字获取当前设备
     public PgDevice getDeviceByAssetCode(String assetCode) {
         Criteria criteria=createCriteria(PgDevice.class);
@@ -56,9 +79,9 @@
     }
 
     //根据类型获取设备列表
-    public List<PgDeviceDto> getDeviceByDevTypee(String devType) {
+    public List<PgDeviceDto> getDeviceByDevType(String devType) {
         Criteria criteria=createCriteria(PgDevice.class);
-        criteria.add(Restrictions.eq("devType",devType));
+        criteria.add(Restrictions.like("devType","%"+devType+"%"));
 
         List<PgDevice> pgDeviceList=criteria.list();
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
@@ -106,7 +129,7 @@
         criteria.add(Restrictions.eq("partition",partition));
 
         List<PgDevice> pgDeviceList=criteria.list();
-        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<PgDeviceDto>();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
 
         for (PgDevice pgDevice : pgDeviceList) {
             pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
index 3a3bccd..595730e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
@@ -1,10 +1,13 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.devTable.domain.PgAlarmType;
 import com.casic.PgInterface.devTable.domain.PgPartition;
 import com.casic.PgInterface.devTable.domain.PgRoad;
 import com.casic.PgInterface.devTable.domain.PipeGallery;
 import com.casic.PgInterface.devTable.dto.PgPartitionDto;
+import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
@@ -12,7 +15,9 @@
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Created by yxw on 2017/11/4.
@@ -21,7 +26,8 @@
 public class PgPartitionManager extends HibernateEntityDao<PgPartition> {
 
     @Resource
-    PgRoadManager pgRoadManager;
+    private PgRoadManager pgRoadManager;
+
 
     public PgPartition getPartitionByParName(String parName) {
         Criteria criteria = getSession().createCriteria(PgPartition.class);
@@ -99,4 +105,5 @@
         return pgPartitionDtoList;
     }
 
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
index f216360..a6928f1 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
@@ -5,6 +5,7 @@
 public class PgPlanResultRe {
 
     private String taskKey;
+    private List<String> pileAcuList;
     private List<PgPlanResult> pgPlanResultList;
 
     public String getTaskKey() {
@@ -15,6 +16,14 @@
         this.taskKey = taskKey;
     }
 
+    public List<String> getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(List<String> pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+
     public List<PgPlanResult> getPgPlanResultList() {
         return pgPlanResultList;
     }
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
index 71ea765..47eea07 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
@@ -54,9 +54,7 @@
 
         List<PgLineHole> pgLineHoleList=criteria.list();
         List<PgLineHoleDTO> pgLineHoleDTOList=new ArrayList<>();
-        if(pgLineHoleList==null||pgLineHoleList.size()==0)
-            return null;
-        else
+        if(pgLineHoleList!=null&&pgLineHoleList.size()!=0)
             pgLineHoleDTOList=PgLineHoleDTO.ConvertToDTOList(pgLineHoleList,pgPileAcuManager,pgRoadManager);
         return pgLineHoleDTOList;
     }
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
index 0fd9e1f..841a386 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
@@ -1,12 +1,15 @@
 package com.casic.PgInterface.intelPlan.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.devTable.domain.PgPartition;
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
 import com.casic.PgInterface.intelPlan.domain.PgLineHole;
 import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
 import com.casic.PgInterface.intelPlan.domain.PgSection;
 import com.casic.PgInterface.intelPlan.dto.PgPlanResult;
 import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
 import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -22,6 +25,9 @@
     @Resource
     private PgLineHoleManager pgLineHoleManager;
 
+    @Resource
+    private PgRoadManager pgRoadManager;
+
     public PgPileAcu getPgPileAcuByCode(String acuCode){
         List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
 
@@ -58,7 +64,9 @@
         for(PgPlanTask pgPlanTask:pgPlanTaskList){
             List<PgPlanResult> pgPlanResultList=getPgPlanResultByPlantask(pgPlanTask);
             PgPlanResultRe pgPlanResultRe=new PgPlanResultRe();
+
             pgPlanResultRe.setTaskKey(pgPlanTask.getTaskKey());
+            pgPlanResultRe.setPileAcuList(pgPlanTask.getPileAcuList());
             pgPlanResultRe.setPgPlanResultList(pgPlanResultList);
 
             pgPlanResultReList.add(pgPlanResultRe);
@@ -142,4 +150,57 @@
         return length;
     }
 
+    private PgPileAcu getPgPileAcuByAcuCode(String acuCode){
+        List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
+
+        if(pgPileAcuList==null||pgPileAcuList.size()==0)
+            return null;
+        else
+            return pgPileAcuList.get(0);
+    }
+
+    public List<PgAcuTask> getACUTask(String pileAcuList){
+        String[] acuArray=pileAcuList.split(",");
+        List<PgAcuTask> pgAcuTaskList=new ArrayList<>();
+
+        for(String acu:acuArray){
+            PgPileAcu pgPileAcu=this.getPgPileAcuByCode(acu);
+            String roadName=pgRoadManager.get(pgPileAcu.getRoadId()).getRoadName();
+
+            if(!containRoad(roadName,pgAcuTaskList))
+            {
+                PgAcuTask pgAcuTask=new PgAcuTask();
+                pgAcuTask.setRoadName(roadName);
+                pgAcuTask.setPileAcuList(acu);
+                pgAcuTaskList.add(pgAcuTask);
+            }
+            else{
+                PgAcuTask pgAcuTask=getIndexRoad(roadName,pgAcuTaskList);
+                if(pgAcuTask!=null)
+                    pgAcuTask.setPileAcuList(pgAcuTask.getPileAcuList()+","+acu);
+            }
+        }
+
+        return pgAcuTaskList;
+    }
+
+    private boolean containRoad(String roadName,List<PgAcuTask> pgAcuTaskList){
+        if(pgAcuTaskList==null||pgAcuTaskList.size()==0) return false;
+        for(PgAcuTask pgAcuTask:pgAcuTaskList){
+            if(pgAcuTask.getRoadName().equals(roadName))
+                return true;
+        }
+
+        return false;
+    }
+
+    private PgAcuTask getIndexRoad(String roadName, List<PgAcuTask> pgAcuTaskList){
+        for(PgAcuTask pgAcuTask:pgAcuTaskList){
+            if(pgAcuTask.getRoadName().equals(roadName))
+                return pgAcuTask;
+        }
+
+        return null;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java
new file mode 100644
index 0000000..323f7ef
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java
@@ -0,0 +1,25 @@
+package com.casic.PgInterface.reservePlan.dto;
+
+import java.util.List;
+
+public class PgAcuTask {
+
+    private String roadName;//道路
+    private String pileAcuList;//acu分区
+
+    public String getRoadName() {
+        return roadName;
+    }
+
+    public void setRoadName(String roadName) {
+        this.roadName = roadName;
+    }
+
+    public String getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(String pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
index c25e926..c7d7693 100644
--- a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
@@ -70,9 +70,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(Long.valueOf(inPgPersonId));
         PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("hostName",pgInPgPerson.getAssetCode());
-//        PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode());
-//        long maxId = pgTagPositionManager.getMaxId(pgTagMac.getTagMac());
-//        PGTagPosition pgTagPosition = pgTagPositionManager.get(maxId);
+
         PGTagPosition pgTagPosition = tagmacRun.GetTagStatus(pgTagMac);
         boolean bExist = false;
         bExist = pgTagPositionManager.findTagPosition(pgTagPosition.getPositionUpdatetime(),pgTagPosition.getHostId());
@@ -104,8 +102,7 @@
         PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(Long.valueOf(inPgPersonId));
         PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pgInPgPersonId",pgInPgPerson);
         System.out.println("time:"+pgInPgStatus.getInTime());
-//        PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pgInPgPersonId",inPgPersonId);
-//        PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode());
+
         PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("hostName",pgInPgPerson.getAssetCode());
 
         Map<Object,Object> mapPosition = new HashMap<>();
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
index 082ba5d..3eed00a 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
@@ -48,6 +48,7 @@
     public Map<String, Object> linkDevice(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         PgDeviceDto pgDeviceDto = null;
         try {
@@ -62,6 +63,7 @@
                     else {
                         pgDeviceDto = new PgDeviceDto(pgDevice);
                         msg = "报警关联设备获取成功";
+                        code="200";
                     }
                 }
             }
@@ -71,6 +73,7 @@
             e.printStackTrace();
             msg = "获取关联设备失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceDto);
 
@@ -86,6 +89,7 @@
     public Map<String, Object> linkPartitionCamera(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
         try {
@@ -106,6 +110,7 @@
 
                         pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(partition,position);
                         msg = "关联设备获取成功";
+                        code="200";
                     }
                 }
             }
@@ -115,6 +120,7 @@
             e.printStackTrace();
             msg = "分区设备关联失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceDtoList);
         return resultMap;
@@ -129,6 +135,7 @@
     public Map<String, Object> linkReservePlan(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgReservePlanDto> pgReservePlanDtoList=new ArrayList<>();
         try{
@@ -139,10 +146,12 @@
                 else {
                     pgReservePlanDtoList = pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
 
-                    if(pgReservePlanDtoList==null||pgReservePlanDtoList.size()==0)
-                        msg="不存在关联的报警预案";
-                    else
+                    if (pgReservePlanDtoList == null || pgReservePlanDtoList.size() == 0)
+                        msg = "不存在关联的报警预案";
+                    else {
                         msg = "关联预案获取成功";
+                        code="200";
+                    }
                 }
             }
             else
@@ -153,6 +162,7 @@
             e.printStackTrace();
             msg="预案关联失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgReservePlanDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
index 0ddbc4d..0ce886b 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
@@ -41,25 +41,19 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getAlarmList(@FormParam("alarmType") String alarmType,
                                             @FormParam("startDay") String startDay,
+                                            @FormParam("partition") String partition,
                                             @FormParam("endDay") String endDay,
                                             @FormParam("isNew") String isNew,
                                             @FormParam("page") int page,
                                             @FormParam("rows") int rows) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
         try {
-            pgAlarmDtoList = pgAlarmManager.getAllAlarm(alarmType,startDay,endDay,isNew,page,rows);
-            if (pgAlarmDtoList==null||pgAlarmDtoList.size() == 0)
-                msg = "没有报警信息";
-            else
-                msg = "报警信息获取成功";
+            resultMap = pgAlarmManager.getAllAlarm(alarmType,partition,startDay,endDay,isNew,page,rows);
+
         } catch (Exception e) {
             e.printStackTrace();
-            msg = "报警信息获取失败";
         }
-        resultMap.put("msg", msg);
-        resultMap.put("result", pgAlarmDtoList);
         return resultMap;
     }
 
@@ -71,9 +65,10 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> clearAlarmList(@FormParam("id") String id) throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        String result = "false";
+        String result = "";
+        String code="0";
 
         try {
             PgAlarm pgAlarm = new PgAlarm();
@@ -86,12 +81,14 @@
                 pgAlarmManager.save(pgAlarm);
                 msg = "报警信息清除成功";
                 result = "true";
+                code = "200";
             }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警信息清除失败";
             result = "false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
@@ -106,21 +103,26 @@
     public Map<String, Object> getAlarmByTypeOrTime(@FormParam("alarmType") String alarmType,
                                                     @FormParam("startTime") String startTime,
                                                     @FormParam("endTime") String endTime) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
-        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<PgAlarmDto>();
+        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
         try {
             pgAlarmDtoList = pgAlarmManager.getAlarmByTypeAndTime(alarmType, startTime, endTime);
             if (pgAlarmDtoList == null || pgAlarmDtoList.size() == 0)
                 msg = "报警信息不存在";
             else
+            {
                 msg = "报警信息获取成功";
+                code="200";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警信息获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
index 29ce8a4..ed0bf34 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
@@ -39,8 +39,8 @@
     public Map<String, Object> getAlarmRule(@FormParam("devType") String devType) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
-        System.out.println("devType:"+devType);
         List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<>();
         try {
             pgAlarmRuleDtoList = pgAlarmRuleManager.getAlarmRuleDto(devType);
@@ -52,6 +52,7 @@
             e.printStackTrace();
             msg = "报警阈值信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmRuleDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
index 24ab894..abef1b1 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
@@ -39,16 +39,21 @@
                                                      @FormParam("endDate") String endDate)throws Exception{
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
+
         List<PgAlarmTjDto> pgAlarmTjDtoList=null;
         try{
             pgAlarmTjDtoList=pgAlarmTjManager.getAlarmTjResultByType(startDate,endDate);
             msg="获取成功";
+            code="200";
         }
         catch(Exception ex) {
             msg = "统计失败";
         }
-        resultMap.put("result",pgAlarmTjDtoList);
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
+        resultMap.put("result",pgAlarmTjDtoList);
+
         return resultMap;
     }
 
@@ -61,23 +66,27 @@
     public Map<String, Object> getAlarmByTime(@FormParam("startTime") String startTime,
                                               @FormParam("endTime") String endTime,
                                               @FormParam("statisticType") String statisticType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code = "0";
 
-        List<PgAlarmTjDto> pgAlarmTjDtoList = new ArrayList<PgAlarmTjDto>();
+        List<PgAlarmTjDto> pgAlarmTjDtoList = new ArrayList<>();
         try {
             pgAlarmTjDtoList = pgAlarmTjManager.getAlarmByTime(startTime, endTime, statisticType);
             if(pgAlarmTjDtoList==null)
                 msg="报警统计信息获取失败";
-            else
-                msg="报警统计信息获取成功";
+            else {
+                msg = "报警统计信息获取成功";
+                code="200";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警统计信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmTjDtoList);
         return resultMap;
     }
 
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
index 28bc811..b6278a9 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
@@ -30,7 +30,6 @@
     @Resource
     private PgAlarmTypeManager pgAlarmTypeManager;
 
-
     /**
      * 获取报警类型
      */
@@ -38,19 +37,24 @@
     @Path("getAlarmType")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getAlarmTypeList()throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
-        List<PgAlarmTypeDto> pgAlarmTypeDtoList=new ArrayList<PgAlarmTypeDto>();
+        String code="";
+
+        List<PgAlarmTypeDto> pgAlarmTypeDtoList=new ArrayList<>();
         try {
             pgAlarmTypeDtoList = pgAlarmTypeManager.getAllAlarmTypeDto();
             if(pgAlarmTypeDtoList.size()==0)
                 msg="没有报警类型信息";
-            else
-                msg="报警类型信息获取成功";
+            else {
+                code="200";
+                msg = "报警类型信息获取成功";
+            }
         }catch(Exception e){
             e.printStackTrace();
             msg="报警类型信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAlarmTypeDtoList);
         return resultMap;
@@ -66,6 +70,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
@@ -83,6 +88,7 @@
                 logger.info("成功保存");
                 result = "true";
                 msg = "保存成功";
+                code="200";
             }
         } catch (Exception e) {
             result = "false";
@@ -90,6 +96,7 @@
             e.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -106,6 +113,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try{
             if(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
@@ -119,6 +127,7 @@
                 pgAlarmTypeManager.save(pgAlarmType);
                 result = "true";
                 msg = "编辑成功";
+                code="200";
             }
         }
         catch(Exception e)
@@ -128,6 +137,7 @@
             e.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("result",result);
         resultMap.put("msg",msg);
 
@@ -146,6 +156,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
         String result="false";
+        String code="0";
 
         try {
             PgAlarmType pgAlarmType=pgAlarmTypeManager.get(Long.valueOf(id));
@@ -157,6 +168,7 @@
             {
                 pgAlarmType.setActive(0);
                 pgAlarmTypeManager.save(pgAlarmType);
+                code="200";
                 msg="报警类型删除成功";
                 result="true";
             }
@@ -165,6 +177,7 @@
             msg="报警类型删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
index 4533e1a..85940bb 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
@@ -33,12 +33,15 @@
                                                  @FormParam("inSpectionPlace") String inSpectionPlace){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
         List<PgAssetPlanDto> pgAssetPlanDtoList=new ArrayList<>();
         try{
             pgAssetPlanDtoList=pgAssetPlanManager.getPgAssetPlanDtoList(startDay,endDay,inSpectionPlace);
-            if(pgAssetPlanDtoList!=null&&pgAssetPlanDtoList.size()!=0)
-                msg="巡检信息获取成功";
+            if(pgAssetPlanDtoList!=null&&pgAssetPlanDtoList.size()!=0) {
+                code="200";
+                msg = "巡检信息获取成功";
+            }
             else
                 msg="不存在巡检信息";
         }
@@ -47,6 +50,7 @@
             msg="巡检信息获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAssetPlanDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
index 47ef9d1..5cbdfcb 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
@@ -30,12 +30,15 @@
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
         String result="";
+        String code="0";
 
         List<PgAssetPlanStatic> pgAssetPlanStaticList = null;
         try{
             pgAssetPlanStaticList=pgAssetPlanManager.getPgAssetPlanStaticLisByTime(startTime,endTime,staticType);
-            if(pgAssetPlanStaticList!=null&&pgAssetPlanStaticList.size()!=0)
-                msg="巡检统计信息获取成功";
+            if(pgAssetPlanStaticList!=null&&pgAssetPlanStaticList.size()!=0) {
+                code = "200";
+                msg = "巡检统计信息获取成功";
+            }
             else
                 msg="统计信息获取失败";
         }
@@ -44,6 +47,7 @@
             msg="统计失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAssetPlanStaticList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
index 26f5d6a..503bfe3 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
@@ -40,6 +40,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="";
 
         try{
             PgAuthority pgAuthority=new PgAuthority();
@@ -50,6 +51,7 @@
 
             pgAuthorityManager.save(pgAuthority);
             msg="用户权限保存成功";
+            code="200";
             result="true";
         }
         catch(Exception e) {
@@ -57,6 +59,7 @@
             msg = "新增权限失败";
             result = "false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -65,22 +68,25 @@
 
     /*
        *编辑角权限信息
-        */
+    */
     @POST
     @Path("editAuthority")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> editAuthority(@FormParam("id") String id,
                                        @FormParam("authority") String authority,
                                        @FormParam("concent") String concent) throws Exception{
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
+
         try {
             PgAuthority pgAuthority=pgAuthorityManager.get(Long.valueOf(id));
             pgAuthority.setAuthority(authority);
             pgAuthority.setConcent(concent);
 
             pgAuthorityManager.save(pgAuthority);
+            code="200";
             msg="权限保存成功";
             result="true";
         }
@@ -90,7 +96,7 @@
             msg="权限编辑失败";
             result="false";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -105,9 +111,10 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> deleteAuthority(@FormParam("id") String id)throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
-        String result="false";
+        String result="";
+        String code="0";
 
         try {
             PgAuthority pgAuthority= pgAuthorityManager.get(Long.valueOf(id));
@@ -119,6 +126,7 @@
             {
                 pgAuthority.setActive(0);
                 pgAuthorityManager.save(pgAuthority);
+                code="200";
                 msg="删除权限成功";
                 result="true";
             }
@@ -127,37 +135,40 @@
             msg="删除权限失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
     }
 
     /*
-* 获取权限信息
- */
+    * 获取权限信息
+    */
     @POST
     @Path("getAuthorityList")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> getAuthorityList() {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgAuthorityDto> pgAuthorityDtoList = new ArrayList<PgAuthorityDto>();
         try {
             pgAuthorityDtoList = pgAuthorityManager.getAuthorityList();
             if (pgAuthorityDtoList == null)
                 msg = "不存在权限信息";
-            else
+            else {
+                code = "200";
                 msg = "权限信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "权限信息获取是失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAuthorityDtoList);
         return resultMap;
     }
 
 
-
-
 }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
index a9ef521..a74ecc7 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
@@ -45,6 +45,7 @@
                                                @FormParam("endDate") String endDate)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgHistoryDataDto> pgHistoryDataDtoList=new ArrayList<>();
 
         try {
@@ -55,13 +56,16 @@
                 pgHistoryDataDtoList=pgCh4Manager.getAllCH4Data(pgDevice,startDate,endDate);
                 if(pgHistoryDataDtoList==null)
                     msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+                else {
+                    code = "200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgHistoryDataDtoList);
         return resultMap;
@@ -75,8 +79,9 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getNewestCh4InfoByDev(@FormParam("assetCode") String assetCode)throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
+        String code="0";
         PgCh4Dto pgCh4Dto=new PgCh4Dto(null);
 
         try {
@@ -87,13 +92,17 @@
                 pgCh4Dto=pgCh4Manager.getNewestCH4Data(pgDevice);
                 if(pgCh4Dto==null)
                     msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgCh4Dto);
         return resultMap;
@@ -111,6 +120,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
@@ -127,6 +137,7 @@
                 pgCh4.setPgDeviceId(pgDevice);
 
                 pgCh4Manager.save(pgCh4);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -135,7 +146,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
index a7eac39..dfc8ca5 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
@@ -43,23 +43,27 @@
                                                       @FormParam("endDate") String endDate)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgHistoryDataDto> pgHistoryDataDtoList=new ArrayList<>();
 
         try {
             PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
                 msg="设备不存在";
-            else{
-                pgHistoryDataDtoList=pgCoManager.getAllCoData(pgDevice, startDate, endDate);
-                if(pgHistoryDataDtoList==null)
-                    msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+            else {
+                pgHistoryDataDtoList = pgCoManager.getAllCoData(pgDevice, startDate, endDate);
+                if (pgHistoryDataDtoList == null)
+                    msg = "没有满足要求的数据";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgHistoryDataDtoList);
         return resultMap;
@@ -75,6 +79,7 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         PgCoDto pgCoDto=new PgCoDto(null);
 
         try {
@@ -85,13 +90,16 @@
                 pgCoDto=pgCoManager.getNewestCoData(pgDevice);
                 if(pgCoDto==null)
                     msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgCoDto);
         return resultMap;
@@ -110,6 +118,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         try {
@@ -126,6 +135,7 @@
 
                 pgCoManager.save(pgCo);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
         } catch (Exception e) {
@@ -133,7 +143,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
index b4b826e..9af98a3 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
@@ -60,6 +60,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         try {
 
@@ -80,8 +81,8 @@
                 pgConstruction.setPgConstructionTypeId(pgConstructionType.getId());
                 pgConstruction.setActive(1);
                 pgConstruction.setParName(parName);
-                logger.info("保存成功");
                 pgConstructionManager.save(pgConstruction);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -90,6 +91,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("success", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -116,6 +118,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
@@ -140,6 +143,7 @@
                 pgConstruction.setParName(parName);
 
                 pgConstructionManager.save(pgConstruction);
+                code="200";
                 result = "true";
                 msg = "编辑成功";
             }
@@ -150,7 +154,7 @@
             e.printStackTrace();
 
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -167,6 +171,8 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
+
         try {
             PgConstruction pgConstruction = pgConstructionManager.get(Long.valueOf(id));
             if (pgConstruction == null)
@@ -177,6 +183,7 @@
             {
                 pgConstruction.setActive(0);
                 pgConstructionManager.save(pgConstruction);
+                code="200";
                 result = "true";
                 msg = "成功删除信息";
             }
@@ -185,6 +192,7 @@
             result = "false";
             msg = "删除失败";
         }
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -204,9 +212,11 @@
                                                   @FormParam("rows") int rows)throws Exception{
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
         List<PgConstructionDto> pgConstructionDtoList=new ArrayList<>();
         try{
             pgConstructionDtoList=pgConstructionManager.getPgContructionDto(cs_name,cs_type,startTime,endTime,page,rows);
+            code="200";
             msg="信息获取成功";
         }
         catch(Exception e)
@@ -214,6 +224,7 @@
             e.printStackTrace();
             msg="查询失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
 
@@ -231,18 +242,22 @@
                                                               @FormParam("statisticType") String statisticType) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgConstructionStiatistic> pgConstructionStiatisticList=new ArrayList<>();
         try {
             pgConstructionStiatisticList = pgConstructionManager.getConstructionByTimeAndStatus(startTime, endTime, statisticType);
             if(pgConstructionStiatisticList==null)
                 msg="施工统计信息获取失败";
-            else
-                msg="施工统计信息获取成功";
+            else {
+                code="200";
+                msg = "施工统计信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "施工统计信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgConstructionStiatisticList);
         return resultMap;
@@ -257,6 +272,7 @@
     public Map<String, Object> getConstructionByType(@FormParam("statisticType") String statisticType){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
         List<PgConstructionStiatistic> pgConstructionStiatisticList=new ArrayList<>();
 
         try{
@@ -268,6 +284,7 @@
                 resultMap.put("result",null);
             }
             else {
+                code="200";
                 msg = "统计信息获取成功";
                 resultMap.put("result", pgConstructionStiatisticList);
             }
@@ -278,6 +295,7 @@
             msg="统计失败";
             resultMap.put("result",null);
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         return resultMap;
     }
@@ -291,9 +309,11 @@
     public Map<String, Object> getConstructionToday() throws Exception{
         Map<String,Object> resultMap=new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgConstructionDto> pgConstructionDtoList=new ArrayList<PgConstructionDto>();
         try {
             pgConstructionDtoList = pgConstructionManager.getConstructionToday();
+            code="200";
             msg = "当天施工信息获取成功";
         }
         catch(Exception e)
@@ -301,7 +321,7 @@
             e.printStackTrace();
             msg="获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
         return resultMap;
@@ -316,6 +336,7 @@
     public Map<String, Object> getConstructionDev(@FormParam("id") String id) throws Exception{
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
         List<PgDeviceDto> pgDeviceDtoList =new ArrayList<>();
         try{
@@ -325,14 +346,17 @@
 
             if(pgDeviceDtoList==null)
                 msg="信息获取失败";
-            else
-                msg="信息获取成功";
+            else {
+                code="200";
+                msg = "信息获取成功";
+            }
         }
         catch(Exception e)
         {
             e.printStackTrace();
-            msg="设备信息获取成功";
+            msg="信息获取是被";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgDeviceDtoList);
 
@@ -346,17 +370,21 @@
     @Path("getConstruction")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getConstruction() throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
-        List<PgConstructionDto> pgConstructionDtoList=new ArrayList<PgConstructionDto>();
+        String code="0";
+
+        List<PgConstructionDto> pgConstructionDtoList=new ArrayList<>();
 
         try{
             pgConstructionDtoList=pgConstructionManager.getPgConstructionList();
             if(pgConstructionDtoList==null||pgConstructionDtoList.size()==0)
                 msg="不存在施工记录";
-            else
-                msg="施工信息获取成功";
+            else {
+                code = "200";
+                msg = "施工信息获取成功";
+            }
         }
         catch(Exception e)
         {
@@ -364,6 +392,7 @@
             msg="施工信息获取失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java
index fd3d53e..2019502 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java
@@ -39,12 +39,12 @@
         try {
             pgConstructionTypeDtoList = pgConstructionTypeManager.getAllConstructionTypeDto();
             if (pgConstructionTypeDtoList.size() == 0)
-                msg = "没有项目类型信息";
+                msg = "获取失败";
             else
-                msg = "项目类型获取成功";
+                msg = "获取成功";
         } catch (Exception e) {
             e.printStackTrace();
-            msg = "项目类型信息获取失败";
+            msg = "获取失败";
         }
         resultMap.put("msg", msg);
         resultMap.put("result", pgConstructionTypeDtoList);
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
index 90d001c..037a399 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
@@ -51,6 +51,7 @@
 
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if (StringUtils.isBlank(construct_doc)||StringUtils.isBlank(doc_name))
@@ -65,6 +66,7 @@
             pgCsDocument.setActive(1);
             pgCsDocumentManager.save(pgCsDocument);
 
+            code="200";
             result = "true";
             msg = "保存成功";
 
@@ -74,6 +76,7 @@
             ex.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("success", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -90,6 +93,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             PgCsDocument pgCsDocument = pgCsDocumentManager.get(Long.valueOf(id));
@@ -103,6 +107,7 @@
 
                 pgCsDocumentManager.save(pgCsDocument);
 
+                code="200";
                 result = "true";
                 msg = "编辑成功";
             }
@@ -112,6 +117,7 @@
             msg = "编辑失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -125,9 +131,9 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
         String result="";
+        String code="0";
 
         try{
-
             PgCsDocument pgCsDocument = pgCsDocumentManager.get(Long.valueOf(id));
             if(pgCsDocument==null)
             {
@@ -137,6 +143,7 @@
             else{
                 pgCsDocument.setActive(0);
                 pgCsDocumentManager.save(pgCsDocument);
+                code="200";
                 result="true";
                 msg="删除成功";
             }
@@ -147,7 +154,7 @@
             msg="预案删除失败";
             result="false";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -168,18 +175,21 @@
 
         String msg="";
         String result="";
+        String code="0";
 
         try {
             pgCsDocumentDtoList = pgCsDocumentManager.getAllDocData(cs_name);
-            if (pgCsDocumentDtoList != null)
+            if (pgCsDocumentDtoList != null) {
+                code="200";
                 msg = "获取数据成功";
+            }
             else
                 msg = "没有满足条件的数据";
         }catch (Exception e){
             e.printStackTrace();
             msg = "获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgCsDocumentDtoList);
         return resultMap;
@@ -192,20 +202,22 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
 
         String msg = "";
+        String code="0";
         ResponseEntity<byte[]> path = null;
         try {
             PgCsDocument pgCsDocument = pgCsDocumentManager.get(Long.valueOf(id));
             path = pgCsDocumentManager.downloadFile(pgCsDocument);
             if (path == null)
                 msg = "不存在该文档";
-            else
+            else {
+                code = "200";
                 msg = "下载成功";
-
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "下载失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", path.getBody());
         resultMap.put("msg", msg);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
index 94c5c84..ffc8b95 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
@@ -41,22 +41,24 @@
     public Map<String, Object> getPgDeviceByDevType(@FormParam("devType") String devType) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
         try {
-            pgDeviceDtoList = pgDeviceManager.getDeviceByDevTypee(devType);
+            pgDeviceDtoList = pgDeviceManager.getDeviceByDevType(devType);
             if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0){
                 msg="不存在满足要求的数据";
-                resultMap.put("result",null);
             }
             else{
-                resultMap.put("result", pgDeviceDtoList);
+                code="200";
                 msg = "获取成功";
             }
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", pgDeviceDtoList);
         return resultMap;
     }
 
@@ -69,25 +71,26 @@
     public Map<String, Object> getPgDeviceByAssetCode(@FormParam("assetCode") String assetCode) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         PgDeviceDto pgDeviceDto=null;
         try {
             PgDevice pgDevice = pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
             {
                 msg="不存在设备信息";
-                resultMap.put("result",null);
             }
             else {
                 pgDeviceDto = new PgDeviceDto(pgDevice);
                 msg = "获取成功";
-                resultMap.put("result", pgDeviceDto);
+                code="200";
             }
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", pgDeviceDto);
         return resultMap;
     }
 
@@ -102,27 +105,61 @@
                                              @FormParam("devType") String devType)throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
         try {
             pgDeviceDtoList = pgDeviceManager.getAllDevice(road,partition,devType);
             if(pgDeviceDtoList.size()==0) {
                 msg = "没有找到设备信息";
-                resultMap.put("result",null);
             }
             else {
                 msg = "设备信息获取成功";
-                resultMap.put("result", pgDeviceDtoList);
+                code="200";
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result", pgDeviceDtoList);
         return resultMap;
     }
 
     /**
+     * 显示设备列表
+     */
+    @POST
+    @Path("getPgDev")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String, Object> getPgDev(@FormParam("road") String road,
+                                             @FormParam("partition") String partition,
+                                             @FormParam("devType") String devType)throws Exception {
+        Map<String, Object> resultMap = new HashMap<>();
+        String msg="";
+        String code="0";
+        List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
+        try {
+            pgDeviceDtoList = pgDeviceManager.getAllDev(road,partition,devType);
+            if(pgDeviceDtoList.size()==0) {
+                msg = "没有找到设备信息";
+            }
+            else {
+                code="200";
+                msg = "设备信息获取成功";
+            }
+        }catch(Exception e){
+            e.printStackTrace();
+            msg="设备信息获取失败";
+        }
+        resultMap.put("code",code);
+        resultMap.put("msg",msg);
+        resultMap.put("result", pgDeviceDtoList);
+        return resultMap;
+    }
+
+
+    /**
      * 新增设备
      */
     @POST
@@ -145,6 +182,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if (pgDeviceManager.getDeviceByAssetCode(assetCode)!=null) {
@@ -169,6 +207,7 @@
 
                 pgDeviceManager.save(pgDevice);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
 
@@ -177,10 +216,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -208,14 +246,9 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
-            /*
-            if (pgDeviceManager.getDeviceByAssetCode(assetCode)!=null) {
-                result = "false";
-                msg = "已存在同名设备";
-            } else {
-            */
             PgDevice pgDevice = pgDeviceManager.get(Long.valueOf(id));
             pgDevice.setPipeGallery(pipeGallery);
             pgDevice.setPartition(partition);
@@ -233,14 +266,14 @@
 
             pgDeviceManager.save(pgDevice);
             result = "true";
+            code="200";
             msg = "编辑成功";
-            //}
         } catch (Exception e) {
             result = "false";
             msg = "编辑失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("result",result);
         resultMap.put("msg",msg);
         return resultMap;
@@ -256,7 +289,8 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
-        String result="false";
+        String result="";
+        String code="0";
 
         try {
             PgDevice pgDevice=pgDeviceManager.get(Long.valueOf(id));
@@ -268,6 +302,7 @@
             {
                 pgDevice.setActive(0);
                 pgDeviceManager.save(pgDevice);
+                code="200";
                 msg="设备删除成功";
                 result="true";
             }
@@ -276,6 +311,7 @@
             msg="设备删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -291,18 +327,18 @@
     {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         PgDeviceDto pgDeviceDto=null;
 
         try{
             PgDevice pgDevice=pgDeviceManager.getDeviceBydevCode(devCode);
             if(pgDevice==null) {
                 msg = "设备信息获取失败";
-                resultMap.put("result",null);
             }
             else{
                 pgDeviceDto = new PgDeviceDto(pgDevice);
                 msg = "设备信息获取成功";
-                resultMap.put("result",pgDeviceDto);
+                code="200";
             }
         }
         catch(Exception ex)
@@ -310,8 +346,9 @@
             ex.printStackTrace();
             msg="设备状态获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgDeviceDto);
         return resultMap;
     }
 
@@ -324,17 +361,17 @@
     public Map<String,Object> getDeviceByPartition(@FormParam("partition") String partition) throws Exception{
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<PgDeviceDto>();
 
         try{
             pgDeviceDtoList=pgDeviceManager.getPgDeviceDtoListByPartition(partition);
             if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0) {
                 msg = "设备信息获取失败";
-                resultMap.put("result",null);
             }
             else {
+                code="200";
                 msg = "设备信息获取成功";
-                resultMap.put("result",pgDeviceDtoList);
             }
         }
         catch(Exception e)
@@ -342,8 +379,9 @@
             e.printStackTrace();
             msg="设备信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgDeviceDtoList);
         return resultMap;
     }
 
@@ -353,17 +391,16 @@
     public Map<String,Object> getDeviceByOldDAssetCodeCode(@FormParam("assetCode") String assetCode) throws Exception{
         Map<String, Object> resultMap = new HashMap<>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
 
         try{
             pgDeviceDtoList=pgDeviceManager.getDeviceByOldDAssetCodeCode(assetCode);
-            if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0) {
-                msg = "设备信息获取失败";;
-                resultMap.put("result",null);
-            }
+            if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0)
+                msg = "设备信息获取失败";
             else {
                 msg = "设备信息获取成功";
-                resultMap.put("result",pgDeviceDtoList);
+                code="200";
             }
         }
         catch(Exception e)
@@ -372,8 +409,9 @@
             msg="设备信息获取失败";
             resultMap.put("result",null);
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgDeviceDtoList);
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java
index 421d249..f6f167d 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java
@@ -38,17 +38,21 @@
     public Map<String, Object> getDeviceTpeyList()throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgDeviceTypeDto> pgDeviceTypeDtoList=new ArrayList<PgDeviceTypeDto>();
         try {
             pgDeviceTypeDtoList = pgDeviceTypeManager.getAllDeviceType();
             if(pgDeviceTypeDtoList.size()==0)
                 msg="没有找到设备类型信息";
-            else
-                msg="设备类型信息获取成功";
+            else {
+                code="200";
+                msg = "设备类型信息获取成功";
+            }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备类型信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgDeviceTypeDtoList);
         return resultMap;
@@ -66,6 +70,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if (pgDeviceTypeManager.getDeviceTypeByDeType(devType)!=null) {
@@ -79,6 +84,7 @@
 
                 pgDeviceTypeManager.save(pgDeviceType);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
 
@@ -87,10 +93,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
index c276fb3..c789960 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
@@ -44,6 +44,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 
         try {
@@ -62,6 +63,7 @@
                 pgEquipment.setActive(1);
 
                 pgEquipmentManager.save(pgEquipment);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -70,9 +72,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -89,9 +91,10 @@
                                             @FormParam("ownerUnit") String ownerUnit,
                                             @FormParam("enterDate") String enterDate,
                                             @FormParam("curUser") String curUser) {
-        HashMap<String, Object> resultMap = new HashMap<String, Object>();
+        HashMap<String, Object> resultMap = new HashMap<>();
         String msg = "";
         String result = "";
+        String code="0";
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 
         try {
@@ -111,6 +114,7 @@
                 pgEquipment.setEnterDate(sdf.parse(enterDate));
 
                 pgEquipmentManager.save(pgEquipment);
+                code="200";
                 msg="编辑成功";
                 result="true";
             }
@@ -119,9 +123,9 @@
             result = "false";
             msg = "编辑失败";
         }
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -134,16 +138,19 @@
     public Map<String, Object> getEquipment(@FormParam("eqName") String eqName,
                                             @FormParam("eqCode") String eqCode,
                                             @FormParam("eqType") String eqType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        List<PgEquipmentDto> pgEquipmentDtoList=new ArrayList<PgEquipmentDto>();
+        String code="0";
+        List<PgEquipmentDto> pgEquipmentDtoList=new ArrayList<>();
 
         try{
             pgEquipmentDtoList=pgEquipmentManager.getEquipmentDtiList(eqName,eqCode,eqType);
             if(pgEquipmentDtoList==null||pgEquipmentDtoList.size()==0)
                 msg="不存在工器具记录";
-            else
-                msg="维获取成功";
+            else {
+                code = "200";
+                msg = "维获取成功";
+            }
         }
         catch(Exception e)
         {
@@ -166,6 +173,7 @@
         HashMap<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
         String result = "";
+        String code="";
 
         try {
             PgEquipment pgEquipment=pgEquipmentManager.get(Long.valueOf(id));
@@ -178,6 +186,7 @@
             {
                 pgEquipment.setActive(0);
                 pgEquipmentManager.save(pgEquipment);
+                code="200";
                 msg="删除成功";
                 result="true";
             }
@@ -186,6 +195,7 @@
             msg="设备信息获取失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -201,16 +211,19 @@
             throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=new ArrayList<PgDeviceTypeStatisticDto>();
 
         try {
             pgDeviceTypeStatisticDtoList=pgEquipmentManager.getDeviceStatisticByDevType(eqType);
 
+            code="200";
             msg = "获取成功";
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceTypeStatisticDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
index 05a9709..a90fd6c 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
@@ -4,9 +4,9 @@
 import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
 import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
 import com.casic.PgInterface.intelPlan.manager.PgPileAcuManager;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import com.casic.PgInterface.test.PlanData;
 import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.ModelAttribute;
 
 import javax.annotation.Resource;
 import javax.ws.rs.FormParam;
@@ -32,23 +32,25 @@
     public Map<String,Object> getPlanResult(@FormParam("planParamStr") String planParamStr){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
-        //List<PgPlanTask> pgPlanTaskList=pgPlanParams.getPgPlanTaskList();
         List<PgPlanTask> pgPlanTaskList=new PgPlanParams().getPgPlanParamsByString(planParamStr);
         List<PgPlanResultRe> pgPlanResultReList=new ArrayList<>();
 
-        try{
-                pgPlanResultReList=pgPileAcuManager.getPgPlanResultList(pgPlanTaskList);
-                if(pgPlanResultReList==null)
-                    msg="管线智能规划出错";
-                else
-                    msg="管线智能规划完成";
+        try {
+            pgPlanResultReList = pgPileAcuManager.getPgPlanResultList(pgPlanTaskList);
+            if (pgPlanResultReList == null)
+                msg = "管线智能规划出错";
+            else {
+                code="200";
+                msg = "管线智能规划完成";
+            }
         }
         catch(Exception ex){
             msg="智能规划出错";
             ex.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgPlanResultReList);
 
@@ -80,4 +82,30 @@
         return resultMap;
     }
 
+    @POST
+    @Path("getPlanTask")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getACUTask(@FormParam("pileAcuList") String pileAcuList){
+
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        String code="0";
+        List<PgAcuTask> pgAcuTaskList=new ArrayList<>();
+
+        try{
+            pgAcuTaskList=pgPileAcuManager.getACUTask(pileAcuList);
+            code="200";
+            msg="任务获取成功";
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            msg="任务获取失败";
+        }
+        resultMap.put("code",code);
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgAcuTaskList);
+
+        return resultMap;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
index ff85c61..66eec76 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
@@ -55,13 +55,13 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         try {
             PgInPgPerson pgInPgPerson = null;//pgInPgPersonManager.getPersonByUserName(userName);
             int iHostName = pgTagMacManager.getCount("select count(1) from PGTagMac where hostname = ?",assetCode);
-//            int iTagMac = pgTagMacManager.getCount("select count(1) from PGTagMac where tagmac = ?",assetCode.toUpperCase());
             if (0==iHostName)
             {
                 result = "false";
@@ -92,9 +92,8 @@
 
                 pgInPgStatusManager.save(pgInPgStatus);
 
-//                String syResult=pgInPgPersonManager.synchorizedInPgInfo(assetCode,userCode,userName,personType);
+                code="200";
                 result = "true";
-//                msg = "人员注册保存成功"+syResult;
                 msg = "人员注册保存成功";
             }
             else {
@@ -106,6 +105,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -120,6 +120,7 @@
     public Map<String, Object> getInPgPerson() throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<>();
         try {
@@ -127,11 +128,15 @@
             if (pgInPgInfoDtoList == null || pgInPgInfoDtoList.size() == 0)
                 msg = "没有找到入廊人员信息";
             else
+            {
+                code="200";
                 msg = "入廊人员信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "入廊人员信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
         return resultMap;
@@ -146,18 +151,22 @@
     public Map<String, Object> getInPgPersonInPg() throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
 
-        List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<PgInPgInfoDto>();
+        List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<>();
         try {
             pgInPgInfoDtoList = pgInPgPersonManager.getPgInPersonList(1);
             if (pgInPgInfoDtoList == null || pgInPgInfoDtoList.size() == 0)
                 msg = "没有找到入廊人员信息";
-            else
+            else {
+                code="200";
                 msg = "入廊人员信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "入廊人员信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
         return resultMap;
@@ -172,6 +181,7 @@
     public Map<String, Object> getInPgPersonByName(@FormParam("userName") String userName) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
 
         PgInPgPerson pgInPgPerson = null;
         PgInPgPersonDto pgInPgPersonDto=null;
@@ -184,12 +194,13 @@
                 pgInPgPersonDto=new PgInPgPersonDto(pgInPgPerson);
                 pgInPgPersonDtoList.add(pgInPgPersonDto);
                 msg = "人员信息获取成功";
+                code="200";
             }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "人员信息获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgPersonDtoList);
         return resultMap;
@@ -206,6 +217,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             PgInPgPerson pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName);
@@ -221,6 +233,7 @@
                     pgInPgPersonManager.save(pgInPgPerson);
                     result = "true";
                     msg = "编辑成功";
+                    code="200";
                 }
             }
         } catch (Exception e) {
@@ -228,9 +241,9 @@
             msg = "编辑失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -244,10 +257,12 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         int inPgNum=0;
         String msg = "";
+        String code="0";
 
         try{
             inPgNum=pgInPgStatusManager.getInPgNum();
 
+            code="200";
             msg="人员入廊次数获取成功";
         }
         catch(Exception e)
@@ -255,6 +270,7 @@
             e.printStackTrace();
             msg="人员入廊次数获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",inPgNum);
 
@@ -272,18 +288,22 @@
                                                    @FormParam("statisticType") String statisticType) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
 
         List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<PgInPgInfoDto>();
         try {
             pgInPgInfoDtoList = pgInPgPersonManager.getPgInPersonListByTime(startTime, endTime, statisticType);
             if(pgInPgInfoDtoList==null)
                 msg="入廊人员统计信息获取失败";
-            else
-                msg="入廊人员统计信息获取成功";
+            else {
+                code="200";
+                msg = "入廊人员统计信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "入廊人员统计信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
         return resultMap;
@@ -296,6 +316,7 @@
 
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
 
         try {
@@ -304,8 +325,10 @@
                 pgDeviceDtoList=pgDeviceManager.getPgCameraListByPosition("",apCodeStr);
                 if(pgDeviceDtoList==null)
                     msg="不存在关联摄像机";
-                else
-                    msg="关联摄像机获取成功";
+                else {
+                    code="200";
+                    msg = "关联摄像机获取成功";
+                }
             } else {
                 msg="请输入Ap编号";
             }
@@ -315,6 +338,7 @@
             msg="关联摄像机获取成功";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgDeviceDtoList);
         return resultMap;

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 25ded8a..283d7ab 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,20 +7,56 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" 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/construction/manager/PgCsDocumentManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/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/manager/PgAlarmManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/~$说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/~$说明20191207.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.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$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/接口说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明20191207.docx" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
@@ -51,7 +87,7 @@
         <counts>
           <entry key="class" value="4" />
           <entry key="iml" value="2" />
-          <entry key="java" value="707" />
+          <entry key="java" value="820" />
           <entry key="properties" value="14" />
           <entry key="xml" value="7" />
         </counts>
@@ -60,7 +96,7 @@
         <counts>
           <entry key="CLASS" value="4" />
           <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="707" />
+          <entry key="JAVA" value="820" />
           <entry key="Properties" value="14" />
           <entry key="XML" value="7" />
         </counts>
@@ -68,32 +104,32 @@
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
           <entry key="dummy" value="38" />
-          <entry key="java" value="30161" />
+          <entry key="java" value="40859" />
           <entry key="properties" value="100" />
-          <entry key="txt" value="176" />
+          <entry key="txt" value="186" />
           <entry key="xml" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="30161" />
-          <entry key="PLAIN_TEXT" value="214" />
+          <entry key="JAVA" value="40859" />
+          <entry key="PLAIN_TEXT" value="224" />
           <entry key="Properties" value="100" />
           <entry key="XML" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="48" />
+          <entry key="project.closed" value="51" />
           <entry key="project.open.time.1" value="5" />
           <entry key="project.open.time.12" value="2" />
           <entry key="project.open.time.13" value="1" />
           <entry key="project.open.time.15" value="1" />
           <entry key="project.open.time.16" value="1" />
           <entry key="project.open.time.17" value="1" />
-          <entry key="project.open.time.2" value="1" />
+          <entry key="project.open.time.2" value="2" />
           <entry key="project.open.time.20" value="1" />
-          <entry key="project.open.time.23" value="1" />
+          <entry key="project.open.time.23" value="2" />
           <entry key="project.open.time.24" value="2" />
           <entry key="project.open.time.251" value="1" />
           <entry key="project.open.time.27" value="2" />
@@ -106,8 +142,8 @@
           <entry key="project.open.time.36" value="1" />
           <entry key="project.open.time.37" value="1" />
           <entry key="project.open.time.39" value="2" />
-          <entry key="project.open.time.4" value="2" />
-          <entry key="project.open.time.40" value="1" />
+          <entry key="project.open.time.4" value="3" />
+          <entry key="project.open.time.40" value="2" />
           <entry key="project.open.time.41" value="2" />
           <entry key="project.open.time.42" value="2" />
           <entry key="project.open.time.43" value="2" />
@@ -122,23 +158,25 @@
           <entry key="project.open.time.6" value="3" />
           <entry key="project.open.time.63" value="2" />
           <entry key="project.open.time.64" value="1" />
+          <entry key="project.open.time.66" value="1" />
           <entry key="project.open.time.71" value="2" />
+          <entry key="project.open.time.74" value="1" />
           <entry key="project.open.time.76" value="1" />
           <entry key="project.open.time.8" value="2" />
           <entry key="project.open.time.9" value="1" />
           <entry key="project.open.time.97" value="1" />
-          <entry key="project.opened" value="78" />
+          <entry key="project.opened" value="84" />
         </counts>
       </usages-collector>
     </session>
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+            <state relative-caret-position="396">
+              <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
               <folding>
                 <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
                 <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -147,73 +185,6 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <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="99">
-              <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-              <folding>
-                <element signature="imports" expanded="true" />
-                <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-1170">
-              <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state>
-              <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
-              <folding>
-                <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-                <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="true">
-        <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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-              <folding>
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-                <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>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <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="352">
-              <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -225,18 +196,9 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>inCriteria</find>
-      <find>getPgPlanResulList</find>
-      <find>getPileAcuListByPileAcuStr</find>
-      <find>distinct</find>
-      <find>order</find>
-      <find>canPlanLine</find>
-      <find>isExistLine</find>
-      <find>getPlanResult</find>
       <find>pgPipeLine</find>
       <find>getPipeLineBylineName</find>
       <find>StringU</find>
-      <find>getAllAlarm</find>
       <find>getAlarmList</find>
       <find>getPgInPersonListByDay</find>
       <find>getDayInPgStatistic</find>
@@ -254,7 +216,16 @@
       <find>getPgContructionByNameOrType</find>
       <find>&quot;&quot;,&quot;&quot;,</find>
       <find>getPgContructionDtoByNameOrType</find>
+      <find>addConstruction</find>
+      <find>getPgLineAcuHole</find>
+      <find>getPlanResult</find>
       <find>getConstruction</find>
+      <find>addPipeLine</find>
+      <find>未找到入廊数据</find>
+      <find>getCurrentHoleByAcu</find>
+      <find>getAllAlarm</find>
+      <find>getPgDeviceDtoListByPartition</find>
+      <find>getPgDeviceByDevType</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -263,57 +234,57 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlan.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileHoleManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/planData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/PlanData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
       </list>
     </option>
   </component>
@@ -359,7 +330,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -421,53 +391,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="dto" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="manager" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -479,29 +402,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="rs" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -516,6 +416,7 @@
         </subPane>
       </pane>
       <pane id="Scope" />
+      <pane id="PackagesPane" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -710,7 +611,13 @@
       <workItem from="1574902733573" duration="1829000" />
       <workItem from="1574998240004" duration="7016000" />
       <workItem from="1575247959683" duration="6997000" />
-      <workItem from="1575704345590" duration="40473000" />
+      <workItem from="1575704345590" duration="69381000" />
+      <workItem from="1575869479666" duration="721000" />
+      <workItem from="1575947104878" duration="6101000" />
+      <workItem from="1576128264436" duration="3347000" />
+      <workItem from="1576208571543" duration="22000" />
+      <workItem from="1576227513917" duration="862000" />
+      <workItem from="1576293721220" duration="18246000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -817,11 +724,18 @@
       <option name="project" value="LOCAL" />
       <updated>1575775489149</updated>
     </task>
-    <option name="localTasksCounter" value="16" />
+    <task id="LOCAL-00016" summary="整改施工信息">
+      <created>1575791780774</created>
+      <option name="number" value="00016" />
+      <option name="presentableId" value="LOCAL-00016" />
+      <option name="project" value="LOCAL" />
+      <updated>1575791780774</updated>
+    </task>
+    <option name="localTasksCounter" value="17" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="452131000" />
+    <option name="totallyTimeSpent" value="510338000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -834,9 +748,8 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
-    <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.24205749" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2647504" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -847,7 +760,7 @@
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.3295082" />
       <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.4819672" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.65737706" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.3295082" />
@@ -939,7 +852,8 @@
     <MESSAGE value="重新设计智能规划部分" />
     <MESSAGE value="完成智能规划对接" />
     <MESSAGE value="修改报警统计" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改报警统计" />
+    <MESSAGE value="整改施工信息" />
+    <option name="LAST_COMMIT_MESSAGE" value="整改施工信息" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -951,16 +865,10 @@
           <option name="timeStamp" value="3" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java</url>
-          <line>69</line>
+          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java</url>
+          <line>40</line>
           <properties />
-          <option name="timeStamp" value="21" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java</url>
-          <line>96</line>
-          <properties />
-          <option name="timeStamp" value="38" />
+          <option name="timeStamp" value="122" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
@@ -970,394 +878,452 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <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="2068">
-          <caret line="154" column="35" selection-start-line="154" selection-start-column="35" selection-end-line="154" selection-end-column="35" />
-        </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="3300">
-          <caret line="297" column="22" selection-start-line="297" selection-start-column="22" selection-end-line="297" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/StringUtils.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
-          <caret line="13" column="48" lean-forward="true" selection-start-line="13" selection-start-column="48" selection-end-line="13" selection-end-column="48" />
+          <caret line="11" column="5" selection-start-line="11" selection-start-column="5" selection-end-line="11" selection-end-column="5" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="78" lean-forward="true" selection-start-line="78" selection-end-line="78" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="616">
-          <caret line="41" column="1" selection-start-line="41" selection-start-column="1" selection-end-line="41" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="110">
-          <caret line="12" column="23" selection-start-line="12" selection-start-column="23" selection-end-line="12" selection-end-column="23" />
+        <state relative-caret-position="516">
+          <caret line="114" column="12" selection-start-line="114" selection-start-column="12" selection-end-line="114" selection-end-column="12" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="164">
-          <caret line="56" lean-forward="true" selection-start-line="56" selection-end-line="56" />
+        <state relative-caret-position="418">
+          <caret line="33" column="44" selection-start-line="33" selection-start-column="44" selection-end-line="33" selection-end-column="44" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="258">
-          <caret line="27" column="12" lean-forward="true" selection-start-line="27" selection-start-column="12" selection-end-line="27" selection-end-column="12" />
+        <state relative-caret-position="132">
+          <caret line="11" column="20" lean-forward="true" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="20" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.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="-12">
-          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        <state relative-caret-position="516">
+          <caret line="142" column="54" selection-start-line="142" selection-start-column="54" selection-end-line="142" selection-end-column="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="858">
-          <caret line="55" column="27" lean-forward="true" selection-start-line="55" selection-start-column="27" selection-end-line="55" selection-end-column="27" />
+        <state relative-caret-position="66">
+          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="58">
+          <caret line="18" column="28" selection-start-line="18" selection-start-column="19" selection-end-line="18" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="305">
+          <caret line="24" column="31" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="714">
+          <caret line="58" column="5" lean-forward="true" selection-start-line="58" selection-start-column="5" selection-end-line="58" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="924">
+          <caret line="134" column="92" selection-start-line="134" selection-start-column="92" selection-end-line="134" selection-end-column="92" />
+          <folding>
+            <element signature="method#linkDevice#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkPartitionCamera#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkReservePlan#0;class#PgAlarmLinkRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1066">
+          <caret line="90" lean-forward="true" selection-start-line="90" selection-end-line="90" />
+          <folding>
+            <element signature="method#getTjResultByAlarmType#0;class#PgAlarmTjRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="946">
+          <caret line="148" column="11" lean-forward="true" selection-start-line="148" selection-start-column="11" selection-end-line="148" selection-end-column="11" />
+          <folding>
+            <element signature="method#getAlarmTypeList#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#addAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#editAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#deleteAlarmType#0;class#PgAlarmTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="208">
+          <caret line="46" column="23" lean-forward="true" selection-start-line="46" selection-start-column="23" selection-end-line="46" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="113" column="9" lean-forward="true" selection-start-line="113" selection-start-column="9" selection-end-line="113" selection-end-column="9" />
+          <folding>
+            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
+            <element signature="method#getNewestCh4InfoByDev#0;class#PgCh4Rs#0" />
+            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="145" column="6" lean-forward="true" selection-start-line="145" selection-start-column="6" selection-end-line="145" selection-end-column="6" />
+          <folding>
+            <element signature="method#addAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#editAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#deleteAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#getAuthorityList#0;class#PgAuthorityRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="58" column="1" lean-forward="true" selection-start-line="58" selection-start-column="1" selection-end-line="58" selection-end-column="1" />
+          <folding>
+            <element signature="method#getPgAssetPlanList#0;class#PgAssetPlanRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="370">
+          <caret line="371" column="66" selection-start-line="371" selection-start-column="66" selection-end-line="371" selection-end-column="66" />
+          <folding>
+            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#searchConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionDev#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="139" column="13" lean-forward="true" selection-start-line="139" selection-start-column="13" selection-end-line="139" selection-end-column="13" />
+          <folding>
+            <element signature="method#getCoInfoByDevAndDate#0;class#PgCoRs#0" />
+            <element signature="method#getNewestCoInfoByDev#0;class#PgCoRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="540">
+          <caret line="223" column="5" lean-forward="true" selection-start-line="223" selection-start-column="5" selection-end-line="223" selection-end-column="5" />
+          <folding>
+            <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="682">
+          <caret line="100" lean-forward="true" selection-start-line="100" selection-end-line="100" />
+          <folding>
+            <element signature="method#getDeviceTpeyList#0;class#PgDeviceTypeRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="377">
+          <caret line="225" column="35" selection-start-line="225" selection-start-column="35" selection-end-line="225" selection-end-column="35" />
+          <folding>
+            <element signature="method#addEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#addEquipment#1;class#PgEquipmentRs#0" />
+            <element signature="method#getEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#deleteEquipment#0;class#PgEquipmentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="406">
+          <caret line="109" lean-forward="true" selection-start-line="109" selection-end-line="109" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="154">
+          <caret line="28" column="19" selection-start-line="28" selection-start-column="19" selection-end-line="28" selection-end-column="19" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="748">
-          <caret line="49" column="5" lean-forward="true" selection-start-line="49" selection-start-column="5" selection-end-line="49" selection-end-column="5" />
+        <state relative-caret-position="296">
+          <caret line="161" column="35" selection-start-line="161" selection-start-column="35" selection-end-line="161" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="384">
+          <caret line="99" column="5" lean-forward="true" selection-start-line="99" selection-start-column="5" selection-end-line="99" selection-end-column="5" />
+        </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="362">
+          <caret line="340" column="35" selection-start-line="340" selection-start-column="35" selection-end-line="340" selection-end-column="35" />
+          <folding>
+            <element signature="method#addInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPersonInPg#0;class#PgInPgPersonRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-606">
+          <caret line="76" column="20" lean-forward="true" selection-start-line="76" selection-start-column="20" selection-end-line="76" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="65" column="35" selection-start-line="65" selection-start-column="35" selection-end-line="65" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="101" column="35" selection-start-line="101" selection-start-column="35" selection-end-line="101" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="84" column="35" selection-start-line="84" selection-start-column="35" selection-end-line="84" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="59" lean-forward="true" selection-start-line="59" selection-end-line="59" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="60" column="1" lean-forward="true" selection-start-line="60" selection-start-column="1" selection-end-line="60" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="145" column="35" selection-start-line="145" selection-start-column="35" selection-end-line="145" selection-end-column="35" />
+        </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="274">
+          <caret line="350" column="35" selection-start-line="350" selection-start-column="35" selection-end-line="350" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="121" column="39" selection-start-line="121" selection-start-column="39" selection-end-line="121" selection-end-column="39" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="28" column="8" lean-forward="true" selection-start-line="28" selection-start-column="8" selection-end-line="28" selection-end-column="8" />
+        <state relative-caret-position="340">
+          <caret line="103" selection-start-line="103" selection-end-line="103" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="226" column="35" selection-start-line="226" selection-start-column="35" selection-end-line="226" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="203" column="35" selection-start-line="203" selection-start-column="35" selection-end-line="203" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="241" column="35" selection-start-line="241" selection-start-column="35" selection-end-line="241" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="225" column="1" lean-forward="true" selection-start-line="225" selection-start-column="1" selection-end-line="225" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="176" column="5" lean-forward="true" selection-start-line="176" selection-start-column="5" selection-end-line="176" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="178" column="35" lean-forward="true" selection-start-line="178" selection-start-column="35" selection-end-line="178" selection-end-column="35" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="516">
-          <caret line="94" column="53" selection-start-line="94" selection-start-column="53" selection-end-line="94" selection-end-column="53" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="814">
-          <caret line="52" column="9" lean-forward="true" selection-start-line="52" selection-start-column="9" selection-end-line="52" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="182">
-          <caret line="58" column="12" lean-forward="true" selection-start-line="58" selection-start-column="12" selection-end-line="58" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="34" lean-forward="true" selection-start-line="34" selection-end-line="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="32" lean-forward="true" selection-start-line="32" selection-end-line="32" />
-          <folding>
-            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
-            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="185">
-          <caret line="63" column="13" selection-start-line="63" selection-start-column="13" selection-end-line="63" selection-end-column="13" />
-          <folding>
-            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
-            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
-            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="e#6319#6324#0" />
-            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
-          </folding>
+          <caret line="240" lean-forward="true" selection-start-line="240" selection-end-line="240" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
-          <caret line="58" column="28" lean-forward="true" selection-start-line="58" selection-start-column="28" selection-end-line="58" selection-end-column="28" />
-          <folding>
-            <element signature="method#addTempHumData#0;class#PgTempHumRs#0" />
-          </folding>
+        <state relative-caret-position="340">
+          <caret line="148" column="34" selection-start-line="148" selection-start-column="34" selection-end-line="148" selection-end-column="34" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
+        <state relative-caret-position="458">
+          <caret line="99" column="35" selection-start-line="99" selection-start-column="35" selection-end-line="99" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+        <state relative-caret-position="384">
+          <caret line="145" column="32" lean-forward="true" selection-start-line="145" selection-start-column="32" selection-end-line="145" selection-end-column="32" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="414">
-          <caret line="22" column="46" lean-forward="true" selection-start-line="22" selection-start-column="46" selection-end-line="22" selection-end-column="46" />
-        </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="396">
-          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" column="83" selection-start-line="11" selection-start-column="83" selection-end-line="11" selection-end-column="83" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="26">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
-          <folding>
-            <element signature="method#getPgInPgStatusByPerson#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNumByName#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNum#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPersonListByDay#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPgStatusByPgInPgPerson#0;class#PgInPgStatusManager#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="44">
-          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-12">
-          <caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="87" lean-forward="true" selection-start-line="87" selection-end-line="87" />
-          <folding>
-            <element signature="method#getConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#addConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#deleteConstructionType#0;class#PgConstructionTypeRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
-          <folding>
-            <element signature="method#getConstructionTypeByType#0;class#PgConstructionTypeManager#0" />
-            <element signature="method#getAllConstructionTypeDto#0;class#PgConstructionTypeManager#0" />
-          </folding>
-        </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="145">
-          <caret line="258" column="9" lean-forward="true" selection-start-line="258" selection-start-column="9" selection-end-line="258" selection-end-column="9" />
-          <folding>
-            <element signature="method#getMonthInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayInPgStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgOverViewRs#0" />
-            <element signature="method#getAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getMonthAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayAlarmStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgOverViewRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="103">
-          <caret line="105" column="50" lean-forward="true" selection-start-line="105" selection-start-column="50" selection-end-line="105" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateBasicDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="99">
-          <caret line="125" selection-start-line="125" selection-end-line="125" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="190">
-          <caret line="24" column="35" lean-forward="true" selection-start-line="24" selection-start-column="35" selection-end-line="24" selection-end-column="35" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="436">
-          <caret line="24" lean-forward="true" selection-start-line="24" selection-end-line="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" lean-forward="true" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="300">
-          <caret line="34" column="31" lean-forward="true" selection-start-line="34" selection-start-column="31" selection-end-line="34" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="42" column="13" lean-forward="true" selection-start-line="42" selection-start-column="13" selection-end-line="42" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="120" column="72" lean-forward="true" selection-start-line="120" selection-start-column="72" selection-end-line="120" selection-end-column="72" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="293">
-          <caret line="58" column="73" lean-forward="true" selection-start-line="58" selection-start-column="73" selection-end-line="58" selection-end-column="73" />
-          <folding>
-            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
-            <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
-          </folding>
-        </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="307">
-          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
+        <state relative-caret-position="758">
+          <caret line="130" column="5" lean-forward="true" selection-start-line="130" selection-start-column="5" selection-end-line="130" selection-end-column="5" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1170">
-          <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
+        <state relative-caret-position="494">
+          <caret line="86" column="62" lean-forward="true" selection-start-line="86" selection-start-column="62" selection-end-line="86" selection-end-column="62" />
           <folding>
-            <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-            <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+            <element signature="method#getAllDevice#0;class#PgDeviceManager#0" />
+            <element signature="method#getAllDev#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="195" column="28" lean-forward="true" selection-start-line="195" selection-start-column="28" selection-end-line="195" selection-end-column="28" />
+        <state relative-caret-position="166">
+          <caret line="174" column="13" lean-forward="true" selection-start-line="174" selection-start-column="13" selection-end-line="174" selection-end-column="13" />
           <folding>
-            <element signature="method#getAlarmByTypeAndTime#0;class#PgAlarmManager#0" />
-            <element signature="method#getAlarmNum#0;class#PgAlarmManager#0" />
             <element signature="method#getDayAlarmStatistic#0;class#PgAlarmManager#0" />
+            <element signature="method#getAlarmList#0;class#PgAlarmManager#0" />
             <element signature="method#createDTO#0;class#PgAlarmManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="364">
+          <caret line="46" column="56" lean-forward="true" selection-start-line="46" selection-start-column="56" selection-end-line="46" selection-end-column="56" />
+          <folding>
+            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
+            <element signature="method#getPgDev#0;class#PgDeviceRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
+            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+        <state relative-caret-position="396">
+          <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
           <folding>
             <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
             <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -1365,52 +1331,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="239">
-          <caret line="21" column="33" lean-forward="true" selection-start-line="21" selection-start-column="33" selection-end-line="21" selection-end-column="33" />
-        </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="352">
-          <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-        </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="99">
-          <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-          </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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-          <folding>
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-            <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>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
index c436c93..e913155 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
@@ -132,7 +132,10 @@
             this.setAlarmType("");
         else
             this.setAlarmType(pgAlarm.getAlarmTypeId().getAlarmType());
-        this.setAlarmValue(pgAlarm.getAlarmValue());
+        if(pgAlarm.getAlarmValue()==null)
+            this.setAlarmValue("");
+        else
+            this.setAlarmValue(pgAlarm.getAlarmValue());
         if (pgAlarm.getAlarmDate() != null)
             this.setAlarmDate(sdf.format(pgAlarm.getAlarmDate()));
         else
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
index a43965c..565cb41 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -159,11 +159,21 @@
     }
 
     //获取历史报警消息列表
-    public List<PgAlarmDto> getAllAlarm(String alarmType,String startDay,String endDay,String isNew,int page,int rows) {
-        try {
+    public  Map<String, Object> getAllAlarm(String alarmType,String partition,String startDay,String endDay,String isNew,int page,int rows) {
 
+        Map<String, Object> resultMap = new HashMap<>();
+        String msg="";
+
+        try {
             Criteria criteria = createCriteria(PgAlarm.class);
 
+            if (StringUtils.isNotBlank(partition)) {
+                DetachedCriteria inCriteria = DetachedCriteria.forClass(PgDevice.class);
+                inCriteria.add(Restrictions.eq("partition", partition));
+                inCriteria.setProjection(Property.forName("id"));
+                criteria.add(Property.forName("alarmDevId").in(inCriteria));
+            }
+
             if (StringUtils.isNotBlank(alarmType)&&!alarmType.contains("全部")&&pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
                 criteria.add(Restrictions.eq("alarmTypeId", pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)));
 
@@ -190,8 +200,16 @@
             for (PgAlarm pgAlarm : pgAlarmList) {
                 pgAlarmDtoList.add(new PgAlarmDto(pgAlarm));
             }
-
-            return pgAlarmDtoList;
+            if(pgAlarmDtoList==null||pgAlarmDtoList.size()==0) {
+                resultMap.put("msg", "没有报警信息");
+                resultMap.put("code","0");
+            }else {
+                resultMap.put("code","200");
+                resultMap.put("msg", "报警信息获取成功");
+            }
+            resultMap.put("count",pg.getTotalCount());
+            resultMap.put("result",pgAlarmDtoList);
+            return resultMap;
         }
         catch(Exception ex){
             ex.printStackTrace();
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index 7547560..654f49e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -24,11 +24,11 @@
 
         Criteria criteria = createCriteria(PgDevice.class);
 
-        if(road!=null)
+        if(StringUtils.isNotBlank(road))
             criteria.add(Restrictions.eq("road",road));
-        if(partition!=null)
+        if(StringUtils.isNotBlank(partition))
             criteria.add(Restrictions.eq("partition",partition));
-        if(devType!=null)
+        if(StringUtils.isNotBlank(devType))
             criteria.add(Restrictions.eq("devType",devType));
 
         criteria.add(Restrictions.eq("active", 1));
@@ -43,6 +43,29 @@
         return pgDeviceDtoList;
     }
 
+    public List<PgDeviceDto> getAllDev(String road,String partition,String devType) {
+
+        Criteria criteria = createCriteria(PgDevice.class);
+
+        if(StringUtils.isNotBlank(road))
+            criteria.add(Restrictions.eq("road",road));
+        if(StringUtils.isNotBlank(partition))
+            criteria.add(Restrictions.eq("partition",partition));
+        if(StringUtils.isNotBlank(devType))
+            criteria.add(Restrictions.like("devType","%"+devType+"%"));
+
+        criteria.add(Restrictions.eq("active", 1));
+        criteria.addOrder(Order.desc("id"));
+        List<PgDevice> pgDeviceList = criteria.list();
+
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
+        for (PgDevice pgDevice : pgDeviceList) {
+            pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
+        }
+
+        return pgDeviceDtoList;
+    }
+
     //根据名字获取当前设备
     public PgDevice getDeviceByAssetCode(String assetCode) {
         Criteria criteria=createCriteria(PgDevice.class);
@@ -56,9 +79,9 @@
     }
 
     //根据类型获取设备列表
-    public List<PgDeviceDto> getDeviceByDevTypee(String devType) {
+    public List<PgDeviceDto> getDeviceByDevType(String devType) {
         Criteria criteria=createCriteria(PgDevice.class);
-        criteria.add(Restrictions.eq("devType",devType));
+        criteria.add(Restrictions.like("devType","%"+devType+"%"));
 
         List<PgDevice> pgDeviceList=criteria.list();
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
@@ -106,7 +129,7 @@
         criteria.add(Restrictions.eq("partition",partition));
 
         List<PgDevice> pgDeviceList=criteria.list();
-        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<PgDeviceDto>();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
 
         for (PgDevice pgDevice : pgDeviceList) {
             pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
index 3a3bccd..595730e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
@@ -1,10 +1,13 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.devTable.domain.PgAlarmType;
 import com.casic.PgInterface.devTable.domain.PgPartition;
 import com.casic.PgInterface.devTable.domain.PgRoad;
 import com.casic.PgInterface.devTable.domain.PipeGallery;
 import com.casic.PgInterface.devTable.dto.PgPartitionDto;
+import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
@@ -12,7 +15,9 @@
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Created by yxw on 2017/11/4.
@@ -21,7 +26,8 @@
 public class PgPartitionManager extends HibernateEntityDao<PgPartition> {
 
     @Resource
-    PgRoadManager pgRoadManager;
+    private PgRoadManager pgRoadManager;
+
 
     public PgPartition getPartitionByParName(String parName) {
         Criteria criteria = getSession().createCriteria(PgPartition.class);
@@ -99,4 +105,5 @@
         return pgPartitionDtoList;
     }
 
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
index f216360..a6928f1 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
@@ -5,6 +5,7 @@
 public class PgPlanResultRe {
 
     private String taskKey;
+    private List<String> pileAcuList;
     private List<PgPlanResult> pgPlanResultList;
 
     public String getTaskKey() {
@@ -15,6 +16,14 @@
         this.taskKey = taskKey;
     }
 
+    public List<String> getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(List<String> pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+
     public List<PgPlanResult> getPgPlanResultList() {
         return pgPlanResultList;
     }
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
index 71ea765..47eea07 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
@@ -54,9 +54,7 @@
 
         List<PgLineHole> pgLineHoleList=criteria.list();
         List<PgLineHoleDTO> pgLineHoleDTOList=new ArrayList<>();
-        if(pgLineHoleList==null||pgLineHoleList.size()==0)
-            return null;
-        else
+        if(pgLineHoleList!=null&&pgLineHoleList.size()!=0)
             pgLineHoleDTOList=PgLineHoleDTO.ConvertToDTOList(pgLineHoleList,pgPileAcuManager,pgRoadManager);
         return pgLineHoleDTOList;
     }
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
index 0fd9e1f..841a386 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
@@ -1,12 +1,15 @@
 package com.casic.PgInterface.intelPlan.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.devTable.domain.PgPartition;
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
 import com.casic.PgInterface.intelPlan.domain.PgLineHole;
 import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
 import com.casic.PgInterface.intelPlan.domain.PgSection;
 import com.casic.PgInterface.intelPlan.dto.PgPlanResult;
 import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
 import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -22,6 +25,9 @@
     @Resource
     private PgLineHoleManager pgLineHoleManager;
 
+    @Resource
+    private PgRoadManager pgRoadManager;
+
     public PgPileAcu getPgPileAcuByCode(String acuCode){
         List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
 
@@ -58,7 +64,9 @@
         for(PgPlanTask pgPlanTask:pgPlanTaskList){
             List<PgPlanResult> pgPlanResultList=getPgPlanResultByPlantask(pgPlanTask);
             PgPlanResultRe pgPlanResultRe=new PgPlanResultRe();
+
             pgPlanResultRe.setTaskKey(pgPlanTask.getTaskKey());
+            pgPlanResultRe.setPileAcuList(pgPlanTask.getPileAcuList());
             pgPlanResultRe.setPgPlanResultList(pgPlanResultList);
 
             pgPlanResultReList.add(pgPlanResultRe);
@@ -142,4 +150,57 @@
         return length;
     }
 
+    private PgPileAcu getPgPileAcuByAcuCode(String acuCode){
+        List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
+
+        if(pgPileAcuList==null||pgPileAcuList.size()==0)
+            return null;
+        else
+            return pgPileAcuList.get(0);
+    }
+
+    public List<PgAcuTask> getACUTask(String pileAcuList){
+        String[] acuArray=pileAcuList.split(",");
+        List<PgAcuTask> pgAcuTaskList=new ArrayList<>();
+
+        for(String acu:acuArray){
+            PgPileAcu pgPileAcu=this.getPgPileAcuByCode(acu);
+            String roadName=pgRoadManager.get(pgPileAcu.getRoadId()).getRoadName();
+
+            if(!containRoad(roadName,pgAcuTaskList))
+            {
+                PgAcuTask pgAcuTask=new PgAcuTask();
+                pgAcuTask.setRoadName(roadName);
+                pgAcuTask.setPileAcuList(acu);
+                pgAcuTaskList.add(pgAcuTask);
+            }
+            else{
+                PgAcuTask pgAcuTask=getIndexRoad(roadName,pgAcuTaskList);
+                if(pgAcuTask!=null)
+                    pgAcuTask.setPileAcuList(pgAcuTask.getPileAcuList()+","+acu);
+            }
+        }
+
+        return pgAcuTaskList;
+    }
+
+    private boolean containRoad(String roadName,List<PgAcuTask> pgAcuTaskList){
+        if(pgAcuTaskList==null||pgAcuTaskList.size()==0) return false;
+        for(PgAcuTask pgAcuTask:pgAcuTaskList){
+            if(pgAcuTask.getRoadName().equals(roadName))
+                return true;
+        }
+
+        return false;
+    }
+
+    private PgAcuTask getIndexRoad(String roadName, List<PgAcuTask> pgAcuTaskList){
+        for(PgAcuTask pgAcuTask:pgAcuTaskList){
+            if(pgAcuTask.getRoadName().equals(roadName))
+                return pgAcuTask;
+        }
+
+        return null;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java
new file mode 100644
index 0000000..323f7ef
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java
@@ -0,0 +1,25 @@
+package com.casic.PgInterface.reservePlan.dto;
+
+import java.util.List;
+
+public class PgAcuTask {
+
+    private String roadName;//道路
+    private String pileAcuList;//acu分区
+
+    public String getRoadName() {
+        return roadName;
+    }
+
+    public void setRoadName(String roadName) {
+        this.roadName = roadName;
+    }
+
+    public String getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(String pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
index c25e926..c7d7693 100644
--- a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
@@ -70,9 +70,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(Long.valueOf(inPgPersonId));
         PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("hostName",pgInPgPerson.getAssetCode());
-//        PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode());
-//        long maxId = pgTagPositionManager.getMaxId(pgTagMac.getTagMac());
-//        PGTagPosition pgTagPosition = pgTagPositionManager.get(maxId);
+
         PGTagPosition pgTagPosition = tagmacRun.GetTagStatus(pgTagMac);
         boolean bExist = false;
         bExist = pgTagPositionManager.findTagPosition(pgTagPosition.getPositionUpdatetime(),pgTagPosition.getHostId());
@@ -104,8 +102,7 @@
         PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(Long.valueOf(inPgPersonId));
         PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pgInPgPersonId",pgInPgPerson);
         System.out.println("time:"+pgInPgStatus.getInTime());
-//        PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pgInPgPersonId",inPgPersonId);
-//        PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode());
+
         PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("hostName",pgInPgPerson.getAssetCode());
 
         Map<Object,Object> mapPosition = new HashMap<>();
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
index 082ba5d..3eed00a 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
@@ -48,6 +48,7 @@
     public Map<String, Object> linkDevice(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         PgDeviceDto pgDeviceDto = null;
         try {
@@ -62,6 +63,7 @@
                     else {
                         pgDeviceDto = new PgDeviceDto(pgDevice);
                         msg = "报警关联设备获取成功";
+                        code="200";
                     }
                 }
             }
@@ -71,6 +73,7 @@
             e.printStackTrace();
             msg = "获取关联设备失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceDto);
 
@@ -86,6 +89,7 @@
     public Map<String, Object> linkPartitionCamera(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
         try {
@@ -106,6 +110,7 @@
 
                         pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(partition,position);
                         msg = "关联设备获取成功";
+                        code="200";
                     }
                 }
             }
@@ -115,6 +120,7 @@
             e.printStackTrace();
             msg = "分区设备关联失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceDtoList);
         return resultMap;
@@ -129,6 +135,7 @@
     public Map<String, Object> linkReservePlan(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgReservePlanDto> pgReservePlanDtoList=new ArrayList<>();
         try{
@@ -139,10 +146,12 @@
                 else {
                     pgReservePlanDtoList = pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
 
-                    if(pgReservePlanDtoList==null||pgReservePlanDtoList.size()==0)
-                        msg="不存在关联的报警预案";
-                    else
+                    if (pgReservePlanDtoList == null || pgReservePlanDtoList.size() == 0)
+                        msg = "不存在关联的报警预案";
+                    else {
                         msg = "关联预案获取成功";
+                        code="200";
+                    }
                 }
             }
             else
@@ -153,6 +162,7 @@
             e.printStackTrace();
             msg="预案关联失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgReservePlanDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
index 0ddbc4d..0ce886b 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
@@ -41,25 +41,19 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getAlarmList(@FormParam("alarmType") String alarmType,
                                             @FormParam("startDay") String startDay,
+                                            @FormParam("partition") String partition,
                                             @FormParam("endDay") String endDay,
                                             @FormParam("isNew") String isNew,
                                             @FormParam("page") int page,
                                             @FormParam("rows") int rows) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
         try {
-            pgAlarmDtoList = pgAlarmManager.getAllAlarm(alarmType,startDay,endDay,isNew,page,rows);
-            if (pgAlarmDtoList==null||pgAlarmDtoList.size() == 0)
-                msg = "没有报警信息";
-            else
-                msg = "报警信息获取成功";
+            resultMap = pgAlarmManager.getAllAlarm(alarmType,partition,startDay,endDay,isNew,page,rows);
+
         } catch (Exception e) {
             e.printStackTrace();
-            msg = "报警信息获取失败";
         }
-        resultMap.put("msg", msg);
-        resultMap.put("result", pgAlarmDtoList);
         return resultMap;
     }
 
@@ -71,9 +65,10 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> clearAlarmList(@FormParam("id") String id) throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        String result = "false";
+        String result = "";
+        String code="0";
 
         try {
             PgAlarm pgAlarm = new PgAlarm();
@@ -86,12 +81,14 @@
                 pgAlarmManager.save(pgAlarm);
                 msg = "报警信息清除成功";
                 result = "true";
+                code = "200";
             }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警信息清除失败";
             result = "false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
@@ -106,21 +103,26 @@
     public Map<String, Object> getAlarmByTypeOrTime(@FormParam("alarmType") String alarmType,
                                                     @FormParam("startTime") String startTime,
                                                     @FormParam("endTime") String endTime) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
-        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<PgAlarmDto>();
+        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
         try {
             pgAlarmDtoList = pgAlarmManager.getAlarmByTypeAndTime(alarmType, startTime, endTime);
             if (pgAlarmDtoList == null || pgAlarmDtoList.size() == 0)
                 msg = "报警信息不存在";
             else
+            {
                 msg = "报警信息获取成功";
+                code="200";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警信息获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
index 29ce8a4..ed0bf34 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
@@ -39,8 +39,8 @@
     public Map<String, Object> getAlarmRule(@FormParam("devType") String devType) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
-        System.out.println("devType:"+devType);
         List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<>();
         try {
             pgAlarmRuleDtoList = pgAlarmRuleManager.getAlarmRuleDto(devType);
@@ -52,6 +52,7 @@
             e.printStackTrace();
             msg = "报警阈值信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmRuleDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
index 24ab894..abef1b1 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
@@ -39,16 +39,21 @@
                                                      @FormParam("endDate") String endDate)throws Exception{
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
+
         List<PgAlarmTjDto> pgAlarmTjDtoList=null;
         try{
             pgAlarmTjDtoList=pgAlarmTjManager.getAlarmTjResultByType(startDate,endDate);
             msg="获取成功";
+            code="200";
         }
         catch(Exception ex) {
             msg = "统计失败";
         }
-        resultMap.put("result",pgAlarmTjDtoList);
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
+        resultMap.put("result",pgAlarmTjDtoList);
+
         return resultMap;
     }
 
@@ -61,23 +66,27 @@
     public Map<String, Object> getAlarmByTime(@FormParam("startTime") String startTime,
                                               @FormParam("endTime") String endTime,
                                               @FormParam("statisticType") String statisticType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code = "0";
 
-        List<PgAlarmTjDto> pgAlarmTjDtoList = new ArrayList<PgAlarmTjDto>();
+        List<PgAlarmTjDto> pgAlarmTjDtoList = new ArrayList<>();
         try {
             pgAlarmTjDtoList = pgAlarmTjManager.getAlarmByTime(startTime, endTime, statisticType);
             if(pgAlarmTjDtoList==null)
                 msg="报警统计信息获取失败";
-            else
-                msg="报警统计信息获取成功";
+            else {
+                msg = "报警统计信息获取成功";
+                code="200";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警统计信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmTjDtoList);
         return resultMap;
     }
 
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
index 28bc811..b6278a9 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
@@ -30,7 +30,6 @@
     @Resource
     private PgAlarmTypeManager pgAlarmTypeManager;
 
-
     /**
      * 获取报警类型
      */
@@ -38,19 +37,24 @@
     @Path("getAlarmType")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getAlarmTypeList()throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
-        List<PgAlarmTypeDto> pgAlarmTypeDtoList=new ArrayList<PgAlarmTypeDto>();
+        String code="";
+
+        List<PgAlarmTypeDto> pgAlarmTypeDtoList=new ArrayList<>();
         try {
             pgAlarmTypeDtoList = pgAlarmTypeManager.getAllAlarmTypeDto();
             if(pgAlarmTypeDtoList.size()==0)
                 msg="没有报警类型信息";
-            else
-                msg="报警类型信息获取成功";
+            else {
+                code="200";
+                msg = "报警类型信息获取成功";
+            }
         }catch(Exception e){
             e.printStackTrace();
             msg="报警类型信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAlarmTypeDtoList);
         return resultMap;
@@ -66,6 +70,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
@@ -83,6 +88,7 @@
                 logger.info("成功保存");
                 result = "true";
                 msg = "保存成功";
+                code="200";
             }
         } catch (Exception e) {
             result = "false";
@@ -90,6 +96,7 @@
             e.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -106,6 +113,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try{
             if(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
@@ -119,6 +127,7 @@
                 pgAlarmTypeManager.save(pgAlarmType);
                 result = "true";
                 msg = "编辑成功";
+                code="200";
             }
         }
         catch(Exception e)
@@ -128,6 +137,7 @@
             e.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("result",result);
         resultMap.put("msg",msg);
 
@@ -146,6 +156,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
         String result="false";
+        String code="0";
 
         try {
             PgAlarmType pgAlarmType=pgAlarmTypeManager.get(Long.valueOf(id));
@@ -157,6 +168,7 @@
             {
                 pgAlarmType.setActive(0);
                 pgAlarmTypeManager.save(pgAlarmType);
+                code="200";
                 msg="报警类型删除成功";
                 result="true";
             }
@@ -165,6 +177,7 @@
             msg="报警类型删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
index 4533e1a..85940bb 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
@@ -33,12 +33,15 @@
                                                  @FormParam("inSpectionPlace") String inSpectionPlace){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
         List<PgAssetPlanDto> pgAssetPlanDtoList=new ArrayList<>();
         try{
             pgAssetPlanDtoList=pgAssetPlanManager.getPgAssetPlanDtoList(startDay,endDay,inSpectionPlace);
-            if(pgAssetPlanDtoList!=null&&pgAssetPlanDtoList.size()!=0)
-                msg="巡检信息获取成功";
+            if(pgAssetPlanDtoList!=null&&pgAssetPlanDtoList.size()!=0) {
+                code="200";
+                msg = "巡检信息获取成功";
+            }
             else
                 msg="不存在巡检信息";
         }
@@ -47,6 +50,7 @@
             msg="巡检信息获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAssetPlanDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
index 47ef9d1..5cbdfcb 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
@@ -30,12 +30,15 @@
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
         String result="";
+        String code="0";
 
         List<PgAssetPlanStatic> pgAssetPlanStaticList = null;
         try{
             pgAssetPlanStaticList=pgAssetPlanManager.getPgAssetPlanStaticLisByTime(startTime,endTime,staticType);
-            if(pgAssetPlanStaticList!=null&&pgAssetPlanStaticList.size()!=0)
-                msg="巡检统计信息获取成功";
+            if(pgAssetPlanStaticList!=null&&pgAssetPlanStaticList.size()!=0) {
+                code = "200";
+                msg = "巡检统计信息获取成功";
+            }
             else
                 msg="统计信息获取失败";
         }
@@ -44,6 +47,7 @@
             msg="统计失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAssetPlanStaticList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
index 26f5d6a..503bfe3 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
@@ -40,6 +40,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="";
 
         try{
             PgAuthority pgAuthority=new PgAuthority();
@@ -50,6 +51,7 @@
 
             pgAuthorityManager.save(pgAuthority);
             msg="用户权限保存成功";
+            code="200";
             result="true";
         }
         catch(Exception e) {
@@ -57,6 +59,7 @@
             msg = "新增权限失败";
             result = "false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -65,22 +68,25 @@
 
     /*
        *编辑角权限信息
-        */
+    */
     @POST
     @Path("editAuthority")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> editAuthority(@FormParam("id") String id,
                                        @FormParam("authority") String authority,
                                        @FormParam("concent") String concent) throws Exception{
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
+
         try {
             PgAuthority pgAuthority=pgAuthorityManager.get(Long.valueOf(id));
             pgAuthority.setAuthority(authority);
             pgAuthority.setConcent(concent);
 
             pgAuthorityManager.save(pgAuthority);
+            code="200";
             msg="权限保存成功";
             result="true";
         }
@@ -90,7 +96,7 @@
             msg="权限编辑失败";
             result="false";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -105,9 +111,10 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> deleteAuthority(@FormParam("id") String id)throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
-        String result="false";
+        String result="";
+        String code="0";
 
         try {
             PgAuthority pgAuthority= pgAuthorityManager.get(Long.valueOf(id));
@@ -119,6 +126,7 @@
             {
                 pgAuthority.setActive(0);
                 pgAuthorityManager.save(pgAuthority);
+                code="200";
                 msg="删除权限成功";
                 result="true";
             }
@@ -127,37 +135,40 @@
             msg="删除权限失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
     }
 
     /*
-* 获取权限信息
- */
+    * 获取权限信息
+    */
     @POST
     @Path("getAuthorityList")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> getAuthorityList() {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgAuthorityDto> pgAuthorityDtoList = new ArrayList<PgAuthorityDto>();
         try {
             pgAuthorityDtoList = pgAuthorityManager.getAuthorityList();
             if (pgAuthorityDtoList == null)
                 msg = "不存在权限信息";
-            else
+            else {
+                code = "200";
                 msg = "权限信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "权限信息获取是失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAuthorityDtoList);
         return resultMap;
     }
 
 
-
-
 }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
index a9ef521..a74ecc7 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
@@ -45,6 +45,7 @@
                                                @FormParam("endDate") String endDate)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgHistoryDataDto> pgHistoryDataDtoList=new ArrayList<>();
 
         try {
@@ -55,13 +56,16 @@
                 pgHistoryDataDtoList=pgCh4Manager.getAllCH4Data(pgDevice,startDate,endDate);
                 if(pgHistoryDataDtoList==null)
                     msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+                else {
+                    code = "200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgHistoryDataDtoList);
         return resultMap;
@@ -75,8 +79,9 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getNewestCh4InfoByDev(@FormParam("assetCode") String assetCode)throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
+        String code="0";
         PgCh4Dto pgCh4Dto=new PgCh4Dto(null);
 
         try {
@@ -87,13 +92,17 @@
                 pgCh4Dto=pgCh4Manager.getNewestCH4Data(pgDevice);
                 if(pgCh4Dto==null)
                     msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgCh4Dto);
         return resultMap;
@@ -111,6 +120,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
@@ -127,6 +137,7 @@
                 pgCh4.setPgDeviceId(pgDevice);
 
                 pgCh4Manager.save(pgCh4);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -135,7 +146,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
index a7eac39..dfc8ca5 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
@@ -43,23 +43,27 @@
                                                       @FormParam("endDate") String endDate)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgHistoryDataDto> pgHistoryDataDtoList=new ArrayList<>();
 
         try {
             PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
                 msg="设备不存在";
-            else{
-                pgHistoryDataDtoList=pgCoManager.getAllCoData(pgDevice, startDate, endDate);
-                if(pgHistoryDataDtoList==null)
-                    msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+            else {
+                pgHistoryDataDtoList = pgCoManager.getAllCoData(pgDevice, startDate, endDate);
+                if (pgHistoryDataDtoList == null)
+                    msg = "没有满足要求的数据";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgHistoryDataDtoList);
         return resultMap;
@@ -75,6 +79,7 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         PgCoDto pgCoDto=new PgCoDto(null);
 
         try {
@@ -85,13 +90,16 @@
                 pgCoDto=pgCoManager.getNewestCoData(pgDevice);
                 if(pgCoDto==null)
                     msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgCoDto);
         return resultMap;
@@ -110,6 +118,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         try {
@@ -126,6 +135,7 @@
 
                 pgCoManager.save(pgCo);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
         } catch (Exception e) {
@@ -133,7 +143,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
index b4b826e..9af98a3 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
@@ -60,6 +60,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         try {
 
@@ -80,8 +81,8 @@
                 pgConstruction.setPgConstructionTypeId(pgConstructionType.getId());
                 pgConstruction.setActive(1);
                 pgConstruction.setParName(parName);
-                logger.info("保存成功");
                 pgConstructionManager.save(pgConstruction);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -90,6 +91,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("success", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -116,6 +118,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
@@ -140,6 +143,7 @@
                 pgConstruction.setParName(parName);
 
                 pgConstructionManager.save(pgConstruction);
+                code="200";
                 result = "true";
                 msg = "编辑成功";
             }
@@ -150,7 +154,7 @@
             e.printStackTrace();
 
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -167,6 +171,8 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
+
         try {
             PgConstruction pgConstruction = pgConstructionManager.get(Long.valueOf(id));
             if (pgConstruction == null)
@@ -177,6 +183,7 @@
             {
                 pgConstruction.setActive(0);
                 pgConstructionManager.save(pgConstruction);
+                code="200";
                 result = "true";
                 msg = "成功删除信息";
             }
@@ -185,6 +192,7 @@
             result = "false";
             msg = "删除失败";
         }
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -204,9 +212,11 @@
                                                   @FormParam("rows") int rows)throws Exception{
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
         List<PgConstructionDto> pgConstructionDtoList=new ArrayList<>();
         try{
             pgConstructionDtoList=pgConstructionManager.getPgContructionDto(cs_name,cs_type,startTime,endTime,page,rows);
+            code="200";
             msg="信息获取成功";
         }
         catch(Exception e)
@@ -214,6 +224,7 @@
             e.printStackTrace();
             msg="查询失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
 
@@ -231,18 +242,22 @@
                                                               @FormParam("statisticType") String statisticType) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgConstructionStiatistic> pgConstructionStiatisticList=new ArrayList<>();
         try {
             pgConstructionStiatisticList = pgConstructionManager.getConstructionByTimeAndStatus(startTime, endTime, statisticType);
             if(pgConstructionStiatisticList==null)
                 msg="施工统计信息获取失败";
-            else
-                msg="施工统计信息获取成功";
+            else {
+                code="200";
+                msg = "施工统计信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "施工统计信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgConstructionStiatisticList);
         return resultMap;
@@ -257,6 +272,7 @@
     public Map<String, Object> getConstructionByType(@FormParam("statisticType") String statisticType){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
         List<PgConstructionStiatistic> pgConstructionStiatisticList=new ArrayList<>();
 
         try{
@@ -268,6 +284,7 @@
                 resultMap.put("result",null);
             }
             else {
+                code="200";
                 msg = "统计信息获取成功";
                 resultMap.put("result", pgConstructionStiatisticList);
             }
@@ -278,6 +295,7 @@
             msg="统计失败";
             resultMap.put("result",null);
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         return resultMap;
     }
@@ -291,9 +309,11 @@
     public Map<String, Object> getConstructionToday() throws Exception{
         Map<String,Object> resultMap=new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgConstructionDto> pgConstructionDtoList=new ArrayList<PgConstructionDto>();
         try {
             pgConstructionDtoList = pgConstructionManager.getConstructionToday();
+            code="200";
             msg = "当天施工信息获取成功";
         }
         catch(Exception e)
@@ -301,7 +321,7 @@
             e.printStackTrace();
             msg="获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
         return resultMap;
@@ -316,6 +336,7 @@
     public Map<String, Object> getConstructionDev(@FormParam("id") String id) throws Exception{
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
         List<PgDeviceDto> pgDeviceDtoList =new ArrayList<>();
         try{
@@ -325,14 +346,17 @@
 
             if(pgDeviceDtoList==null)
                 msg="信息获取失败";
-            else
-                msg="信息获取成功";
+            else {
+                code="200";
+                msg = "信息获取成功";
+            }
         }
         catch(Exception e)
         {
             e.printStackTrace();
-            msg="设备信息获取成功";
+            msg="信息获取是被";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgDeviceDtoList);
 
@@ -346,17 +370,21 @@
     @Path("getConstruction")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getConstruction() throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
-        List<PgConstructionDto> pgConstructionDtoList=new ArrayList<PgConstructionDto>();
+        String code="0";
+
+        List<PgConstructionDto> pgConstructionDtoList=new ArrayList<>();
 
         try{
             pgConstructionDtoList=pgConstructionManager.getPgConstructionList();
             if(pgConstructionDtoList==null||pgConstructionDtoList.size()==0)
                 msg="不存在施工记录";
-            else
-                msg="施工信息获取成功";
+            else {
+                code = "200";
+                msg = "施工信息获取成功";
+            }
         }
         catch(Exception e)
         {
@@ -364,6 +392,7 @@
             msg="施工信息获取失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java
index fd3d53e..2019502 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java
@@ -39,12 +39,12 @@
         try {
             pgConstructionTypeDtoList = pgConstructionTypeManager.getAllConstructionTypeDto();
             if (pgConstructionTypeDtoList.size() == 0)
-                msg = "没有项目类型信息";
+                msg = "获取失败";
             else
-                msg = "项目类型获取成功";
+                msg = "获取成功";
         } catch (Exception e) {
             e.printStackTrace();
-            msg = "项目类型信息获取失败";
+            msg = "获取失败";
         }
         resultMap.put("msg", msg);
         resultMap.put("result", pgConstructionTypeDtoList);
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
index 90d001c..037a399 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
@@ -51,6 +51,7 @@
 
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if (StringUtils.isBlank(construct_doc)||StringUtils.isBlank(doc_name))
@@ -65,6 +66,7 @@
             pgCsDocument.setActive(1);
             pgCsDocumentManager.save(pgCsDocument);
 
+            code="200";
             result = "true";
             msg = "保存成功";
 
@@ -74,6 +76,7 @@
             ex.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("success", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -90,6 +93,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             PgCsDocument pgCsDocument = pgCsDocumentManager.get(Long.valueOf(id));
@@ -103,6 +107,7 @@
 
                 pgCsDocumentManager.save(pgCsDocument);
 
+                code="200";
                 result = "true";
                 msg = "编辑成功";
             }
@@ -112,6 +117,7 @@
             msg = "编辑失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -125,9 +131,9 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
         String result="";
+        String code="0";
 
         try{
-
             PgCsDocument pgCsDocument = pgCsDocumentManager.get(Long.valueOf(id));
             if(pgCsDocument==null)
             {
@@ -137,6 +143,7 @@
             else{
                 pgCsDocument.setActive(0);
                 pgCsDocumentManager.save(pgCsDocument);
+                code="200";
                 result="true";
                 msg="删除成功";
             }
@@ -147,7 +154,7 @@
             msg="预案删除失败";
             result="false";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -168,18 +175,21 @@
 
         String msg="";
         String result="";
+        String code="0";
 
         try {
             pgCsDocumentDtoList = pgCsDocumentManager.getAllDocData(cs_name);
-            if (pgCsDocumentDtoList != null)
+            if (pgCsDocumentDtoList != null) {
+                code="200";
                 msg = "获取数据成功";
+            }
             else
                 msg = "没有满足条件的数据";
         }catch (Exception e){
             e.printStackTrace();
             msg = "获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgCsDocumentDtoList);
         return resultMap;
@@ -192,20 +202,22 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
 
         String msg = "";
+        String code="0";
         ResponseEntity<byte[]> path = null;
         try {
             PgCsDocument pgCsDocument = pgCsDocumentManager.get(Long.valueOf(id));
             path = pgCsDocumentManager.downloadFile(pgCsDocument);
             if (path == null)
                 msg = "不存在该文档";
-            else
+            else {
+                code = "200";
                 msg = "下载成功";
-
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "下载失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", path.getBody());
         resultMap.put("msg", msg);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
index 94c5c84..ffc8b95 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
@@ -41,22 +41,24 @@
     public Map<String, Object> getPgDeviceByDevType(@FormParam("devType") String devType) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
         try {
-            pgDeviceDtoList = pgDeviceManager.getDeviceByDevTypee(devType);
+            pgDeviceDtoList = pgDeviceManager.getDeviceByDevType(devType);
             if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0){
                 msg="不存在满足要求的数据";
-                resultMap.put("result",null);
             }
             else{
-                resultMap.put("result", pgDeviceDtoList);
+                code="200";
                 msg = "获取成功";
             }
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", pgDeviceDtoList);
         return resultMap;
     }
 
@@ -69,25 +71,26 @@
     public Map<String, Object> getPgDeviceByAssetCode(@FormParam("assetCode") String assetCode) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         PgDeviceDto pgDeviceDto=null;
         try {
             PgDevice pgDevice = pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
             {
                 msg="不存在设备信息";
-                resultMap.put("result",null);
             }
             else {
                 pgDeviceDto = new PgDeviceDto(pgDevice);
                 msg = "获取成功";
-                resultMap.put("result", pgDeviceDto);
+                code="200";
             }
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", pgDeviceDto);
         return resultMap;
     }
 
@@ -102,27 +105,61 @@
                                              @FormParam("devType") String devType)throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
         try {
             pgDeviceDtoList = pgDeviceManager.getAllDevice(road,partition,devType);
             if(pgDeviceDtoList.size()==0) {
                 msg = "没有找到设备信息";
-                resultMap.put("result",null);
             }
             else {
                 msg = "设备信息获取成功";
-                resultMap.put("result", pgDeviceDtoList);
+                code="200";
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result", pgDeviceDtoList);
         return resultMap;
     }
 
     /**
+     * 显示设备列表
+     */
+    @POST
+    @Path("getPgDev")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String, Object> getPgDev(@FormParam("road") String road,
+                                             @FormParam("partition") String partition,
+                                             @FormParam("devType") String devType)throws Exception {
+        Map<String, Object> resultMap = new HashMap<>();
+        String msg="";
+        String code="0";
+        List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
+        try {
+            pgDeviceDtoList = pgDeviceManager.getAllDev(road,partition,devType);
+            if(pgDeviceDtoList.size()==0) {
+                msg = "没有找到设备信息";
+            }
+            else {
+                code="200";
+                msg = "设备信息获取成功";
+            }
+        }catch(Exception e){
+            e.printStackTrace();
+            msg="设备信息获取失败";
+        }
+        resultMap.put("code",code);
+        resultMap.put("msg",msg);
+        resultMap.put("result", pgDeviceDtoList);
+        return resultMap;
+    }
+
+
+    /**
      * 新增设备
      */
     @POST
@@ -145,6 +182,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if (pgDeviceManager.getDeviceByAssetCode(assetCode)!=null) {
@@ -169,6 +207,7 @@
 
                 pgDeviceManager.save(pgDevice);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
 
@@ -177,10 +216,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -208,14 +246,9 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
-            /*
-            if (pgDeviceManager.getDeviceByAssetCode(assetCode)!=null) {
-                result = "false";
-                msg = "已存在同名设备";
-            } else {
-            */
             PgDevice pgDevice = pgDeviceManager.get(Long.valueOf(id));
             pgDevice.setPipeGallery(pipeGallery);
             pgDevice.setPartition(partition);
@@ -233,14 +266,14 @@
 
             pgDeviceManager.save(pgDevice);
             result = "true";
+            code="200";
             msg = "编辑成功";
-            //}
         } catch (Exception e) {
             result = "false";
             msg = "编辑失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("result",result);
         resultMap.put("msg",msg);
         return resultMap;
@@ -256,7 +289,8 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
-        String result="false";
+        String result="";
+        String code="0";
 
         try {
             PgDevice pgDevice=pgDeviceManager.get(Long.valueOf(id));
@@ -268,6 +302,7 @@
             {
                 pgDevice.setActive(0);
                 pgDeviceManager.save(pgDevice);
+                code="200";
                 msg="设备删除成功";
                 result="true";
             }
@@ -276,6 +311,7 @@
             msg="设备删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -291,18 +327,18 @@
     {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         PgDeviceDto pgDeviceDto=null;
 
         try{
             PgDevice pgDevice=pgDeviceManager.getDeviceBydevCode(devCode);
             if(pgDevice==null) {
                 msg = "设备信息获取失败";
-                resultMap.put("result",null);
             }
             else{
                 pgDeviceDto = new PgDeviceDto(pgDevice);
                 msg = "设备信息获取成功";
-                resultMap.put("result",pgDeviceDto);
+                code="200";
             }
         }
         catch(Exception ex)
@@ -310,8 +346,9 @@
             ex.printStackTrace();
             msg="设备状态获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgDeviceDto);
         return resultMap;
     }
 
@@ -324,17 +361,17 @@
     public Map<String,Object> getDeviceByPartition(@FormParam("partition") String partition) throws Exception{
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<PgDeviceDto>();
 
         try{
             pgDeviceDtoList=pgDeviceManager.getPgDeviceDtoListByPartition(partition);
             if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0) {
                 msg = "设备信息获取失败";
-                resultMap.put("result",null);
             }
             else {
+                code="200";
                 msg = "设备信息获取成功";
-                resultMap.put("result",pgDeviceDtoList);
             }
         }
         catch(Exception e)
@@ -342,8 +379,9 @@
             e.printStackTrace();
             msg="设备信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgDeviceDtoList);
         return resultMap;
     }
 
@@ -353,17 +391,16 @@
     public Map<String,Object> getDeviceByOldDAssetCodeCode(@FormParam("assetCode") String assetCode) throws Exception{
         Map<String, Object> resultMap = new HashMap<>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
 
         try{
             pgDeviceDtoList=pgDeviceManager.getDeviceByOldDAssetCodeCode(assetCode);
-            if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0) {
-                msg = "设备信息获取失败";;
-                resultMap.put("result",null);
-            }
+            if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0)
+                msg = "设备信息获取失败";
             else {
                 msg = "设备信息获取成功";
-                resultMap.put("result",pgDeviceDtoList);
+                code="200";
             }
         }
         catch(Exception e)
@@ -372,8 +409,9 @@
             msg="设备信息获取失败";
             resultMap.put("result",null);
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgDeviceDtoList);
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java
index 421d249..f6f167d 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java
@@ -38,17 +38,21 @@
     public Map<String, Object> getDeviceTpeyList()throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgDeviceTypeDto> pgDeviceTypeDtoList=new ArrayList<PgDeviceTypeDto>();
         try {
             pgDeviceTypeDtoList = pgDeviceTypeManager.getAllDeviceType();
             if(pgDeviceTypeDtoList.size()==0)
                 msg="没有找到设备类型信息";
-            else
-                msg="设备类型信息获取成功";
+            else {
+                code="200";
+                msg = "设备类型信息获取成功";
+            }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备类型信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgDeviceTypeDtoList);
         return resultMap;
@@ -66,6 +70,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if (pgDeviceTypeManager.getDeviceTypeByDeType(devType)!=null) {
@@ -79,6 +84,7 @@
 
                 pgDeviceTypeManager.save(pgDeviceType);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
 
@@ -87,10 +93,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
index c276fb3..c789960 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
@@ -44,6 +44,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 
         try {
@@ -62,6 +63,7 @@
                 pgEquipment.setActive(1);
 
                 pgEquipmentManager.save(pgEquipment);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -70,9 +72,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -89,9 +91,10 @@
                                             @FormParam("ownerUnit") String ownerUnit,
                                             @FormParam("enterDate") String enterDate,
                                             @FormParam("curUser") String curUser) {
-        HashMap<String, Object> resultMap = new HashMap<String, Object>();
+        HashMap<String, Object> resultMap = new HashMap<>();
         String msg = "";
         String result = "";
+        String code="0";
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 
         try {
@@ -111,6 +114,7 @@
                 pgEquipment.setEnterDate(sdf.parse(enterDate));
 
                 pgEquipmentManager.save(pgEquipment);
+                code="200";
                 msg="编辑成功";
                 result="true";
             }
@@ -119,9 +123,9 @@
             result = "false";
             msg = "编辑失败";
         }
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -134,16 +138,19 @@
     public Map<String, Object> getEquipment(@FormParam("eqName") String eqName,
                                             @FormParam("eqCode") String eqCode,
                                             @FormParam("eqType") String eqType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        List<PgEquipmentDto> pgEquipmentDtoList=new ArrayList<PgEquipmentDto>();
+        String code="0";
+        List<PgEquipmentDto> pgEquipmentDtoList=new ArrayList<>();
 
         try{
             pgEquipmentDtoList=pgEquipmentManager.getEquipmentDtiList(eqName,eqCode,eqType);
             if(pgEquipmentDtoList==null||pgEquipmentDtoList.size()==0)
                 msg="不存在工器具记录";
-            else
-                msg="维获取成功";
+            else {
+                code = "200";
+                msg = "维获取成功";
+            }
         }
         catch(Exception e)
         {
@@ -166,6 +173,7 @@
         HashMap<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
         String result = "";
+        String code="";
 
         try {
             PgEquipment pgEquipment=pgEquipmentManager.get(Long.valueOf(id));
@@ -178,6 +186,7 @@
             {
                 pgEquipment.setActive(0);
                 pgEquipmentManager.save(pgEquipment);
+                code="200";
                 msg="删除成功";
                 result="true";
             }
@@ -186,6 +195,7 @@
             msg="设备信息获取失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -201,16 +211,19 @@
             throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=new ArrayList<PgDeviceTypeStatisticDto>();
 
         try {
             pgDeviceTypeStatisticDtoList=pgEquipmentManager.getDeviceStatisticByDevType(eqType);
 
+            code="200";
             msg = "获取成功";
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceTypeStatisticDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
index 05a9709..a90fd6c 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
@@ -4,9 +4,9 @@
 import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
 import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
 import com.casic.PgInterface.intelPlan.manager.PgPileAcuManager;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import com.casic.PgInterface.test.PlanData;
 import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.ModelAttribute;
 
 import javax.annotation.Resource;
 import javax.ws.rs.FormParam;
@@ -32,23 +32,25 @@
     public Map<String,Object> getPlanResult(@FormParam("planParamStr") String planParamStr){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
-        //List<PgPlanTask> pgPlanTaskList=pgPlanParams.getPgPlanTaskList();
         List<PgPlanTask> pgPlanTaskList=new PgPlanParams().getPgPlanParamsByString(planParamStr);
         List<PgPlanResultRe> pgPlanResultReList=new ArrayList<>();
 
-        try{
-                pgPlanResultReList=pgPileAcuManager.getPgPlanResultList(pgPlanTaskList);
-                if(pgPlanResultReList==null)
-                    msg="管线智能规划出错";
-                else
-                    msg="管线智能规划完成";
+        try {
+            pgPlanResultReList = pgPileAcuManager.getPgPlanResultList(pgPlanTaskList);
+            if (pgPlanResultReList == null)
+                msg = "管线智能规划出错";
+            else {
+                code="200";
+                msg = "管线智能规划完成";
+            }
         }
         catch(Exception ex){
             msg="智能规划出错";
             ex.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgPlanResultReList);
 
@@ -80,4 +82,30 @@
         return resultMap;
     }
 
+    @POST
+    @Path("getPlanTask")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getACUTask(@FormParam("pileAcuList") String pileAcuList){
+
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        String code="0";
+        List<PgAcuTask> pgAcuTaskList=new ArrayList<>();
+
+        try{
+            pgAcuTaskList=pgPileAcuManager.getACUTask(pileAcuList);
+            code="200";
+            msg="任务获取成功";
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            msg="任务获取失败";
+        }
+        resultMap.put("code",code);
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgAcuTaskList);
+
+        return resultMap;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
index ff85c61..66eec76 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
@@ -55,13 +55,13 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         try {
             PgInPgPerson pgInPgPerson = null;//pgInPgPersonManager.getPersonByUserName(userName);
             int iHostName = pgTagMacManager.getCount("select count(1) from PGTagMac where hostname = ?",assetCode);
-//            int iTagMac = pgTagMacManager.getCount("select count(1) from PGTagMac where tagmac = ?",assetCode.toUpperCase());
             if (0==iHostName)
             {
                 result = "false";
@@ -92,9 +92,8 @@
 
                 pgInPgStatusManager.save(pgInPgStatus);
 
-//                String syResult=pgInPgPersonManager.synchorizedInPgInfo(assetCode,userCode,userName,personType);
+                code="200";
                 result = "true";
-//                msg = "人员注册保存成功"+syResult;
                 msg = "人员注册保存成功";
             }
             else {
@@ -106,6 +105,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -120,6 +120,7 @@
     public Map<String, Object> getInPgPerson() throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<>();
         try {
@@ -127,11 +128,15 @@
             if (pgInPgInfoDtoList == null || pgInPgInfoDtoList.size() == 0)
                 msg = "没有找到入廊人员信息";
             else
+            {
+                code="200";
                 msg = "入廊人员信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "入廊人员信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
         return resultMap;
@@ -146,18 +151,22 @@
     public Map<String, Object> getInPgPersonInPg() throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
 
-        List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<PgInPgInfoDto>();
+        List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<>();
         try {
             pgInPgInfoDtoList = pgInPgPersonManager.getPgInPersonList(1);
             if (pgInPgInfoDtoList == null || pgInPgInfoDtoList.size() == 0)
                 msg = "没有找到入廊人员信息";
-            else
+            else {
+                code="200";
                 msg = "入廊人员信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "入廊人员信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
         return resultMap;
@@ -172,6 +181,7 @@
     public Map<String, Object> getInPgPersonByName(@FormParam("userName") String userName) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
 
         PgInPgPerson pgInPgPerson = null;
         PgInPgPersonDto pgInPgPersonDto=null;
@@ -184,12 +194,13 @@
                 pgInPgPersonDto=new PgInPgPersonDto(pgInPgPerson);
                 pgInPgPersonDtoList.add(pgInPgPersonDto);
                 msg = "人员信息获取成功";
+                code="200";
             }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "人员信息获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgPersonDtoList);
         return resultMap;
@@ -206,6 +217,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             PgInPgPerson pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName);
@@ -221,6 +233,7 @@
                     pgInPgPersonManager.save(pgInPgPerson);
                     result = "true";
                     msg = "编辑成功";
+                    code="200";
                 }
             }
         } catch (Exception e) {
@@ -228,9 +241,9 @@
             msg = "编辑失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -244,10 +257,12 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         int inPgNum=0;
         String msg = "";
+        String code="0";
 
         try{
             inPgNum=pgInPgStatusManager.getInPgNum();
 
+            code="200";
             msg="人员入廊次数获取成功";
         }
         catch(Exception e)
@@ -255,6 +270,7 @@
             e.printStackTrace();
             msg="人员入廊次数获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",inPgNum);
 
@@ -272,18 +288,22 @@
                                                    @FormParam("statisticType") String statisticType) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
 
         List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<PgInPgInfoDto>();
         try {
             pgInPgInfoDtoList = pgInPgPersonManager.getPgInPersonListByTime(startTime, endTime, statisticType);
             if(pgInPgInfoDtoList==null)
                 msg="入廊人员统计信息获取失败";
-            else
-                msg="入廊人员统计信息获取成功";
+            else {
+                code="200";
+                msg = "入廊人员统计信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "入廊人员统计信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
         return resultMap;
@@ -296,6 +316,7 @@
 
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
 
         try {
@@ -304,8 +325,10 @@
                 pgDeviceDtoList=pgDeviceManager.getPgCameraListByPosition("",apCodeStr);
                 if(pgDeviceDtoList==null)
                     msg="不存在关联摄像机";
-                else
-                    msg="关联摄像机获取成功";
+                else {
+                    code="200";
+                    msg = "关联摄像机获取成功";
+                }
             } else {
                 msg="请输入Ap编号";
             }
@@ -315,6 +338,7 @@
             msg="关联摄像机获取成功";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgDeviceDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java
index 507b3fe..b43f077 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java
@@ -34,6 +34,7 @@
 
         String result="";
         String msg="";
+        String code="";
         try{
             PgInPgStatus pgInPgStatus=new PgInPgStatus();
 
@@ -44,6 +45,7 @@
             pgInPgStatusManager.save(pgInPgStatus);
             msg="入廊时间提交成功";
             result="true";
+            code="200";
         }
         catch (Exception e){
             e.printStackTrace();
@@ -51,6 +53,7 @@
             result="false";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -66,6 +69,7 @@
 
         String result="";
         String msg="";
+        String code="0";
         try{
             PgInPgPerson pgInPgPerson=pgInPgPersonManager.getPgInPgPersonByAssetCode(assetCode);
 
@@ -79,6 +83,7 @@
             pgInPgStatusManager.save(pgInPgStatus);
 
             msg="出廊时间提交成功";
+            code="200";
             result="true";
         }
         catch (Exception e){
@@ -87,6 +92,7 @@
             result="false";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 25ded8a..283d7ab 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,20 +7,56 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" 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/construction/manager/PgCsDocumentManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/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/manager/PgAlarmManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/~$说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/~$说明20191207.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.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$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/接口说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明20191207.docx" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
@@ -51,7 +87,7 @@
         <counts>
           <entry key="class" value="4" />
           <entry key="iml" value="2" />
-          <entry key="java" value="707" />
+          <entry key="java" value="820" />
           <entry key="properties" value="14" />
           <entry key="xml" value="7" />
         </counts>
@@ -60,7 +96,7 @@
         <counts>
           <entry key="CLASS" value="4" />
           <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="707" />
+          <entry key="JAVA" value="820" />
           <entry key="Properties" value="14" />
           <entry key="XML" value="7" />
         </counts>
@@ -68,32 +104,32 @@
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
           <entry key="dummy" value="38" />
-          <entry key="java" value="30161" />
+          <entry key="java" value="40859" />
           <entry key="properties" value="100" />
-          <entry key="txt" value="176" />
+          <entry key="txt" value="186" />
           <entry key="xml" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="30161" />
-          <entry key="PLAIN_TEXT" value="214" />
+          <entry key="JAVA" value="40859" />
+          <entry key="PLAIN_TEXT" value="224" />
           <entry key="Properties" value="100" />
           <entry key="XML" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="48" />
+          <entry key="project.closed" value="51" />
           <entry key="project.open.time.1" value="5" />
           <entry key="project.open.time.12" value="2" />
           <entry key="project.open.time.13" value="1" />
           <entry key="project.open.time.15" value="1" />
           <entry key="project.open.time.16" value="1" />
           <entry key="project.open.time.17" value="1" />
-          <entry key="project.open.time.2" value="1" />
+          <entry key="project.open.time.2" value="2" />
           <entry key="project.open.time.20" value="1" />
-          <entry key="project.open.time.23" value="1" />
+          <entry key="project.open.time.23" value="2" />
           <entry key="project.open.time.24" value="2" />
           <entry key="project.open.time.251" value="1" />
           <entry key="project.open.time.27" value="2" />
@@ -106,8 +142,8 @@
           <entry key="project.open.time.36" value="1" />
           <entry key="project.open.time.37" value="1" />
           <entry key="project.open.time.39" value="2" />
-          <entry key="project.open.time.4" value="2" />
-          <entry key="project.open.time.40" value="1" />
+          <entry key="project.open.time.4" value="3" />
+          <entry key="project.open.time.40" value="2" />
           <entry key="project.open.time.41" value="2" />
           <entry key="project.open.time.42" value="2" />
           <entry key="project.open.time.43" value="2" />
@@ -122,23 +158,25 @@
           <entry key="project.open.time.6" value="3" />
           <entry key="project.open.time.63" value="2" />
           <entry key="project.open.time.64" value="1" />
+          <entry key="project.open.time.66" value="1" />
           <entry key="project.open.time.71" value="2" />
+          <entry key="project.open.time.74" value="1" />
           <entry key="project.open.time.76" value="1" />
           <entry key="project.open.time.8" value="2" />
           <entry key="project.open.time.9" value="1" />
           <entry key="project.open.time.97" value="1" />
-          <entry key="project.opened" value="78" />
+          <entry key="project.opened" value="84" />
         </counts>
       </usages-collector>
     </session>
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+            <state relative-caret-position="396">
+              <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
               <folding>
                 <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
                 <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -147,73 +185,6 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <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="99">
-              <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-              <folding>
-                <element signature="imports" expanded="true" />
-                <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-1170">
-              <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state>
-              <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
-              <folding>
-                <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-                <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="true">
-        <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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-              <folding>
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-                <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>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <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="352">
-              <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -225,18 +196,9 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>inCriteria</find>
-      <find>getPgPlanResulList</find>
-      <find>getPileAcuListByPileAcuStr</find>
-      <find>distinct</find>
-      <find>order</find>
-      <find>canPlanLine</find>
-      <find>isExistLine</find>
-      <find>getPlanResult</find>
       <find>pgPipeLine</find>
       <find>getPipeLineBylineName</find>
       <find>StringU</find>
-      <find>getAllAlarm</find>
       <find>getAlarmList</find>
       <find>getPgInPersonListByDay</find>
       <find>getDayInPgStatistic</find>
@@ -254,7 +216,16 @@
       <find>getPgContructionByNameOrType</find>
       <find>&quot;&quot;,&quot;&quot;,</find>
       <find>getPgContructionDtoByNameOrType</find>
+      <find>addConstruction</find>
+      <find>getPgLineAcuHole</find>
+      <find>getPlanResult</find>
       <find>getConstruction</find>
+      <find>addPipeLine</find>
+      <find>未找到入廊数据</find>
+      <find>getCurrentHoleByAcu</find>
+      <find>getAllAlarm</find>
+      <find>getPgDeviceDtoListByPartition</find>
+      <find>getPgDeviceByDevType</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -263,57 +234,57 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlan.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileHoleManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/planData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/PlanData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
       </list>
     </option>
   </component>
@@ -359,7 +330,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -421,53 +391,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="dto" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="manager" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -479,29 +402,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="rs" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -516,6 +416,7 @@
         </subPane>
       </pane>
       <pane id="Scope" />
+      <pane id="PackagesPane" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -710,7 +611,13 @@
       <workItem from="1574902733573" duration="1829000" />
       <workItem from="1574998240004" duration="7016000" />
       <workItem from="1575247959683" duration="6997000" />
-      <workItem from="1575704345590" duration="40473000" />
+      <workItem from="1575704345590" duration="69381000" />
+      <workItem from="1575869479666" duration="721000" />
+      <workItem from="1575947104878" duration="6101000" />
+      <workItem from="1576128264436" duration="3347000" />
+      <workItem from="1576208571543" duration="22000" />
+      <workItem from="1576227513917" duration="862000" />
+      <workItem from="1576293721220" duration="18246000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -817,11 +724,18 @@
       <option name="project" value="LOCAL" />
       <updated>1575775489149</updated>
     </task>
-    <option name="localTasksCounter" value="16" />
+    <task id="LOCAL-00016" summary="整改施工信息">
+      <created>1575791780774</created>
+      <option name="number" value="00016" />
+      <option name="presentableId" value="LOCAL-00016" />
+      <option name="project" value="LOCAL" />
+      <updated>1575791780774</updated>
+    </task>
+    <option name="localTasksCounter" value="17" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="452131000" />
+    <option name="totallyTimeSpent" value="510338000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -834,9 +748,8 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
-    <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.24205749" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2647504" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -847,7 +760,7 @@
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.3295082" />
       <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.4819672" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.65737706" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.3295082" />
@@ -939,7 +852,8 @@
     <MESSAGE value="重新设计智能规划部分" />
     <MESSAGE value="完成智能规划对接" />
     <MESSAGE value="修改报警统计" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改报警统计" />
+    <MESSAGE value="整改施工信息" />
+    <option name="LAST_COMMIT_MESSAGE" value="整改施工信息" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -951,16 +865,10 @@
           <option name="timeStamp" value="3" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java</url>
-          <line>69</line>
+          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java</url>
+          <line>40</line>
           <properties />
-          <option name="timeStamp" value="21" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java</url>
-          <line>96</line>
-          <properties />
-          <option name="timeStamp" value="38" />
+          <option name="timeStamp" value="122" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
@@ -970,394 +878,452 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <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="2068">
-          <caret line="154" column="35" selection-start-line="154" selection-start-column="35" selection-end-line="154" selection-end-column="35" />
-        </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="3300">
-          <caret line="297" column="22" selection-start-line="297" selection-start-column="22" selection-end-line="297" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/StringUtils.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
-          <caret line="13" column="48" lean-forward="true" selection-start-line="13" selection-start-column="48" selection-end-line="13" selection-end-column="48" />
+          <caret line="11" column="5" selection-start-line="11" selection-start-column="5" selection-end-line="11" selection-end-column="5" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="78" lean-forward="true" selection-start-line="78" selection-end-line="78" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="616">
-          <caret line="41" column="1" selection-start-line="41" selection-start-column="1" selection-end-line="41" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="110">
-          <caret line="12" column="23" selection-start-line="12" selection-start-column="23" selection-end-line="12" selection-end-column="23" />
+        <state relative-caret-position="516">
+          <caret line="114" column="12" selection-start-line="114" selection-start-column="12" selection-end-line="114" selection-end-column="12" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="164">
-          <caret line="56" lean-forward="true" selection-start-line="56" selection-end-line="56" />
+        <state relative-caret-position="418">
+          <caret line="33" column="44" selection-start-line="33" selection-start-column="44" selection-end-line="33" selection-end-column="44" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="258">
-          <caret line="27" column="12" lean-forward="true" selection-start-line="27" selection-start-column="12" selection-end-line="27" selection-end-column="12" />
+        <state relative-caret-position="132">
+          <caret line="11" column="20" lean-forward="true" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="20" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.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="-12">
-          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        <state relative-caret-position="516">
+          <caret line="142" column="54" selection-start-line="142" selection-start-column="54" selection-end-line="142" selection-end-column="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="858">
-          <caret line="55" column="27" lean-forward="true" selection-start-line="55" selection-start-column="27" selection-end-line="55" selection-end-column="27" />
+        <state relative-caret-position="66">
+          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="58">
+          <caret line="18" column="28" selection-start-line="18" selection-start-column="19" selection-end-line="18" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="305">
+          <caret line="24" column="31" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="714">
+          <caret line="58" column="5" lean-forward="true" selection-start-line="58" selection-start-column="5" selection-end-line="58" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="924">
+          <caret line="134" column="92" selection-start-line="134" selection-start-column="92" selection-end-line="134" selection-end-column="92" />
+          <folding>
+            <element signature="method#linkDevice#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkPartitionCamera#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkReservePlan#0;class#PgAlarmLinkRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1066">
+          <caret line="90" lean-forward="true" selection-start-line="90" selection-end-line="90" />
+          <folding>
+            <element signature="method#getTjResultByAlarmType#0;class#PgAlarmTjRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="946">
+          <caret line="148" column="11" lean-forward="true" selection-start-line="148" selection-start-column="11" selection-end-line="148" selection-end-column="11" />
+          <folding>
+            <element signature="method#getAlarmTypeList#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#addAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#editAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#deleteAlarmType#0;class#PgAlarmTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="208">
+          <caret line="46" column="23" lean-forward="true" selection-start-line="46" selection-start-column="23" selection-end-line="46" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="113" column="9" lean-forward="true" selection-start-line="113" selection-start-column="9" selection-end-line="113" selection-end-column="9" />
+          <folding>
+            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
+            <element signature="method#getNewestCh4InfoByDev#0;class#PgCh4Rs#0" />
+            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="145" column="6" lean-forward="true" selection-start-line="145" selection-start-column="6" selection-end-line="145" selection-end-column="6" />
+          <folding>
+            <element signature="method#addAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#editAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#deleteAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#getAuthorityList#0;class#PgAuthorityRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="58" column="1" lean-forward="true" selection-start-line="58" selection-start-column="1" selection-end-line="58" selection-end-column="1" />
+          <folding>
+            <element signature="method#getPgAssetPlanList#0;class#PgAssetPlanRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="370">
+          <caret line="371" column="66" selection-start-line="371" selection-start-column="66" selection-end-line="371" selection-end-column="66" />
+          <folding>
+            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#searchConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionDev#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="139" column="13" lean-forward="true" selection-start-line="139" selection-start-column="13" selection-end-line="139" selection-end-column="13" />
+          <folding>
+            <element signature="method#getCoInfoByDevAndDate#0;class#PgCoRs#0" />
+            <element signature="method#getNewestCoInfoByDev#0;class#PgCoRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="540">
+          <caret line="223" column="5" lean-forward="true" selection-start-line="223" selection-start-column="5" selection-end-line="223" selection-end-column="5" />
+          <folding>
+            <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="682">
+          <caret line="100" lean-forward="true" selection-start-line="100" selection-end-line="100" />
+          <folding>
+            <element signature="method#getDeviceTpeyList#0;class#PgDeviceTypeRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="377">
+          <caret line="225" column="35" selection-start-line="225" selection-start-column="35" selection-end-line="225" selection-end-column="35" />
+          <folding>
+            <element signature="method#addEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#addEquipment#1;class#PgEquipmentRs#0" />
+            <element signature="method#getEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#deleteEquipment#0;class#PgEquipmentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="406">
+          <caret line="109" lean-forward="true" selection-start-line="109" selection-end-line="109" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="154">
+          <caret line="28" column="19" selection-start-line="28" selection-start-column="19" selection-end-line="28" selection-end-column="19" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="748">
-          <caret line="49" column="5" lean-forward="true" selection-start-line="49" selection-start-column="5" selection-end-line="49" selection-end-column="5" />
+        <state relative-caret-position="296">
+          <caret line="161" column="35" selection-start-line="161" selection-start-column="35" selection-end-line="161" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="384">
+          <caret line="99" column="5" lean-forward="true" selection-start-line="99" selection-start-column="5" selection-end-line="99" selection-end-column="5" />
+        </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="362">
+          <caret line="340" column="35" selection-start-line="340" selection-start-column="35" selection-end-line="340" selection-end-column="35" />
+          <folding>
+            <element signature="method#addInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPersonInPg#0;class#PgInPgPersonRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-606">
+          <caret line="76" column="20" lean-forward="true" selection-start-line="76" selection-start-column="20" selection-end-line="76" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="65" column="35" selection-start-line="65" selection-start-column="35" selection-end-line="65" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="101" column="35" selection-start-line="101" selection-start-column="35" selection-end-line="101" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="84" column="35" selection-start-line="84" selection-start-column="35" selection-end-line="84" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="59" lean-forward="true" selection-start-line="59" selection-end-line="59" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="60" column="1" lean-forward="true" selection-start-line="60" selection-start-column="1" selection-end-line="60" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="145" column="35" selection-start-line="145" selection-start-column="35" selection-end-line="145" selection-end-column="35" />
+        </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="274">
+          <caret line="350" column="35" selection-start-line="350" selection-start-column="35" selection-end-line="350" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="121" column="39" selection-start-line="121" selection-start-column="39" selection-end-line="121" selection-end-column="39" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="28" column="8" lean-forward="true" selection-start-line="28" selection-start-column="8" selection-end-line="28" selection-end-column="8" />
+        <state relative-caret-position="340">
+          <caret line="103" selection-start-line="103" selection-end-line="103" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="226" column="35" selection-start-line="226" selection-start-column="35" selection-end-line="226" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="203" column="35" selection-start-line="203" selection-start-column="35" selection-end-line="203" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="241" column="35" selection-start-line="241" selection-start-column="35" selection-end-line="241" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="225" column="1" lean-forward="true" selection-start-line="225" selection-start-column="1" selection-end-line="225" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="176" column="5" lean-forward="true" selection-start-line="176" selection-start-column="5" selection-end-line="176" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="178" column="35" lean-forward="true" selection-start-line="178" selection-start-column="35" selection-end-line="178" selection-end-column="35" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="516">
-          <caret line="94" column="53" selection-start-line="94" selection-start-column="53" selection-end-line="94" selection-end-column="53" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="814">
-          <caret line="52" column="9" lean-forward="true" selection-start-line="52" selection-start-column="9" selection-end-line="52" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="182">
-          <caret line="58" column="12" lean-forward="true" selection-start-line="58" selection-start-column="12" selection-end-line="58" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="34" lean-forward="true" selection-start-line="34" selection-end-line="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="32" lean-forward="true" selection-start-line="32" selection-end-line="32" />
-          <folding>
-            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
-            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="185">
-          <caret line="63" column="13" selection-start-line="63" selection-start-column="13" selection-end-line="63" selection-end-column="13" />
-          <folding>
-            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
-            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
-            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="e#6319#6324#0" />
-            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
-          </folding>
+          <caret line="240" lean-forward="true" selection-start-line="240" selection-end-line="240" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
-          <caret line="58" column="28" lean-forward="true" selection-start-line="58" selection-start-column="28" selection-end-line="58" selection-end-column="28" />
-          <folding>
-            <element signature="method#addTempHumData#0;class#PgTempHumRs#0" />
-          </folding>
+        <state relative-caret-position="340">
+          <caret line="148" column="34" selection-start-line="148" selection-start-column="34" selection-end-line="148" selection-end-column="34" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
+        <state relative-caret-position="458">
+          <caret line="99" column="35" selection-start-line="99" selection-start-column="35" selection-end-line="99" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+        <state relative-caret-position="384">
+          <caret line="145" column="32" lean-forward="true" selection-start-line="145" selection-start-column="32" selection-end-line="145" selection-end-column="32" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="414">
-          <caret line="22" column="46" lean-forward="true" selection-start-line="22" selection-start-column="46" selection-end-line="22" selection-end-column="46" />
-        </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="396">
-          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" column="83" selection-start-line="11" selection-start-column="83" selection-end-line="11" selection-end-column="83" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="26">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
-          <folding>
-            <element signature="method#getPgInPgStatusByPerson#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNumByName#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNum#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPersonListByDay#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPgStatusByPgInPgPerson#0;class#PgInPgStatusManager#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="44">
-          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-12">
-          <caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="87" lean-forward="true" selection-start-line="87" selection-end-line="87" />
-          <folding>
-            <element signature="method#getConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#addConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#deleteConstructionType#0;class#PgConstructionTypeRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
-          <folding>
-            <element signature="method#getConstructionTypeByType#0;class#PgConstructionTypeManager#0" />
-            <element signature="method#getAllConstructionTypeDto#0;class#PgConstructionTypeManager#0" />
-          </folding>
-        </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="145">
-          <caret line="258" column="9" lean-forward="true" selection-start-line="258" selection-start-column="9" selection-end-line="258" selection-end-column="9" />
-          <folding>
-            <element signature="method#getMonthInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayInPgStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgOverViewRs#0" />
-            <element signature="method#getAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getMonthAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayAlarmStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgOverViewRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="103">
-          <caret line="105" column="50" lean-forward="true" selection-start-line="105" selection-start-column="50" selection-end-line="105" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateBasicDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="99">
-          <caret line="125" selection-start-line="125" selection-end-line="125" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="190">
-          <caret line="24" column="35" lean-forward="true" selection-start-line="24" selection-start-column="35" selection-end-line="24" selection-end-column="35" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="436">
-          <caret line="24" lean-forward="true" selection-start-line="24" selection-end-line="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" lean-forward="true" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="300">
-          <caret line="34" column="31" lean-forward="true" selection-start-line="34" selection-start-column="31" selection-end-line="34" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="42" column="13" lean-forward="true" selection-start-line="42" selection-start-column="13" selection-end-line="42" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="120" column="72" lean-forward="true" selection-start-line="120" selection-start-column="72" selection-end-line="120" selection-end-column="72" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="293">
-          <caret line="58" column="73" lean-forward="true" selection-start-line="58" selection-start-column="73" selection-end-line="58" selection-end-column="73" />
-          <folding>
-            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
-            <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
-          </folding>
-        </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="307">
-          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
+        <state relative-caret-position="758">
+          <caret line="130" column="5" lean-forward="true" selection-start-line="130" selection-start-column="5" selection-end-line="130" selection-end-column="5" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1170">
-          <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
+        <state relative-caret-position="494">
+          <caret line="86" column="62" lean-forward="true" selection-start-line="86" selection-start-column="62" selection-end-line="86" selection-end-column="62" />
           <folding>
-            <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-            <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+            <element signature="method#getAllDevice#0;class#PgDeviceManager#0" />
+            <element signature="method#getAllDev#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="195" column="28" lean-forward="true" selection-start-line="195" selection-start-column="28" selection-end-line="195" selection-end-column="28" />
+        <state relative-caret-position="166">
+          <caret line="174" column="13" lean-forward="true" selection-start-line="174" selection-start-column="13" selection-end-line="174" selection-end-column="13" />
           <folding>
-            <element signature="method#getAlarmByTypeAndTime#0;class#PgAlarmManager#0" />
-            <element signature="method#getAlarmNum#0;class#PgAlarmManager#0" />
             <element signature="method#getDayAlarmStatistic#0;class#PgAlarmManager#0" />
+            <element signature="method#getAlarmList#0;class#PgAlarmManager#0" />
             <element signature="method#createDTO#0;class#PgAlarmManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="364">
+          <caret line="46" column="56" lean-forward="true" selection-start-line="46" selection-start-column="56" selection-end-line="46" selection-end-column="56" />
+          <folding>
+            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
+            <element signature="method#getPgDev#0;class#PgDeviceRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
+            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+        <state relative-caret-position="396">
+          <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
           <folding>
             <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
             <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -1365,52 +1331,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="239">
-          <caret line="21" column="33" lean-forward="true" selection-start-line="21" selection-start-column="33" selection-end-line="21" selection-end-column="33" />
-        </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="352">
-          <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-        </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="99">
-          <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-          </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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-          <folding>
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-            <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>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
index c436c93..e913155 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
@@ -132,7 +132,10 @@
             this.setAlarmType("");
         else
             this.setAlarmType(pgAlarm.getAlarmTypeId().getAlarmType());
-        this.setAlarmValue(pgAlarm.getAlarmValue());
+        if(pgAlarm.getAlarmValue()==null)
+            this.setAlarmValue("");
+        else
+            this.setAlarmValue(pgAlarm.getAlarmValue());
         if (pgAlarm.getAlarmDate() != null)
             this.setAlarmDate(sdf.format(pgAlarm.getAlarmDate()));
         else
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
index a43965c..565cb41 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -159,11 +159,21 @@
     }
 
     //获取历史报警消息列表
-    public List<PgAlarmDto> getAllAlarm(String alarmType,String startDay,String endDay,String isNew,int page,int rows) {
-        try {
+    public  Map<String, Object> getAllAlarm(String alarmType,String partition,String startDay,String endDay,String isNew,int page,int rows) {
 
+        Map<String, Object> resultMap = new HashMap<>();
+        String msg="";
+
+        try {
             Criteria criteria = createCriteria(PgAlarm.class);
 
+            if (StringUtils.isNotBlank(partition)) {
+                DetachedCriteria inCriteria = DetachedCriteria.forClass(PgDevice.class);
+                inCriteria.add(Restrictions.eq("partition", partition));
+                inCriteria.setProjection(Property.forName("id"));
+                criteria.add(Property.forName("alarmDevId").in(inCriteria));
+            }
+
             if (StringUtils.isNotBlank(alarmType)&&!alarmType.contains("全部")&&pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
                 criteria.add(Restrictions.eq("alarmTypeId", pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)));
 
@@ -190,8 +200,16 @@
             for (PgAlarm pgAlarm : pgAlarmList) {
                 pgAlarmDtoList.add(new PgAlarmDto(pgAlarm));
             }
-
-            return pgAlarmDtoList;
+            if(pgAlarmDtoList==null||pgAlarmDtoList.size()==0) {
+                resultMap.put("msg", "没有报警信息");
+                resultMap.put("code","0");
+            }else {
+                resultMap.put("code","200");
+                resultMap.put("msg", "报警信息获取成功");
+            }
+            resultMap.put("count",pg.getTotalCount());
+            resultMap.put("result",pgAlarmDtoList);
+            return resultMap;
         }
         catch(Exception ex){
             ex.printStackTrace();
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index 7547560..654f49e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -24,11 +24,11 @@
 
         Criteria criteria = createCriteria(PgDevice.class);
 
-        if(road!=null)
+        if(StringUtils.isNotBlank(road))
             criteria.add(Restrictions.eq("road",road));
-        if(partition!=null)
+        if(StringUtils.isNotBlank(partition))
             criteria.add(Restrictions.eq("partition",partition));
-        if(devType!=null)
+        if(StringUtils.isNotBlank(devType))
             criteria.add(Restrictions.eq("devType",devType));
 
         criteria.add(Restrictions.eq("active", 1));
@@ -43,6 +43,29 @@
         return pgDeviceDtoList;
     }
 
+    public List<PgDeviceDto> getAllDev(String road,String partition,String devType) {
+
+        Criteria criteria = createCriteria(PgDevice.class);
+
+        if(StringUtils.isNotBlank(road))
+            criteria.add(Restrictions.eq("road",road));
+        if(StringUtils.isNotBlank(partition))
+            criteria.add(Restrictions.eq("partition",partition));
+        if(StringUtils.isNotBlank(devType))
+            criteria.add(Restrictions.like("devType","%"+devType+"%"));
+
+        criteria.add(Restrictions.eq("active", 1));
+        criteria.addOrder(Order.desc("id"));
+        List<PgDevice> pgDeviceList = criteria.list();
+
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
+        for (PgDevice pgDevice : pgDeviceList) {
+            pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
+        }
+
+        return pgDeviceDtoList;
+    }
+
     //根据名字获取当前设备
     public PgDevice getDeviceByAssetCode(String assetCode) {
         Criteria criteria=createCriteria(PgDevice.class);
@@ -56,9 +79,9 @@
     }
 
     //根据类型获取设备列表
-    public List<PgDeviceDto> getDeviceByDevTypee(String devType) {
+    public List<PgDeviceDto> getDeviceByDevType(String devType) {
         Criteria criteria=createCriteria(PgDevice.class);
-        criteria.add(Restrictions.eq("devType",devType));
+        criteria.add(Restrictions.like("devType","%"+devType+"%"));
 
         List<PgDevice> pgDeviceList=criteria.list();
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
@@ -106,7 +129,7 @@
         criteria.add(Restrictions.eq("partition",partition));
 
         List<PgDevice> pgDeviceList=criteria.list();
-        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<PgDeviceDto>();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
 
         for (PgDevice pgDevice : pgDeviceList) {
             pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
index 3a3bccd..595730e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
@@ -1,10 +1,13 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.devTable.domain.PgAlarmType;
 import com.casic.PgInterface.devTable.domain.PgPartition;
 import com.casic.PgInterface.devTable.domain.PgRoad;
 import com.casic.PgInterface.devTable.domain.PipeGallery;
 import com.casic.PgInterface.devTable.dto.PgPartitionDto;
+import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
@@ -12,7 +15,9 @@
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Created by yxw on 2017/11/4.
@@ -21,7 +26,8 @@
 public class PgPartitionManager extends HibernateEntityDao<PgPartition> {
 
     @Resource
-    PgRoadManager pgRoadManager;
+    private PgRoadManager pgRoadManager;
+
 
     public PgPartition getPartitionByParName(String parName) {
         Criteria criteria = getSession().createCriteria(PgPartition.class);
@@ -99,4 +105,5 @@
         return pgPartitionDtoList;
     }
 
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
index f216360..a6928f1 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
@@ -5,6 +5,7 @@
 public class PgPlanResultRe {
 
     private String taskKey;
+    private List<String> pileAcuList;
     private List<PgPlanResult> pgPlanResultList;
 
     public String getTaskKey() {
@@ -15,6 +16,14 @@
         this.taskKey = taskKey;
     }
 
+    public List<String> getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(List<String> pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+
     public List<PgPlanResult> getPgPlanResultList() {
         return pgPlanResultList;
     }
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
index 71ea765..47eea07 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
@@ -54,9 +54,7 @@
 
         List<PgLineHole> pgLineHoleList=criteria.list();
         List<PgLineHoleDTO> pgLineHoleDTOList=new ArrayList<>();
-        if(pgLineHoleList==null||pgLineHoleList.size()==0)
-            return null;
-        else
+        if(pgLineHoleList!=null&&pgLineHoleList.size()!=0)
             pgLineHoleDTOList=PgLineHoleDTO.ConvertToDTOList(pgLineHoleList,pgPileAcuManager,pgRoadManager);
         return pgLineHoleDTOList;
     }
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
index 0fd9e1f..841a386 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
@@ -1,12 +1,15 @@
 package com.casic.PgInterface.intelPlan.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.devTable.domain.PgPartition;
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
 import com.casic.PgInterface.intelPlan.domain.PgLineHole;
 import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
 import com.casic.PgInterface.intelPlan.domain.PgSection;
 import com.casic.PgInterface.intelPlan.dto.PgPlanResult;
 import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
 import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -22,6 +25,9 @@
     @Resource
     private PgLineHoleManager pgLineHoleManager;
 
+    @Resource
+    private PgRoadManager pgRoadManager;
+
     public PgPileAcu getPgPileAcuByCode(String acuCode){
         List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
 
@@ -58,7 +64,9 @@
         for(PgPlanTask pgPlanTask:pgPlanTaskList){
             List<PgPlanResult> pgPlanResultList=getPgPlanResultByPlantask(pgPlanTask);
             PgPlanResultRe pgPlanResultRe=new PgPlanResultRe();
+
             pgPlanResultRe.setTaskKey(pgPlanTask.getTaskKey());
+            pgPlanResultRe.setPileAcuList(pgPlanTask.getPileAcuList());
             pgPlanResultRe.setPgPlanResultList(pgPlanResultList);
 
             pgPlanResultReList.add(pgPlanResultRe);
@@ -142,4 +150,57 @@
         return length;
     }
 
+    private PgPileAcu getPgPileAcuByAcuCode(String acuCode){
+        List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
+
+        if(pgPileAcuList==null||pgPileAcuList.size()==0)
+            return null;
+        else
+            return pgPileAcuList.get(0);
+    }
+
+    public List<PgAcuTask> getACUTask(String pileAcuList){
+        String[] acuArray=pileAcuList.split(",");
+        List<PgAcuTask> pgAcuTaskList=new ArrayList<>();
+
+        for(String acu:acuArray){
+            PgPileAcu pgPileAcu=this.getPgPileAcuByCode(acu);
+            String roadName=pgRoadManager.get(pgPileAcu.getRoadId()).getRoadName();
+
+            if(!containRoad(roadName,pgAcuTaskList))
+            {
+                PgAcuTask pgAcuTask=new PgAcuTask();
+                pgAcuTask.setRoadName(roadName);
+                pgAcuTask.setPileAcuList(acu);
+                pgAcuTaskList.add(pgAcuTask);
+            }
+            else{
+                PgAcuTask pgAcuTask=getIndexRoad(roadName,pgAcuTaskList);
+                if(pgAcuTask!=null)
+                    pgAcuTask.setPileAcuList(pgAcuTask.getPileAcuList()+","+acu);
+            }
+        }
+
+        return pgAcuTaskList;
+    }
+
+    private boolean containRoad(String roadName,List<PgAcuTask> pgAcuTaskList){
+        if(pgAcuTaskList==null||pgAcuTaskList.size()==0) return false;
+        for(PgAcuTask pgAcuTask:pgAcuTaskList){
+            if(pgAcuTask.getRoadName().equals(roadName))
+                return true;
+        }
+
+        return false;
+    }
+
+    private PgAcuTask getIndexRoad(String roadName, List<PgAcuTask> pgAcuTaskList){
+        for(PgAcuTask pgAcuTask:pgAcuTaskList){
+            if(pgAcuTask.getRoadName().equals(roadName))
+                return pgAcuTask;
+        }
+
+        return null;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java
new file mode 100644
index 0000000..323f7ef
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java
@@ -0,0 +1,25 @@
+package com.casic.PgInterface.reservePlan.dto;
+
+import java.util.List;
+
+public class PgAcuTask {
+
+    private String roadName;//道路
+    private String pileAcuList;//acu分区
+
+    public String getRoadName() {
+        return roadName;
+    }
+
+    public void setRoadName(String roadName) {
+        this.roadName = roadName;
+    }
+
+    public String getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(String pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
index c25e926..c7d7693 100644
--- a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
@@ -70,9 +70,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(Long.valueOf(inPgPersonId));
         PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("hostName",pgInPgPerson.getAssetCode());
-//        PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode());
-//        long maxId = pgTagPositionManager.getMaxId(pgTagMac.getTagMac());
-//        PGTagPosition pgTagPosition = pgTagPositionManager.get(maxId);
+
         PGTagPosition pgTagPosition = tagmacRun.GetTagStatus(pgTagMac);
         boolean bExist = false;
         bExist = pgTagPositionManager.findTagPosition(pgTagPosition.getPositionUpdatetime(),pgTagPosition.getHostId());
@@ -104,8 +102,7 @@
         PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(Long.valueOf(inPgPersonId));
         PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pgInPgPersonId",pgInPgPerson);
         System.out.println("time:"+pgInPgStatus.getInTime());
-//        PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pgInPgPersonId",inPgPersonId);
-//        PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode());
+
         PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("hostName",pgInPgPerson.getAssetCode());
 
         Map<Object,Object> mapPosition = new HashMap<>();
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
index 082ba5d..3eed00a 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
@@ -48,6 +48,7 @@
     public Map<String, Object> linkDevice(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         PgDeviceDto pgDeviceDto = null;
         try {
@@ -62,6 +63,7 @@
                     else {
                         pgDeviceDto = new PgDeviceDto(pgDevice);
                         msg = "报警关联设备获取成功";
+                        code="200";
                     }
                 }
             }
@@ -71,6 +73,7 @@
             e.printStackTrace();
             msg = "获取关联设备失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceDto);
 
@@ -86,6 +89,7 @@
     public Map<String, Object> linkPartitionCamera(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
         try {
@@ -106,6 +110,7 @@
 
                         pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(partition,position);
                         msg = "关联设备获取成功";
+                        code="200";
                     }
                 }
             }
@@ -115,6 +120,7 @@
             e.printStackTrace();
             msg = "分区设备关联失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceDtoList);
         return resultMap;
@@ -129,6 +135,7 @@
     public Map<String, Object> linkReservePlan(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgReservePlanDto> pgReservePlanDtoList=new ArrayList<>();
         try{
@@ -139,10 +146,12 @@
                 else {
                     pgReservePlanDtoList = pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
 
-                    if(pgReservePlanDtoList==null||pgReservePlanDtoList.size()==0)
-                        msg="不存在关联的报警预案";
-                    else
+                    if (pgReservePlanDtoList == null || pgReservePlanDtoList.size() == 0)
+                        msg = "不存在关联的报警预案";
+                    else {
                         msg = "关联预案获取成功";
+                        code="200";
+                    }
                 }
             }
             else
@@ -153,6 +162,7 @@
             e.printStackTrace();
             msg="预案关联失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgReservePlanDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
index 0ddbc4d..0ce886b 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
@@ -41,25 +41,19 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getAlarmList(@FormParam("alarmType") String alarmType,
                                             @FormParam("startDay") String startDay,
+                                            @FormParam("partition") String partition,
                                             @FormParam("endDay") String endDay,
                                             @FormParam("isNew") String isNew,
                                             @FormParam("page") int page,
                                             @FormParam("rows") int rows) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
         try {
-            pgAlarmDtoList = pgAlarmManager.getAllAlarm(alarmType,startDay,endDay,isNew,page,rows);
-            if (pgAlarmDtoList==null||pgAlarmDtoList.size() == 0)
-                msg = "没有报警信息";
-            else
-                msg = "报警信息获取成功";
+            resultMap = pgAlarmManager.getAllAlarm(alarmType,partition,startDay,endDay,isNew,page,rows);
+
         } catch (Exception e) {
             e.printStackTrace();
-            msg = "报警信息获取失败";
         }
-        resultMap.put("msg", msg);
-        resultMap.put("result", pgAlarmDtoList);
         return resultMap;
     }
 
@@ -71,9 +65,10 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> clearAlarmList(@FormParam("id") String id) throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        String result = "false";
+        String result = "";
+        String code="0";
 
         try {
             PgAlarm pgAlarm = new PgAlarm();
@@ -86,12 +81,14 @@
                 pgAlarmManager.save(pgAlarm);
                 msg = "报警信息清除成功";
                 result = "true";
+                code = "200";
             }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警信息清除失败";
             result = "false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
@@ -106,21 +103,26 @@
     public Map<String, Object> getAlarmByTypeOrTime(@FormParam("alarmType") String alarmType,
                                                     @FormParam("startTime") String startTime,
                                                     @FormParam("endTime") String endTime) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
-        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<PgAlarmDto>();
+        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
         try {
             pgAlarmDtoList = pgAlarmManager.getAlarmByTypeAndTime(alarmType, startTime, endTime);
             if (pgAlarmDtoList == null || pgAlarmDtoList.size() == 0)
                 msg = "报警信息不存在";
             else
+            {
                 msg = "报警信息获取成功";
+                code="200";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警信息获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
index 29ce8a4..ed0bf34 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
@@ -39,8 +39,8 @@
     public Map<String, Object> getAlarmRule(@FormParam("devType") String devType) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
-        System.out.println("devType:"+devType);
         List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<>();
         try {
             pgAlarmRuleDtoList = pgAlarmRuleManager.getAlarmRuleDto(devType);
@@ -52,6 +52,7 @@
             e.printStackTrace();
             msg = "报警阈值信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmRuleDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
index 24ab894..abef1b1 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
@@ -39,16 +39,21 @@
                                                      @FormParam("endDate") String endDate)throws Exception{
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
+
         List<PgAlarmTjDto> pgAlarmTjDtoList=null;
         try{
             pgAlarmTjDtoList=pgAlarmTjManager.getAlarmTjResultByType(startDate,endDate);
             msg="获取成功";
+            code="200";
         }
         catch(Exception ex) {
             msg = "统计失败";
         }
-        resultMap.put("result",pgAlarmTjDtoList);
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
+        resultMap.put("result",pgAlarmTjDtoList);
+
         return resultMap;
     }
 
@@ -61,23 +66,27 @@
     public Map<String, Object> getAlarmByTime(@FormParam("startTime") String startTime,
                                               @FormParam("endTime") String endTime,
                                               @FormParam("statisticType") String statisticType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code = "0";
 
-        List<PgAlarmTjDto> pgAlarmTjDtoList = new ArrayList<PgAlarmTjDto>();
+        List<PgAlarmTjDto> pgAlarmTjDtoList = new ArrayList<>();
         try {
             pgAlarmTjDtoList = pgAlarmTjManager.getAlarmByTime(startTime, endTime, statisticType);
             if(pgAlarmTjDtoList==null)
                 msg="报警统计信息获取失败";
-            else
-                msg="报警统计信息获取成功";
+            else {
+                msg = "报警统计信息获取成功";
+                code="200";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警统计信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmTjDtoList);
         return resultMap;
     }
 
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
index 28bc811..b6278a9 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
@@ -30,7 +30,6 @@
     @Resource
     private PgAlarmTypeManager pgAlarmTypeManager;
 
-
     /**
      * 获取报警类型
      */
@@ -38,19 +37,24 @@
     @Path("getAlarmType")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getAlarmTypeList()throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
-        List<PgAlarmTypeDto> pgAlarmTypeDtoList=new ArrayList<PgAlarmTypeDto>();
+        String code="";
+
+        List<PgAlarmTypeDto> pgAlarmTypeDtoList=new ArrayList<>();
         try {
             pgAlarmTypeDtoList = pgAlarmTypeManager.getAllAlarmTypeDto();
             if(pgAlarmTypeDtoList.size()==0)
                 msg="没有报警类型信息";
-            else
-                msg="报警类型信息获取成功";
+            else {
+                code="200";
+                msg = "报警类型信息获取成功";
+            }
         }catch(Exception e){
             e.printStackTrace();
             msg="报警类型信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAlarmTypeDtoList);
         return resultMap;
@@ -66,6 +70,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
@@ -83,6 +88,7 @@
                 logger.info("成功保存");
                 result = "true";
                 msg = "保存成功";
+                code="200";
             }
         } catch (Exception e) {
             result = "false";
@@ -90,6 +96,7 @@
             e.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -106,6 +113,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try{
             if(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
@@ -119,6 +127,7 @@
                 pgAlarmTypeManager.save(pgAlarmType);
                 result = "true";
                 msg = "编辑成功";
+                code="200";
             }
         }
         catch(Exception e)
@@ -128,6 +137,7 @@
             e.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("result",result);
         resultMap.put("msg",msg);
 
@@ -146,6 +156,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
         String result="false";
+        String code="0";
 
         try {
             PgAlarmType pgAlarmType=pgAlarmTypeManager.get(Long.valueOf(id));
@@ -157,6 +168,7 @@
             {
                 pgAlarmType.setActive(0);
                 pgAlarmTypeManager.save(pgAlarmType);
+                code="200";
                 msg="报警类型删除成功";
                 result="true";
             }
@@ -165,6 +177,7 @@
             msg="报警类型删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
index 4533e1a..85940bb 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
@@ -33,12 +33,15 @@
                                                  @FormParam("inSpectionPlace") String inSpectionPlace){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
         List<PgAssetPlanDto> pgAssetPlanDtoList=new ArrayList<>();
         try{
             pgAssetPlanDtoList=pgAssetPlanManager.getPgAssetPlanDtoList(startDay,endDay,inSpectionPlace);
-            if(pgAssetPlanDtoList!=null&&pgAssetPlanDtoList.size()!=0)
-                msg="巡检信息获取成功";
+            if(pgAssetPlanDtoList!=null&&pgAssetPlanDtoList.size()!=0) {
+                code="200";
+                msg = "巡检信息获取成功";
+            }
             else
                 msg="不存在巡检信息";
         }
@@ -47,6 +50,7 @@
             msg="巡检信息获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAssetPlanDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
index 47ef9d1..5cbdfcb 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
@@ -30,12 +30,15 @@
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
         String result="";
+        String code="0";
 
         List<PgAssetPlanStatic> pgAssetPlanStaticList = null;
         try{
             pgAssetPlanStaticList=pgAssetPlanManager.getPgAssetPlanStaticLisByTime(startTime,endTime,staticType);
-            if(pgAssetPlanStaticList!=null&&pgAssetPlanStaticList.size()!=0)
-                msg="巡检统计信息获取成功";
+            if(pgAssetPlanStaticList!=null&&pgAssetPlanStaticList.size()!=0) {
+                code = "200";
+                msg = "巡检统计信息获取成功";
+            }
             else
                 msg="统计信息获取失败";
         }
@@ -44,6 +47,7 @@
             msg="统计失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAssetPlanStaticList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
index 26f5d6a..503bfe3 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
@@ -40,6 +40,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="";
 
         try{
             PgAuthority pgAuthority=new PgAuthority();
@@ -50,6 +51,7 @@
 
             pgAuthorityManager.save(pgAuthority);
             msg="用户权限保存成功";
+            code="200";
             result="true";
         }
         catch(Exception e) {
@@ -57,6 +59,7 @@
             msg = "新增权限失败";
             result = "false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -65,22 +68,25 @@
 
     /*
        *编辑角权限信息
-        */
+    */
     @POST
     @Path("editAuthority")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> editAuthority(@FormParam("id") String id,
                                        @FormParam("authority") String authority,
                                        @FormParam("concent") String concent) throws Exception{
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
+
         try {
             PgAuthority pgAuthority=pgAuthorityManager.get(Long.valueOf(id));
             pgAuthority.setAuthority(authority);
             pgAuthority.setConcent(concent);
 
             pgAuthorityManager.save(pgAuthority);
+            code="200";
             msg="权限保存成功";
             result="true";
         }
@@ -90,7 +96,7 @@
             msg="权限编辑失败";
             result="false";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -105,9 +111,10 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> deleteAuthority(@FormParam("id") String id)throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
-        String result="false";
+        String result="";
+        String code="0";
 
         try {
             PgAuthority pgAuthority= pgAuthorityManager.get(Long.valueOf(id));
@@ -119,6 +126,7 @@
             {
                 pgAuthority.setActive(0);
                 pgAuthorityManager.save(pgAuthority);
+                code="200";
                 msg="删除权限成功";
                 result="true";
             }
@@ -127,37 +135,40 @@
             msg="删除权限失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
     }
 
     /*
-* 获取权限信息
- */
+    * 获取权限信息
+    */
     @POST
     @Path("getAuthorityList")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> getAuthorityList() {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgAuthorityDto> pgAuthorityDtoList = new ArrayList<PgAuthorityDto>();
         try {
             pgAuthorityDtoList = pgAuthorityManager.getAuthorityList();
             if (pgAuthorityDtoList == null)
                 msg = "不存在权限信息";
-            else
+            else {
+                code = "200";
                 msg = "权限信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "权限信息获取是失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAuthorityDtoList);
         return resultMap;
     }
 
 
-
-
 }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
index a9ef521..a74ecc7 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
@@ -45,6 +45,7 @@
                                                @FormParam("endDate") String endDate)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgHistoryDataDto> pgHistoryDataDtoList=new ArrayList<>();
 
         try {
@@ -55,13 +56,16 @@
                 pgHistoryDataDtoList=pgCh4Manager.getAllCH4Data(pgDevice,startDate,endDate);
                 if(pgHistoryDataDtoList==null)
                     msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+                else {
+                    code = "200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgHistoryDataDtoList);
         return resultMap;
@@ -75,8 +79,9 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getNewestCh4InfoByDev(@FormParam("assetCode") String assetCode)throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
+        String code="0";
         PgCh4Dto pgCh4Dto=new PgCh4Dto(null);
 
         try {
@@ -87,13 +92,17 @@
                 pgCh4Dto=pgCh4Manager.getNewestCH4Data(pgDevice);
                 if(pgCh4Dto==null)
                     msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgCh4Dto);
         return resultMap;
@@ -111,6 +120,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
@@ -127,6 +137,7 @@
                 pgCh4.setPgDeviceId(pgDevice);
 
                 pgCh4Manager.save(pgCh4);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -135,7 +146,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
index a7eac39..dfc8ca5 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
@@ -43,23 +43,27 @@
                                                       @FormParam("endDate") String endDate)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgHistoryDataDto> pgHistoryDataDtoList=new ArrayList<>();
 
         try {
             PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
                 msg="设备不存在";
-            else{
-                pgHistoryDataDtoList=pgCoManager.getAllCoData(pgDevice, startDate, endDate);
-                if(pgHistoryDataDtoList==null)
-                    msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+            else {
+                pgHistoryDataDtoList = pgCoManager.getAllCoData(pgDevice, startDate, endDate);
+                if (pgHistoryDataDtoList == null)
+                    msg = "没有满足要求的数据";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgHistoryDataDtoList);
         return resultMap;
@@ -75,6 +79,7 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         PgCoDto pgCoDto=new PgCoDto(null);
 
         try {
@@ -85,13 +90,16 @@
                 pgCoDto=pgCoManager.getNewestCoData(pgDevice);
                 if(pgCoDto==null)
                     msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgCoDto);
         return resultMap;
@@ -110,6 +118,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         try {
@@ -126,6 +135,7 @@
 
                 pgCoManager.save(pgCo);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
         } catch (Exception e) {
@@ -133,7 +143,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
index b4b826e..9af98a3 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
@@ -60,6 +60,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         try {
 
@@ -80,8 +81,8 @@
                 pgConstruction.setPgConstructionTypeId(pgConstructionType.getId());
                 pgConstruction.setActive(1);
                 pgConstruction.setParName(parName);
-                logger.info("保存成功");
                 pgConstructionManager.save(pgConstruction);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -90,6 +91,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("success", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -116,6 +118,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
@@ -140,6 +143,7 @@
                 pgConstruction.setParName(parName);
 
                 pgConstructionManager.save(pgConstruction);
+                code="200";
                 result = "true";
                 msg = "编辑成功";
             }
@@ -150,7 +154,7 @@
             e.printStackTrace();
 
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -167,6 +171,8 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
+
         try {
             PgConstruction pgConstruction = pgConstructionManager.get(Long.valueOf(id));
             if (pgConstruction == null)
@@ -177,6 +183,7 @@
             {
                 pgConstruction.setActive(0);
                 pgConstructionManager.save(pgConstruction);
+                code="200";
                 result = "true";
                 msg = "成功删除信息";
             }
@@ -185,6 +192,7 @@
             result = "false";
             msg = "删除失败";
         }
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -204,9 +212,11 @@
                                                   @FormParam("rows") int rows)throws Exception{
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
         List<PgConstructionDto> pgConstructionDtoList=new ArrayList<>();
         try{
             pgConstructionDtoList=pgConstructionManager.getPgContructionDto(cs_name,cs_type,startTime,endTime,page,rows);
+            code="200";
             msg="信息获取成功";
         }
         catch(Exception e)
@@ -214,6 +224,7 @@
             e.printStackTrace();
             msg="查询失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
 
@@ -231,18 +242,22 @@
                                                               @FormParam("statisticType") String statisticType) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgConstructionStiatistic> pgConstructionStiatisticList=new ArrayList<>();
         try {
             pgConstructionStiatisticList = pgConstructionManager.getConstructionByTimeAndStatus(startTime, endTime, statisticType);
             if(pgConstructionStiatisticList==null)
                 msg="施工统计信息获取失败";
-            else
-                msg="施工统计信息获取成功";
+            else {
+                code="200";
+                msg = "施工统计信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "施工统计信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgConstructionStiatisticList);
         return resultMap;
@@ -257,6 +272,7 @@
     public Map<String, Object> getConstructionByType(@FormParam("statisticType") String statisticType){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
         List<PgConstructionStiatistic> pgConstructionStiatisticList=new ArrayList<>();
 
         try{
@@ -268,6 +284,7 @@
                 resultMap.put("result",null);
             }
             else {
+                code="200";
                 msg = "统计信息获取成功";
                 resultMap.put("result", pgConstructionStiatisticList);
             }
@@ -278,6 +295,7 @@
             msg="统计失败";
             resultMap.put("result",null);
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         return resultMap;
     }
@@ -291,9 +309,11 @@
     public Map<String, Object> getConstructionToday() throws Exception{
         Map<String,Object> resultMap=new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgConstructionDto> pgConstructionDtoList=new ArrayList<PgConstructionDto>();
         try {
             pgConstructionDtoList = pgConstructionManager.getConstructionToday();
+            code="200";
             msg = "当天施工信息获取成功";
         }
         catch(Exception e)
@@ -301,7 +321,7 @@
             e.printStackTrace();
             msg="获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
         return resultMap;
@@ -316,6 +336,7 @@
     public Map<String, Object> getConstructionDev(@FormParam("id") String id) throws Exception{
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
         List<PgDeviceDto> pgDeviceDtoList =new ArrayList<>();
         try{
@@ -325,14 +346,17 @@
 
             if(pgDeviceDtoList==null)
                 msg="信息获取失败";
-            else
-                msg="信息获取成功";
+            else {
+                code="200";
+                msg = "信息获取成功";
+            }
         }
         catch(Exception e)
         {
             e.printStackTrace();
-            msg="设备信息获取成功";
+            msg="信息获取是被";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgDeviceDtoList);
 
@@ -346,17 +370,21 @@
     @Path("getConstruction")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getConstruction() throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
-        List<PgConstructionDto> pgConstructionDtoList=new ArrayList<PgConstructionDto>();
+        String code="0";
+
+        List<PgConstructionDto> pgConstructionDtoList=new ArrayList<>();
 
         try{
             pgConstructionDtoList=pgConstructionManager.getPgConstructionList();
             if(pgConstructionDtoList==null||pgConstructionDtoList.size()==0)
                 msg="不存在施工记录";
-            else
-                msg="施工信息获取成功";
+            else {
+                code = "200";
+                msg = "施工信息获取成功";
+            }
         }
         catch(Exception e)
         {
@@ -364,6 +392,7 @@
             msg="施工信息获取失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java
index fd3d53e..2019502 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java
@@ -39,12 +39,12 @@
         try {
             pgConstructionTypeDtoList = pgConstructionTypeManager.getAllConstructionTypeDto();
             if (pgConstructionTypeDtoList.size() == 0)
-                msg = "没有项目类型信息";
+                msg = "获取失败";
             else
-                msg = "项目类型获取成功";
+                msg = "获取成功";
         } catch (Exception e) {
             e.printStackTrace();
-            msg = "项目类型信息获取失败";
+            msg = "获取失败";
         }
         resultMap.put("msg", msg);
         resultMap.put("result", pgConstructionTypeDtoList);
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
index 90d001c..037a399 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
@@ -51,6 +51,7 @@
 
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if (StringUtils.isBlank(construct_doc)||StringUtils.isBlank(doc_name))
@@ -65,6 +66,7 @@
             pgCsDocument.setActive(1);
             pgCsDocumentManager.save(pgCsDocument);
 
+            code="200";
             result = "true";
             msg = "保存成功";
 
@@ -74,6 +76,7 @@
             ex.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("success", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -90,6 +93,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             PgCsDocument pgCsDocument = pgCsDocumentManager.get(Long.valueOf(id));
@@ -103,6 +107,7 @@
 
                 pgCsDocumentManager.save(pgCsDocument);
 
+                code="200";
                 result = "true";
                 msg = "编辑成功";
             }
@@ -112,6 +117,7 @@
             msg = "编辑失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -125,9 +131,9 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
         String result="";
+        String code="0";
 
         try{
-
             PgCsDocument pgCsDocument = pgCsDocumentManager.get(Long.valueOf(id));
             if(pgCsDocument==null)
             {
@@ -137,6 +143,7 @@
             else{
                 pgCsDocument.setActive(0);
                 pgCsDocumentManager.save(pgCsDocument);
+                code="200";
                 result="true";
                 msg="删除成功";
             }
@@ -147,7 +154,7 @@
             msg="预案删除失败";
             result="false";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -168,18 +175,21 @@
 
         String msg="";
         String result="";
+        String code="0";
 
         try {
             pgCsDocumentDtoList = pgCsDocumentManager.getAllDocData(cs_name);
-            if (pgCsDocumentDtoList != null)
+            if (pgCsDocumentDtoList != null) {
+                code="200";
                 msg = "获取数据成功";
+            }
             else
                 msg = "没有满足条件的数据";
         }catch (Exception e){
             e.printStackTrace();
             msg = "获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgCsDocumentDtoList);
         return resultMap;
@@ -192,20 +202,22 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
 
         String msg = "";
+        String code="0";
         ResponseEntity<byte[]> path = null;
         try {
             PgCsDocument pgCsDocument = pgCsDocumentManager.get(Long.valueOf(id));
             path = pgCsDocumentManager.downloadFile(pgCsDocument);
             if (path == null)
                 msg = "不存在该文档";
-            else
+            else {
+                code = "200";
                 msg = "下载成功";
-
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "下载失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", path.getBody());
         resultMap.put("msg", msg);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
index 94c5c84..ffc8b95 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
@@ -41,22 +41,24 @@
     public Map<String, Object> getPgDeviceByDevType(@FormParam("devType") String devType) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
         try {
-            pgDeviceDtoList = pgDeviceManager.getDeviceByDevTypee(devType);
+            pgDeviceDtoList = pgDeviceManager.getDeviceByDevType(devType);
             if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0){
                 msg="不存在满足要求的数据";
-                resultMap.put("result",null);
             }
             else{
-                resultMap.put("result", pgDeviceDtoList);
+                code="200";
                 msg = "获取成功";
             }
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", pgDeviceDtoList);
         return resultMap;
     }
 
@@ -69,25 +71,26 @@
     public Map<String, Object> getPgDeviceByAssetCode(@FormParam("assetCode") String assetCode) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         PgDeviceDto pgDeviceDto=null;
         try {
             PgDevice pgDevice = pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
             {
                 msg="不存在设备信息";
-                resultMap.put("result",null);
             }
             else {
                 pgDeviceDto = new PgDeviceDto(pgDevice);
                 msg = "获取成功";
-                resultMap.put("result", pgDeviceDto);
+                code="200";
             }
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", pgDeviceDto);
         return resultMap;
     }
 
@@ -102,27 +105,61 @@
                                              @FormParam("devType") String devType)throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
         try {
             pgDeviceDtoList = pgDeviceManager.getAllDevice(road,partition,devType);
             if(pgDeviceDtoList.size()==0) {
                 msg = "没有找到设备信息";
-                resultMap.put("result",null);
             }
             else {
                 msg = "设备信息获取成功";
-                resultMap.put("result", pgDeviceDtoList);
+                code="200";
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result", pgDeviceDtoList);
         return resultMap;
     }
 
     /**
+     * 显示设备列表
+     */
+    @POST
+    @Path("getPgDev")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String, Object> getPgDev(@FormParam("road") String road,
+                                             @FormParam("partition") String partition,
+                                             @FormParam("devType") String devType)throws Exception {
+        Map<String, Object> resultMap = new HashMap<>();
+        String msg="";
+        String code="0";
+        List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
+        try {
+            pgDeviceDtoList = pgDeviceManager.getAllDev(road,partition,devType);
+            if(pgDeviceDtoList.size()==0) {
+                msg = "没有找到设备信息";
+            }
+            else {
+                code="200";
+                msg = "设备信息获取成功";
+            }
+        }catch(Exception e){
+            e.printStackTrace();
+            msg="设备信息获取失败";
+        }
+        resultMap.put("code",code);
+        resultMap.put("msg",msg);
+        resultMap.put("result", pgDeviceDtoList);
+        return resultMap;
+    }
+
+
+    /**
      * 新增设备
      */
     @POST
@@ -145,6 +182,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if (pgDeviceManager.getDeviceByAssetCode(assetCode)!=null) {
@@ -169,6 +207,7 @@
 
                 pgDeviceManager.save(pgDevice);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
 
@@ -177,10 +216,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -208,14 +246,9 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
-            /*
-            if (pgDeviceManager.getDeviceByAssetCode(assetCode)!=null) {
-                result = "false";
-                msg = "已存在同名设备";
-            } else {
-            */
             PgDevice pgDevice = pgDeviceManager.get(Long.valueOf(id));
             pgDevice.setPipeGallery(pipeGallery);
             pgDevice.setPartition(partition);
@@ -233,14 +266,14 @@
 
             pgDeviceManager.save(pgDevice);
             result = "true";
+            code="200";
             msg = "编辑成功";
-            //}
         } catch (Exception e) {
             result = "false";
             msg = "编辑失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("result",result);
         resultMap.put("msg",msg);
         return resultMap;
@@ -256,7 +289,8 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
-        String result="false";
+        String result="";
+        String code="0";
 
         try {
             PgDevice pgDevice=pgDeviceManager.get(Long.valueOf(id));
@@ -268,6 +302,7 @@
             {
                 pgDevice.setActive(0);
                 pgDeviceManager.save(pgDevice);
+                code="200";
                 msg="设备删除成功";
                 result="true";
             }
@@ -276,6 +311,7 @@
             msg="设备删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -291,18 +327,18 @@
     {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         PgDeviceDto pgDeviceDto=null;
 
         try{
             PgDevice pgDevice=pgDeviceManager.getDeviceBydevCode(devCode);
             if(pgDevice==null) {
                 msg = "设备信息获取失败";
-                resultMap.put("result",null);
             }
             else{
                 pgDeviceDto = new PgDeviceDto(pgDevice);
                 msg = "设备信息获取成功";
-                resultMap.put("result",pgDeviceDto);
+                code="200";
             }
         }
         catch(Exception ex)
@@ -310,8 +346,9 @@
             ex.printStackTrace();
             msg="设备状态获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgDeviceDto);
         return resultMap;
     }
 
@@ -324,17 +361,17 @@
     public Map<String,Object> getDeviceByPartition(@FormParam("partition") String partition) throws Exception{
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<PgDeviceDto>();
 
         try{
             pgDeviceDtoList=pgDeviceManager.getPgDeviceDtoListByPartition(partition);
             if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0) {
                 msg = "设备信息获取失败";
-                resultMap.put("result",null);
             }
             else {
+                code="200";
                 msg = "设备信息获取成功";
-                resultMap.put("result",pgDeviceDtoList);
             }
         }
         catch(Exception e)
@@ -342,8 +379,9 @@
             e.printStackTrace();
             msg="设备信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgDeviceDtoList);
         return resultMap;
     }
 
@@ -353,17 +391,16 @@
     public Map<String,Object> getDeviceByOldDAssetCodeCode(@FormParam("assetCode") String assetCode) throws Exception{
         Map<String, Object> resultMap = new HashMap<>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
 
         try{
             pgDeviceDtoList=pgDeviceManager.getDeviceByOldDAssetCodeCode(assetCode);
-            if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0) {
-                msg = "设备信息获取失败";;
-                resultMap.put("result",null);
-            }
+            if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0)
+                msg = "设备信息获取失败";
             else {
                 msg = "设备信息获取成功";
-                resultMap.put("result",pgDeviceDtoList);
+                code="200";
             }
         }
         catch(Exception e)
@@ -372,8 +409,9 @@
             msg="设备信息获取失败";
             resultMap.put("result",null);
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgDeviceDtoList);
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java
index 421d249..f6f167d 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java
@@ -38,17 +38,21 @@
     public Map<String, Object> getDeviceTpeyList()throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgDeviceTypeDto> pgDeviceTypeDtoList=new ArrayList<PgDeviceTypeDto>();
         try {
             pgDeviceTypeDtoList = pgDeviceTypeManager.getAllDeviceType();
             if(pgDeviceTypeDtoList.size()==0)
                 msg="没有找到设备类型信息";
-            else
-                msg="设备类型信息获取成功";
+            else {
+                code="200";
+                msg = "设备类型信息获取成功";
+            }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备类型信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgDeviceTypeDtoList);
         return resultMap;
@@ -66,6 +70,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if (pgDeviceTypeManager.getDeviceTypeByDeType(devType)!=null) {
@@ -79,6 +84,7 @@
 
                 pgDeviceTypeManager.save(pgDeviceType);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
 
@@ -87,10 +93,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
index c276fb3..c789960 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
@@ -44,6 +44,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 
         try {
@@ -62,6 +63,7 @@
                 pgEquipment.setActive(1);
 
                 pgEquipmentManager.save(pgEquipment);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -70,9 +72,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -89,9 +91,10 @@
                                             @FormParam("ownerUnit") String ownerUnit,
                                             @FormParam("enterDate") String enterDate,
                                             @FormParam("curUser") String curUser) {
-        HashMap<String, Object> resultMap = new HashMap<String, Object>();
+        HashMap<String, Object> resultMap = new HashMap<>();
         String msg = "";
         String result = "";
+        String code="0";
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 
         try {
@@ -111,6 +114,7 @@
                 pgEquipment.setEnterDate(sdf.parse(enterDate));
 
                 pgEquipmentManager.save(pgEquipment);
+                code="200";
                 msg="编辑成功";
                 result="true";
             }
@@ -119,9 +123,9 @@
             result = "false";
             msg = "编辑失败";
         }
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -134,16 +138,19 @@
     public Map<String, Object> getEquipment(@FormParam("eqName") String eqName,
                                             @FormParam("eqCode") String eqCode,
                                             @FormParam("eqType") String eqType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        List<PgEquipmentDto> pgEquipmentDtoList=new ArrayList<PgEquipmentDto>();
+        String code="0";
+        List<PgEquipmentDto> pgEquipmentDtoList=new ArrayList<>();
 
         try{
             pgEquipmentDtoList=pgEquipmentManager.getEquipmentDtiList(eqName,eqCode,eqType);
             if(pgEquipmentDtoList==null||pgEquipmentDtoList.size()==0)
                 msg="不存在工器具记录";
-            else
-                msg="维获取成功";
+            else {
+                code = "200";
+                msg = "维获取成功";
+            }
         }
         catch(Exception e)
         {
@@ -166,6 +173,7 @@
         HashMap<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
         String result = "";
+        String code="";
 
         try {
             PgEquipment pgEquipment=pgEquipmentManager.get(Long.valueOf(id));
@@ -178,6 +186,7 @@
             {
                 pgEquipment.setActive(0);
                 pgEquipmentManager.save(pgEquipment);
+                code="200";
                 msg="删除成功";
                 result="true";
             }
@@ -186,6 +195,7 @@
             msg="设备信息获取失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -201,16 +211,19 @@
             throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=new ArrayList<PgDeviceTypeStatisticDto>();
 
         try {
             pgDeviceTypeStatisticDtoList=pgEquipmentManager.getDeviceStatisticByDevType(eqType);
 
+            code="200";
             msg = "获取成功";
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceTypeStatisticDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
index 05a9709..a90fd6c 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
@@ -4,9 +4,9 @@
 import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
 import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
 import com.casic.PgInterface.intelPlan.manager.PgPileAcuManager;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import com.casic.PgInterface.test.PlanData;
 import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.ModelAttribute;
 
 import javax.annotation.Resource;
 import javax.ws.rs.FormParam;
@@ -32,23 +32,25 @@
     public Map<String,Object> getPlanResult(@FormParam("planParamStr") String planParamStr){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
-        //List<PgPlanTask> pgPlanTaskList=pgPlanParams.getPgPlanTaskList();
         List<PgPlanTask> pgPlanTaskList=new PgPlanParams().getPgPlanParamsByString(planParamStr);
         List<PgPlanResultRe> pgPlanResultReList=new ArrayList<>();
 
-        try{
-                pgPlanResultReList=pgPileAcuManager.getPgPlanResultList(pgPlanTaskList);
-                if(pgPlanResultReList==null)
-                    msg="管线智能规划出错";
-                else
-                    msg="管线智能规划完成";
+        try {
+            pgPlanResultReList = pgPileAcuManager.getPgPlanResultList(pgPlanTaskList);
+            if (pgPlanResultReList == null)
+                msg = "管线智能规划出错";
+            else {
+                code="200";
+                msg = "管线智能规划完成";
+            }
         }
         catch(Exception ex){
             msg="智能规划出错";
             ex.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgPlanResultReList);
 
@@ -80,4 +82,30 @@
         return resultMap;
     }
 
+    @POST
+    @Path("getPlanTask")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getACUTask(@FormParam("pileAcuList") String pileAcuList){
+
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        String code="0";
+        List<PgAcuTask> pgAcuTaskList=new ArrayList<>();
+
+        try{
+            pgAcuTaskList=pgPileAcuManager.getACUTask(pileAcuList);
+            code="200";
+            msg="任务获取成功";
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            msg="任务获取失败";
+        }
+        resultMap.put("code",code);
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgAcuTaskList);
+
+        return resultMap;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
index ff85c61..66eec76 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
@@ -55,13 +55,13 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         try {
             PgInPgPerson pgInPgPerson = null;//pgInPgPersonManager.getPersonByUserName(userName);
             int iHostName = pgTagMacManager.getCount("select count(1) from PGTagMac where hostname = ?",assetCode);
-//            int iTagMac = pgTagMacManager.getCount("select count(1) from PGTagMac where tagmac = ?",assetCode.toUpperCase());
             if (0==iHostName)
             {
                 result = "false";
@@ -92,9 +92,8 @@
 
                 pgInPgStatusManager.save(pgInPgStatus);
 
-//                String syResult=pgInPgPersonManager.synchorizedInPgInfo(assetCode,userCode,userName,personType);
+                code="200";
                 result = "true";
-//                msg = "人员注册保存成功"+syResult;
                 msg = "人员注册保存成功";
             }
             else {
@@ -106,6 +105,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -120,6 +120,7 @@
     public Map<String, Object> getInPgPerson() throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<>();
         try {
@@ -127,11 +128,15 @@
             if (pgInPgInfoDtoList == null || pgInPgInfoDtoList.size() == 0)
                 msg = "没有找到入廊人员信息";
             else
+            {
+                code="200";
                 msg = "入廊人员信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "入廊人员信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
         return resultMap;
@@ -146,18 +151,22 @@
     public Map<String, Object> getInPgPersonInPg() throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
 
-        List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<PgInPgInfoDto>();
+        List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<>();
         try {
             pgInPgInfoDtoList = pgInPgPersonManager.getPgInPersonList(1);
             if (pgInPgInfoDtoList == null || pgInPgInfoDtoList.size() == 0)
                 msg = "没有找到入廊人员信息";
-            else
+            else {
+                code="200";
                 msg = "入廊人员信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "入廊人员信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
         return resultMap;
@@ -172,6 +181,7 @@
     public Map<String, Object> getInPgPersonByName(@FormParam("userName") String userName) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
 
         PgInPgPerson pgInPgPerson = null;
         PgInPgPersonDto pgInPgPersonDto=null;
@@ -184,12 +194,13 @@
                 pgInPgPersonDto=new PgInPgPersonDto(pgInPgPerson);
                 pgInPgPersonDtoList.add(pgInPgPersonDto);
                 msg = "人员信息获取成功";
+                code="200";
             }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "人员信息获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgPersonDtoList);
         return resultMap;
@@ -206,6 +217,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             PgInPgPerson pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName);
@@ -221,6 +233,7 @@
                     pgInPgPersonManager.save(pgInPgPerson);
                     result = "true";
                     msg = "编辑成功";
+                    code="200";
                 }
             }
         } catch (Exception e) {
@@ -228,9 +241,9 @@
             msg = "编辑失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -244,10 +257,12 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         int inPgNum=0;
         String msg = "";
+        String code="0";
 
         try{
             inPgNum=pgInPgStatusManager.getInPgNum();
 
+            code="200";
             msg="人员入廊次数获取成功";
         }
         catch(Exception e)
@@ -255,6 +270,7 @@
             e.printStackTrace();
             msg="人员入廊次数获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",inPgNum);
 
@@ -272,18 +288,22 @@
                                                    @FormParam("statisticType") String statisticType) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
 
         List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<PgInPgInfoDto>();
         try {
             pgInPgInfoDtoList = pgInPgPersonManager.getPgInPersonListByTime(startTime, endTime, statisticType);
             if(pgInPgInfoDtoList==null)
                 msg="入廊人员统计信息获取失败";
-            else
-                msg="入廊人员统计信息获取成功";
+            else {
+                code="200";
+                msg = "入廊人员统计信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "入廊人员统计信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
         return resultMap;
@@ -296,6 +316,7 @@
 
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
 
         try {
@@ -304,8 +325,10 @@
                 pgDeviceDtoList=pgDeviceManager.getPgCameraListByPosition("",apCodeStr);
                 if(pgDeviceDtoList==null)
                     msg="不存在关联摄像机";
-                else
-                    msg="关联摄像机获取成功";
+                else {
+                    code="200";
+                    msg = "关联摄像机获取成功";
+                }
             } else {
                 msg="请输入Ap编号";
             }
@@ -315,6 +338,7 @@
             msg="关联摄像机获取成功";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgDeviceDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java
index 507b3fe..b43f077 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java
@@ -34,6 +34,7 @@
 
         String result="";
         String msg="";
+        String code="";
         try{
             PgInPgStatus pgInPgStatus=new PgInPgStatus();
 
@@ -44,6 +45,7 @@
             pgInPgStatusManager.save(pgInPgStatus);
             msg="入廊时间提交成功";
             result="true";
+            code="200";
         }
         catch (Exception e){
             e.printStackTrace();
@@ -51,6 +53,7 @@
             result="false";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -66,6 +69,7 @@
 
         String result="";
         String msg="";
+        String code="0";
         try{
             PgInPgPerson pgInPgPerson=pgInPgPersonManager.getPgInPgPersonByAssetCode(assetCode);
 
@@ -79,6 +83,7 @@
             pgInPgStatusManager.save(pgInPgStatus);
 
             msg="出廊时间提交成功";
+            code="200";
             result="true";
         }
         catch (Exception e){
@@ -87,6 +92,7 @@
             result="false";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
index 9def330..9c0ba1f 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
@@ -33,17 +33,20 @@
                                             @FormParam("existNum") String existNum) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         String result="";
 
         try {
             pgIntelPlanManager.savePgIntelPlan(parName,lineName,maxNum,existNum);
             msg="规划数据保存成功";
+            code="200";
             result="true";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "规划数据保存失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
@@ -55,15 +58,18 @@
     public Map<String, Object> getIntelLineType() throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgIntelPlanTypeDto> pgIntelPlanTypeDtoList=new ArrayList<>();
         try {
             pgIntelPlanTypeDtoList=pgIntelPlanManager.getIntelPlanType();
+            code="200";
             msg="获取排线类型成功";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "获取排线类型失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgIntelPlanTypeDtoList);
         return resultMap;
@@ -76,6 +82,7 @@
                                             @FormParam("partitionStr") String partitionStr) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgIntelPlanDto> pgIntelPlanDtoList = new ArrayList<>();
 
@@ -83,8 +90,10 @@
             pgIntelPlanDtoList = pgIntelPlanManager.getPgIntelPlanListByPartion(lineName, partitionStr);
             if(pgIntelPlanDtoList==null||pgIntelPlanDtoList.size()==0)
                 msg="请输入正确的规划参数";
-            else
-                msg="规划数据获取成功";
+            else {
+                code="200";
+                msg = "规划数据获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "规划数据获取失败";
@@ -103,10 +112,12 @@
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
         String result="";
+        String code="0";
 
         try {
             boolean bl=pgIntelPlanManager.addLineUse(lineName,partitionStr,num);
             if(bl){
+                code="200";
                 msg="排线入廊成功";
                 result="true";
             }
@@ -119,6 +130,7 @@
             msg = "排线入廊失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
@@ -132,6 +144,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
         String result="";
+        String code="0";
 
         try {
             PgIntelPlan pgIntelPlan=pgIntelPlanManager.getPgIntelPlanByParNameAndLine(lineName,parName);
@@ -140,11 +153,13 @@
             pgIntelPlanManager.save(pgIntelPlan);
             msg="规划数据删除成功";
             result="true";
+            code="200";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "规划数据删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 25ded8a..283d7ab 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,20 +7,56 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" 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/construction/manager/PgCsDocumentManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/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/manager/PgAlarmManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/~$说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/~$说明20191207.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.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$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/接口说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明20191207.docx" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
@@ -51,7 +87,7 @@
         <counts>
           <entry key="class" value="4" />
           <entry key="iml" value="2" />
-          <entry key="java" value="707" />
+          <entry key="java" value="820" />
           <entry key="properties" value="14" />
           <entry key="xml" value="7" />
         </counts>
@@ -60,7 +96,7 @@
         <counts>
           <entry key="CLASS" value="4" />
           <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="707" />
+          <entry key="JAVA" value="820" />
           <entry key="Properties" value="14" />
           <entry key="XML" value="7" />
         </counts>
@@ -68,32 +104,32 @@
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
           <entry key="dummy" value="38" />
-          <entry key="java" value="30161" />
+          <entry key="java" value="40859" />
           <entry key="properties" value="100" />
-          <entry key="txt" value="176" />
+          <entry key="txt" value="186" />
           <entry key="xml" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="30161" />
-          <entry key="PLAIN_TEXT" value="214" />
+          <entry key="JAVA" value="40859" />
+          <entry key="PLAIN_TEXT" value="224" />
           <entry key="Properties" value="100" />
           <entry key="XML" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="48" />
+          <entry key="project.closed" value="51" />
           <entry key="project.open.time.1" value="5" />
           <entry key="project.open.time.12" value="2" />
           <entry key="project.open.time.13" value="1" />
           <entry key="project.open.time.15" value="1" />
           <entry key="project.open.time.16" value="1" />
           <entry key="project.open.time.17" value="1" />
-          <entry key="project.open.time.2" value="1" />
+          <entry key="project.open.time.2" value="2" />
           <entry key="project.open.time.20" value="1" />
-          <entry key="project.open.time.23" value="1" />
+          <entry key="project.open.time.23" value="2" />
           <entry key="project.open.time.24" value="2" />
           <entry key="project.open.time.251" value="1" />
           <entry key="project.open.time.27" value="2" />
@@ -106,8 +142,8 @@
           <entry key="project.open.time.36" value="1" />
           <entry key="project.open.time.37" value="1" />
           <entry key="project.open.time.39" value="2" />
-          <entry key="project.open.time.4" value="2" />
-          <entry key="project.open.time.40" value="1" />
+          <entry key="project.open.time.4" value="3" />
+          <entry key="project.open.time.40" value="2" />
           <entry key="project.open.time.41" value="2" />
           <entry key="project.open.time.42" value="2" />
           <entry key="project.open.time.43" value="2" />
@@ -122,23 +158,25 @@
           <entry key="project.open.time.6" value="3" />
           <entry key="project.open.time.63" value="2" />
           <entry key="project.open.time.64" value="1" />
+          <entry key="project.open.time.66" value="1" />
           <entry key="project.open.time.71" value="2" />
+          <entry key="project.open.time.74" value="1" />
           <entry key="project.open.time.76" value="1" />
           <entry key="project.open.time.8" value="2" />
           <entry key="project.open.time.9" value="1" />
           <entry key="project.open.time.97" value="1" />
-          <entry key="project.opened" value="78" />
+          <entry key="project.opened" value="84" />
         </counts>
       </usages-collector>
     </session>
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+            <state relative-caret-position="396">
+              <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
               <folding>
                 <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
                 <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -147,73 +185,6 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <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="99">
-              <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-              <folding>
-                <element signature="imports" expanded="true" />
-                <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-1170">
-              <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state>
-              <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
-              <folding>
-                <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-                <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="true">
-        <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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-              <folding>
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-                <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>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <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="352">
-              <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -225,18 +196,9 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>inCriteria</find>
-      <find>getPgPlanResulList</find>
-      <find>getPileAcuListByPileAcuStr</find>
-      <find>distinct</find>
-      <find>order</find>
-      <find>canPlanLine</find>
-      <find>isExistLine</find>
-      <find>getPlanResult</find>
       <find>pgPipeLine</find>
       <find>getPipeLineBylineName</find>
       <find>StringU</find>
-      <find>getAllAlarm</find>
       <find>getAlarmList</find>
       <find>getPgInPersonListByDay</find>
       <find>getDayInPgStatistic</find>
@@ -254,7 +216,16 @@
       <find>getPgContructionByNameOrType</find>
       <find>&quot;&quot;,&quot;&quot;,</find>
       <find>getPgContructionDtoByNameOrType</find>
+      <find>addConstruction</find>
+      <find>getPgLineAcuHole</find>
+      <find>getPlanResult</find>
       <find>getConstruction</find>
+      <find>addPipeLine</find>
+      <find>未找到入廊数据</find>
+      <find>getCurrentHoleByAcu</find>
+      <find>getAllAlarm</find>
+      <find>getPgDeviceDtoListByPartition</find>
+      <find>getPgDeviceByDevType</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -263,57 +234,57 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlan.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileHoleManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/planData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/PlanData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
       </list>
     </option>
   </component>
@@ -359,7 +330,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -421,53 +391,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="dto" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="manager" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -479,29 +402,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="rs" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -516,6 +416,7 @@
         </subPane>
       </pane>
       <pane id="Scope" />
+      <pane id="PackagesPane" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -710,7 +611,13 @@
       <workItem from="1574902733573" duration="1829000" />
       <workItem from="1574998240004" duration="7016000" />
       <workItem from="1575247959683" duration="6997000" />
-      <workItem from="1575704345590" duration="40473000" />
+      <workItem from="1575704345590" duration="69381000" />
+      <workItem from="1575869479666" duration="721000" />
+      <workItem from="1575947104878" duration="6101000" />
+      <workItem from="1576128264436" duration="3347000" />
+      <workItem from="1576208571543" duration="22000" />
+      <workItem from="1576227513917" duration="862000" />
+      <workItem from="1576293721220" duration="18246000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -817,11 +724,18 @@
       <option name="project" value="LOCAL" />
       <updated>1575775489149</updated>
     </task>
-    <option name="localTasksCounter" value="16" />
+    <task id="LOCAL-00016" summary="整改施工信息">
+      <created>1575791780774</created>
+      <option name="number" value="00016" />
+      <option name="presentableId" value="LOCAL-00016" />
+      <option name="project" value="LOCAL" />
+      <updated>1575791780774</updated>
+    </task>
+    <option name="localTasksCounter" value="17" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="452131000" />
+    <option name="totallyTimeSpent" value="510338000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -834,9 +748,8 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
-    <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.24205749" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2647504" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -847,7 +760,7 @@
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.3295082" />
       <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.4819672" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.65737706" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.3295082" />
@@ -939,7 +852,8 @@
     <MESSAGE value="重新设计智能规划部分" />
     <MESSAGE value="完成智能规划对接" />
     <MESSAGE value="修改报警统计" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改报警统计" />
+    <MESSAGE value="整改施工信息" />
+    <option name="LAST_COMMIT_MESSAGE" value="整改施工信息" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -951,16 +865,10 @@
           <option name="timeStamp" value="3" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java</url>
-          <line>69</line>
+          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java</url>
+          <line>40</line>
           <properties />
-          <option name="timeStamp" value="21" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java</url>
-          <line>96</line>
-          <properties />
-          <option name="timeStamp" value="38" />
+          <option name="timeStamp" value="122" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
@@ -970,394 +878,452 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <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="2068">
-          <caret line="154" column="35" selection-start-line="154" selection-start-column="35" selection-end-line="154" selection-end-column="35" />
-        </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="3300">
-          <caret line="297" column="22" selection-start-line="297" selection-start-column="22" selection-end-line="297" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/StringUtils.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
-          <caret line="13" column="48" lean-forward="true" selection-start-line="13" selection-start-column="48" selection-end-line="13" selection-end-column="48" />
+          <caret line="11" column="5" selection-start-line="11" selection-start-column="5" selection-end-line="11" selection-end-column="5" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="78" lean-forward="true" selection-start-line="78" selection-end-line="78" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="616">
-          <caret line="41" column="1" selection-start-line="41" selection-start-column="1" selection-end-line="41" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="110">
-          <caret line="12" column="23" selection-start-line="12" selection-start-column="23" selection-end-line="12" selection-end-column="23" />
+        <state relative-caret-position="516">
+          <caret line="114" column="12" selection-start-line="114" selection-start-column="12" selection-end-line="114" selection-end-column="12" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="164">
-          <caret line="56" lean-forward="true" selection-start-line="56" selection-end-line="56" />
+        <state relative-caret-position="418">
+          <caret line="33" column="44" selection-start-line="33" selection-start-column="44" selection-end-line="33" selection-end-column="44" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="258">
-          <caret line="27" column="12" lean-forward="true" selection-start-line="27" selection-start-column="12" selection-end-line="27" selection-end-column="12" />
+        <state relative-caret-position="132">
+          <caret line="11" column="20" lean-forward="true" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="20" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.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="-12">
-          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        <state relative-caret-position="516">
+          <caret line="142" column="54" selection-start-line="142" selection-start-column="54" selection-end-line="142" selection-end-column="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="858">
-          <caret line="55" column="27" lean-forward="true" selection-start-line="55" selection-start-column="27" selection-end-line="55" selection-end-column="27" />
+        <state relative-caret-position="66">
+          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="58">
+          <caret line="18" column="28" selection-start-line="18" selection-start-column="19" selection-end-line="18" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="305">
+          <caret line="24" column="31" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="714">
+          <caret line="58" column="5" lean-forward="true" selection-start-line="58" selection-start-column="5" selection-end-line="58" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="924">
+          <caret line="134" column="92" selection-start-line="134" selection-start-column="92" selection-end-line="134" selection-end-column="92" />
+          <folding>
+            <element signature="method#linkDevice#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkPartitionCamera#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkReservePlan#0;class#PgAlarmLinkRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1066">
+          <caret line="90" lean-forward="true" selection-start-line="90" selection-end-line="90" />
+          <folding>
+            <element signature="method#getTjResultByAlarmType#0;class#PgAlarmTjRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="946">
+          <caret line="148" column="11" lean-forward="true" selection-start-line="148" selection-start-column="11" selection-end-line="148" selection-end-column="11" />
+          <folding>
+            <element signature="method#getAlarmTypeList#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#addAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#editAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#deleteAlarmType#0;class#PgAlarmTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="208">
+          <caret line="46" column="23" lean-forward="true" selection-start-line="46" selection-start-column="23" selection-end-line="46" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="113" column="9" lean-forward="true" selection-start-line="113" selection-start-column="9" selection-end-line="113" selection-end-column="9" />
+          <folding>
+            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
+            <element signature="method#getNewestCh4InfoByDev#0;class#PgCh4Rs#0" />
+            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="145" column="6" lean-forward="true" selection-start-line="145" selection-start-column="6" selection-end-line="145" selection-end-column="6" />
+          <folding>
+            <element signature="method#addAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#editAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#deleteAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#getAuthorityList#0;class#PgAuthorityRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="58" column="1" lean-forward="true" selection-start-line="58" selection-start-column="1" selection-end-line="58" selection-end-column="1" />
+          <folding>
+            <element signature="method#getPgAssetPlanList#0;class#PgAssetPlanRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="370">
+          <caret line="371" column="66" selection-start-line="371" selection-start-column="66" selection-end-line="371" selection-end-column="66" />
+          <folding>
+            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#searchConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionDev#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="139" column="13" lean-forward="true" selection-start-line="139" selection-start-column="13" selection-end-line="139" selection-end-column="13" />
+          <folding>
+            <element signature="method#getCoInfoByDevAndDate#0;class#PgCoRs#0" />
+            <element signature="method#getNewestCoInfoByDev#0;class#PgCoRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="540">
+          <caret line="223" column="5" lean-forward="true" selection-start-line="223" selection-start-column="5" selection-end-line="223" selection-end-column="5" />
+          <folding>
+            <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="682">
+          <caret line="100" lean-forward="true" selection-start-line="100" selection-end-line="100" />
+          <folding>
+            <element signature="method#getDeviceTpeyList#0;class#PgDeviceTypeRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="377">
+          <caret line="225" column="35" selection-start-line="225" selection-start-column="35" selection-end-line="225" selection-end-column="35" />
+          <folding>
+            <element signature="method#addEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#addEquipment#1;class#PgEquipmentRs#0" />
+            <element signature="method#getEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#deleteEquipment#0;class#PgEquipmentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="406">
+          <caret line="109" lean-forward="true" selection-start-line="109" selection-end-line="109" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="154">
+          <caret line="28" column="19" selection-start-line="28" selection-start-column="19" selection-end-line="28" selection-end-column="19" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="748">
-          <caret line="49" column="5" lean-forward="true" selection-start-line="49" selection-start-column="5" selection-end-line="49" selection-end-column="5" />
+        <state relative-caret-position="296">
+          <caret line="161" column="35" selection-start-line="161" selection-start-column="35" selection-end-line="161" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="384">
+          <caret line="99" column="5" lean-forward="true" selection-start-line="99" selection-start-column="5" selection-end-line="99" selection-end-column="5" />
+        </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="362">
+          <caret line="340" column="35" selection-start-line="340" selection-start-column="35" selection-end-line="340" selection-end-column="35" />
+          <folding>
+            <element signature="method#addInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPersonInPg#0;class#PgInPgPersonRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-606">
+          <caret line="76" column="20" lean-forward="true" selection-start-line="76" selection-start-column="20" selection-end-line="76" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="65" column="35" selection-start-line="65" selection-start-column="35" selection-end-line="65" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="101" column="35" selection-start-line="101" selection-start-column="35" selection-end-line="101" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="84" column="35" selection-start-line="84" selection-start-column="35" selection-end-line="84" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="59" lean-forward="true" selection-start-line="59" selection-end-line="59" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="60" column="1" lean-forward="true" selection-start-line="60" selection-start-column="1" selection-end-line="60" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="145" column="35" selection-start-line="145" selection-start-column="35" selection-end-line="145" selection-end-column="35" />
+        </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="274">
+          <caret line="350" column="35" selection-start-line="350" selection-start-column="35" selection-end-line="350" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="121" column="39" selection-start-line="121" selection-start-column="39" selection-end-line="121" selection-end-column="39" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="28" column="8" lean-forward="true" selection-start-line="28" selection-start-column="8" selection-end-line="28" selection-end-column="8" />
+        <state relative-caret-position="340">
+          <caret line="103" selection-start-line="103" selection-end-line="103" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="226" column="35" selection-start-line="226" selection-start-column="35" selection-end-line="226" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="203" column="35" selection-start-line="203" selection-start-column="35" selection-end-line="203" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="241" column="35" selection-start-line="241" selection-start-column="35" selection-end-line="241" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="225" column="1" lean-forward="true" selection-start-line="225" selection-start-column="1" selection-end-line="225" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="176" column="5" lean-forward="true" selection-start-line="176" selection-start-column="5" selection-end-line="176" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="178" column="35" lean-forward="true" selection-start-line="178" selection-start-column="35" selection-end-line="178" selection-end-column="35" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="516">
-          <caret line="94" column="53" selection-start-line="94" selection-start-column="53" selection-end-line="94" selection-end-column="53" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="814">
-          <caret line="52" column="9" lean-forward="true" selection-start-line="52" selection-start-column="9" selection-end-line="52" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="182">
-          <caret line="58" column="12" lean-forward="true" selection-start-line="58" selection-start-column="12" selection-end-line="58" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="34" lean-forward="true" selection-start-line="34" selection-end-line="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="32" lean-forward="true" selection-start-line="32" selection-end-line="32" />
-          <folding>
-            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
-            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="185">
-          <caret line="63" column="13" selection-start-line="63" selection-start-column="13" selection-end-line="63" selection-end-column="13" />
-          <folding>
-            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
-            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
-            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="e#6319#6324#0" />
-            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
-          </folding>
+          <caret line="240" lean-forward="true" selection-start-line="240" selection-end-line="240" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
-          <caret line="58" column="28" lean-forward="true" selection-start-line="58" selection-start-column="28" selection-end-line="58" selection-end-column="28" />
-          <folding>
-            <element signature="method#addTempHumData#0;class#PgTempHumRs#0" />
-          </folding>
+        <state relative-caret-position="340">
+          <caret line="148" column="34" selection-start-line="148" selection-start-column="34" selection-end-line="148" selection-end-column="34" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
+        <state relative-caret-position="458">
+          <caret line="99" column="35" selection-start-line="99" selection-start-column="35" selection-end-line="99" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+        <state relative-caret-position="384">
+          <caret line="145" column="32" lean-forward="true" selection-start-line="145" selection-start-column="32" selection-end-line="145" selection-end-column="32" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="414">
-          <caret line="22" column="46" lean-forward="true" selection-start-line="22" selection-start-column="46" selection-end-line="22" selection-end-column="46" />
-        </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="396">
-          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" column="83" selection-start-line="11" selection-start-column="83" selection-end-line="11" selection-end-column="83" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="26">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
-          <folding>
-            <element signature="method#getPgInPgStatusByPerson#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNumByName#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNum#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPersonListByDay#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPgStatusByPgInPgPerson#0;class#PgInPgStatusManager#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="44">
-          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-12">
-          <caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="87" lean-forward="true" selection-start-line="87" selection-end-line="87" />
-          <folding>
-            <element signature="method#getConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#addConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#deleteConstructionType#0;class#PgConstructionTypeRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
-          <folding>
-            <element signature="method#getConstructionTypeByType#0;class#PgConstructionTypeManager#0" />
-            <element signature="method#getAllConstructionTypeDto#0;class#PgConstructionTypeManager#0" />
-          </folding>
-        </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="145">
-          <caret line="258" column="9" lean-forward="true" selection-start-line="258" selection-start-column="9" selection-end-line="258" selection-end-column="9" />
-          <folding>
-            <element signature="method#getMonthInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayInPgStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgOverViewRs#0" />
-            <element signature="method#getAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getMonthAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayAlarmStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgOverViewRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="103">
-          <caret line="105" column="50" lean-forward="true" selection-start-line="105" selection-start-column="50" selection-end-line="105" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateBasicDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="99">
-          <caret line="125" selection-start-line="125" selection-end-line="125" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="190">
-          <caret line="24" column="35" lean-forward="true" selection-start-line="24" selection-start-column="35" selection-end-line="24" selection-end-column="35" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="436">
-          <caret line="24" lean-forward="true" selection-start-line="24" selection-end-line="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" lean-forward="true" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="300">
-          <caret line="34" column="31" lean-forward="true" selection-start-line="34" selection-start-column="31" selection-end-line="34" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="42" column="13" lean-forward="true" selection-start-line="42" selection-start-column="13" selection-end-line="42" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="120" column="72" lean-forward="true" selection-start-line="120" selection-start-column="72" selection-end-line="120" selection-end-column="72" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="293">
-          <caret line="58" column="73" lean-forward="true" selection-start-line="58" selection-start-column="73" selection-end-line="58" selection-end-column="73" />
-          <folding>
-            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
-            <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
-          </folding>
-        </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="307">
-          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
+        <state relative-caret-position="758">
+          <caret line="130" column="5" lean-forward="true" selection-start-line="130" selection-start-column="5" selection-end-line="130" selection-end-column="5" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1170">
-          <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
+        <state relative-caret-position="494">
+          <caret line="86" column="62" lean-forward="true" selection-start-line="86" selection-start-column="62" selection-end-line="86" selection-end-column="62" />
           <folding>
-            <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-            <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+            <element signature="method#getAllDevice#0;class#PgDeviceManager#0" />
+            <element signature="method#getAllDev#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="195" column="28" lean-forward="true" selection-start-line="195" selection-start-column="28" selection-end-line="195" selection-end-column="28" />
+        <state relative-caret-position="166">
+          <caret line="174" column="13" lean-forward="true" selection-start-line="174" selection-start-column="13" selection-end-line="174" selection-end-column="13" />
           <folding>
-            <element signature="method#getAlarmByTypeAndTime#0;class#PgAlarmManager#0" />
-            <element signature="method#getAlarmNum#0;class#PgAlarmManager#0" />
             <element signature="method#getDayAlarmStatistic#0;class#PgAlarmManager#0" />
+            <element signature="method#getAlarmList#0;class#PgAlarmManager#0" />
             <element signature="method#createDTO#0;class#PgAlarmManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="364">
+          <caret line="46" column="56" lean-forward="true" selection-start-line="46" selection-start-column="56" selection-end-line="46" selection-end-column="56" />
+          <folding>
+            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
+            <element signature="method#getPgDev#0;class#PgDeviceRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
+            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+        <state relative-caret-position="396">
+          <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
           <folding>
             <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
             <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -1365,52 +1331,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="239">
-          <caret line="21" column="33" lean-forward="true" selection-start-line="21" selection-start-column="33" selection-end-line="21" selection-end-column="33" />
-        </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="352">
-          <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-        </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="99">
-          <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-          </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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-          <folding>
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-            <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>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
index c436c93..e913155 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
@@ -132,7 +132,10 @@
             this.setAlarmType("");
         else
             this.setAlarmType(pgAlarm.getAlarmTypeId().getAlarmType());
-        this.setAlarmValue(pgAlarm.getAlarmValue());
+        if(pgAlarm.getAlarmValue()==null)
+            this.setAlarmValue("");
+        else
+            this.setAlarmValue(pgAlarm.getAlarmValue());
         if (pgAlarm.getAlarmDate() != null)
             this.setAlarmDate(sdf.format(pgAlarm.getAlarmDate()));
         else
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
index a43965c..565cb41 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -159,11 +159,21 @@
     }
 
     //获取历史报警消息列表
-    public List<PgAlarmDto> getAllAlarm(String alarmType,String startDay,String endDay,String isNew,int page,int rows) {
-        try {
+    public  Map<String, Object> getAllAlarm(String alarmType,String partition,String startDay,String endDay,String isNew,int page,int rows) {
 
+        Map<String, Object> resultMap = new HashMap<>();
+        String msg="";
+
+        try {
             Criteria criteria = createCriteria(PgAlarm.class);
 
+            if (StringUtils.isNotBlank(partition)) {
+                DetachedCriteria inCriteria = DetachedCriteria.forClass(PgDevice.class);
+                inCriteria.add(Restrictions.eq("partition", partition));
+                inCriteria.setProjection(Property.forName("id"));
+                criteria.add(Property.forName("alarmDevId").in(inCriteria));
+            }
+
             if (StringUtils.isNotBlank(alarmType)&&!alarmType.contains("全部")&&pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
                 criteria.add(Restrictions.eq("alarmTypeId", pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)));
 
@@ -190,8 +200,16 @@
             for (PgAlarm pgAlarm : pgAlarmList) {
                 pgAlarmDtoList.add(new PgAlarmDto(pgAlarm));
             }
-
-            return pgAlarmDtoList;
+            if(pgAlarmDtoList==null||pgAlarmDtoList.size()==0) {
+                resultMap.put("msg", "没有报警信息");
+                resultMap.put("code","0");
+            }else {
+                resultMap.put("code","200");
+                resultMap.put("msg", "报警信息获取成功");
+            }
+            resultMap.put("count",pg.getTotalCount());
+            resultMap.put("result",pgAlarmDtoList);
+            return resultMap;
         }
         catch(Exception ex){
             ex.printStackTrace();
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index 7547560..654f49e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -24,11 +24,11 @@
 
         Criteria criteria = createCriteria(PgDevice.class);
 
-        if(road!=null)
+        if(StringUtils.isNotBlank(road))
             criteria.add(Restrictions.eq("road",road));
-        if(partition!=null)
+        if(StringUtils.isNotBlank(partition))
             criteria.add(Restrictions.eq("partition",partition));
-        if(devType!=null)
+        if(StringUtils.isNotBlank(devType))
             criteria.add(Restrictions.eq("devType",devType));
 
         criteria.add(Restrictions.eq("active", 1));
@@ -43,6 +43,29 @@
         return pgDeviceDtoList;
     }
 
+    public List<PgDeviceDto> getAllDev(String road,String partition,String devType) {
+
+        Criteria criteria = createCriteria(PgDevice.class);
+
+        if(StringUtils.isNotBlank(road))
+            criteria.add(Restrictions.eq("road",road));
+        if(StringUtils.isNotBlank(partition))
+            criteria.add(Restrictions.eq("partition",partition));
+        if(StringUtils.isNotBlank(devType))
+            criteria.add(Restrictions.like("devType","%"+devType+"%"));
+
+        criteria.add(Restrictions.eq("active", 1));
+        criteria.addOrder(Order.desc("id"));
+        List<PgDevice> pgDeviceList = criteria.list();
+
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
+        for (PgDevice pgDevice : pgDeviceList) {
+            pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
+        }
+
+        return pgDeviceDtoList;
+    }
+
     //根据名字获取当前设备
     public PgDevice getDeviceByAssetCode(String assetCode) {
         Criteria criteria=createCriteria(PgDevice.class);
@@ -56,9 +79,9 @@
     }
 
     //根据类型获取设备列表
-    public List<PgDeviceDto> getDeviceByDevTypee(String devType) {
+    public List<PgDeviceDto> getDeviceByDevType(String devType) {
         Criteria criteria=createCriteria(PgDevice.class);
-        criteria.add(Restrictions.eq("devType",devType));
+        criteria.add(Restrictions.like("devType","%"+devType+"%"));
 
         List<PgDevice> pgDeviceList=criteria.list();
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
@@ -106,7 +129,7 @@
         criteria.add(Restrictions.eq("partition",partition));
 
         List<PgDevice> pgDeviceList=criteria.list();
-        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<PgDeviceDto>();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
 
         for (PgDevice pgDevice : pgDeviceList) {
             pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
index 3a3bccd..595730e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
@@ -1,10 +1,13 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.devTable.domain.PgAlarmType;
 import com.casic.PgInterface.devTable.domain.PgPartition;
 import com.casic.PgInterface.devTable.domain.PgRoad;
 import com.casic.PgInterface.devTable.domain.PipeGallery;
 import com.casic.PgInterface.devTable.dto.PgPartitionDto;
+import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
@@ -12,7 +15,9 @@
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Created by yxw on 2017/11/4.
@@ -21,7 +26,8 @@
 public class PgPartitionManager extends HibernateEntityDao<PgPartition> {
 
     @Resource
-    PgRoadManager pgRoadManager;
+    private PgRoadManager pgRoadManager;
+
 
     public PgPartition getPartitionByParName(String parName) {
         Criteria criteria = getSession().createCriteria(PgPartition.class);
@@ -99,4 +105,5 @@
         return pgPartitionDtoList;
     }
 
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
index f216360..a6928f1 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
@@ -5,6 +5,7 @@
 public class PgPlanResultRe {
 
     private String taskKey;
+    private List<String> pileAcuList;
     private List<PgPlanResult> pgPlanResultList;
 
     public String getTaskKey() {
@@ -15,6 +16,14 @@
         this.taskKey = taskKey;
     }
 
+    public List<String> getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(List<String> pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+
     public List<PgPlanResult> getPgPlanResultList() {
         return pgPlanResultList;
     }
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
index 71ea765..47eea07 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
@@ -54,9 +54,7 @@
 
         List<PgLineHole> pgLineHoleList=criteria.list();
         List<PgLineHoleDTO> pgLineHoleDTOList=new ArrayList<>();
-        if(pgLineHoleList==null||pgLineHoleList.size()==0)
-            return null;
-        else
+        if(pgLineHoleList!=null&&pgLineHoleList.size()!=0)
             pgLineHoleDTOList=PgLineHoleDTO.ConvertToDTOList(pgLineHoleList,pgPileAcuManager,pgRoadManager);
         return pgLineHoleDTOList;
     }
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
index 0fd9e1f..841a386 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
@@ -1,12 +1,15 @@
 package com.casic.PgInterface.intelPlan.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.devTable.domain.PgPartition;
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
 import com.casic.PgInterface.intelPlan.domain.PgLineHole;
 import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
 import com.casic.PgInterface.intelPlan.domain.PgSection;
 import com.casic.PgInterface.intelPlan.dto.PgPlanResult;
 import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
 import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -22,6 +25,9 @@
     @Resource
     private PgLineHoleManager pgLineHoleManager;
 
+    @Resource
+    private PgRoadManager pgRoadManager;
+
     public PgPileAcu getPgPileAcuByCode(String acuCode){
         List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
 
@@ -58,7 +64,9 @@
         for(PgPlanTask pgPlanTask:pgPlanTaskList){
             List<PgPlanResult> pgPlanResultList=getPgPlanResultByPlantask(pgPlanTask);
             PgPlanResultRe pgPlanResultRe=new PgPlanResultRe();
+
             pgPlanResultRe.setTaskKey(pgPlanTask.getTaskKey());
+            pgPlanResultRe.setPileAcuList(pgPlanTask.getPileAcuList());
             pgPlanResultRe.setPgPlanResultList(pgPlanResultList);
 
             pgPlanResultReList.add(pgPlanResultRe);
@@ -142,4 +150,57 @@
         return length;
     }
 
+    private PgPileAcu getPgPileAcuByAcuCode(String acuCode){
+        List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
+
+        if(pgPileAcuList==null||pgPileAcuList.size()==0)
+            return null;
+        else
+            return pgPileAcuList.get(0);
+    }
+
+    public List<PgAcuTask> getACUTask(String pileAcuList){
+        String[] acuArray=pileAcuList.split(",");
+        List<PgAcuTask> pgAcuTaskList=new ArrayList<>();
+
+        for(String acu:acuArray){
+            PgPileAcu pgPileAcu=this.getPgPileAcuByCode(acu);
+            String roadName=pgRoadManager.get(pgPileAcu.getRoadId()).getRoadName();
+
+            if(!containRoad(roadName,pgAcuTaskList))
+            {
+                PgAcuTask pgAcuTask=new PgAcuTask();
+                pgAcuTask.setRoadName(roadName);
+                pgAcuTask.setPileAcuList(acu);
+                pgAcuTaskList.add(pgAcuTask);
+            }
+            else{
+                PgAcuTask pgAcuTask=getIndexRoad(roadName,pgAcuTaskList);
+                if(pgAcuTask!=null)
+                    pgAcuTask.setPileAcuList(pgAcuTask.getPileAcuList()+","+acu);
+            }
+        }
+
+        return pgAcuTaskList;
+    }
+
+    private boolean containRoad(String roadName,List<PgAcuTask> pgAcuTaskList){
+        if(pgAcuTaskList==null||pgAcuTaskList.size()==0) return false;
+        for(PgAcuTask pgAcuTask:pgAcuTaskList){
+            if(pgAcuTask.getRoadName().equals(roadName))
+                return true;
+        }
+
+        return false;
+    }
+
+    private PgAcuTask getIndexRoad(String roadName, List<PgAcuTask> pgAcuTaskList){
+        for(PgAcuTask pgAcuTask:pgAcuTaskList){
+            if(pgAcuTask.getRoadName().equals(roadName))
+                return pgAcuTask;
+        }
+
+        return null;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java
new file mode 100644
index 0000000..323f7ef
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java
@@ -0,0 +1,25 @@
+package com.casic.PgInterface.reservePlan.dto;
+
+import java.util.List;
+
+public class PgAcuTask {
+
+    private String roadName;//道路
+    private String pileAcuList;//acu分区
+
+    public String getRoadName() {
+        return roadName;
+    }
+
+    public void setRoadName(String roadName) {
+        this.roadName = roadName;
+    }
+
+    public String getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(String pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
index c25e926..c7d7693 100644
--- a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
@@ -70,9 +70,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(Long.valueOf(inPgPersonId));
         PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("hostName",pgInPgPerson.getAssetCode());
-//        PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode());
-//        long maxId = pgTagPositionManager.getMaxId(pgTagMac.getTagMac());
-//        PGTagPosition pgTagPosition = pgTagPositionManager.get(maxId);
+
         PGTagPosition pgTagPosition = tagmacRun.GetTagStatus(pgTagMac);
         boolean bExist = false;
         bExist = pgTagPositionManager.findTagPosition(pgTagPosition.getPositionUpdatetime(),pgTagPosition.getHostId());
@@ -104,8 +102,7 @@
         PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(Long.valueOf(inPgPersonId));
         PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pgInPgPersonId",pgInPgPerson);
         System.out.println("time:"+pgInPgStatus.getInTime());
-//        PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pgInPgPersonId",inPgPersonId);
-//        PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode());
+
         PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("hostName",pgInPgPerson.getAssetCode());
 
         Map<Object,Object> mapPosition = new HashMap<>();
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
index 082ba5d..3eed00a 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
@@ -48,6 +48,7 @@
     public Map<String, Object> linkDevice(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         PgDeviceDto pgDeviceDto = null;
         try {
@@ -62,6 +63,7 @@
                     else {
                         pgDeviceDto = new PgDeviceDto(pgDevice);
                         msg = "报警关联设备获取成功";
+                        code="200";
                     }
                 }
             }
@@ -71,6 +73,7 @@
             e.printStackTrace();
             msg = "获取关联设备失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceDto);
 
@@ -86,6 +89,7 @@
     public Map<String, Object> linkPartitionCamera(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
         try {
@@ -106,6 +110,7 @@
 
                         pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(partition,position);
                         msg = "关联设备获取成功";
+                        code="200";
                     }
                 }
             }
@@ -115,6 +120,7 @@
             e.printStackTrace();
             msg = "分区设备关联失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceDtoList);
         return resultMap;
@@ -129,6 +135,7 @@
     public Map<String, Object> linkReservePlan(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgReservePlanDto> pgReservePlanDtoList=new ArrayList<>();
         try{
@@ -139,10 +146,12 @@
                 else {
                     pgReservePlanDtoList = pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
 
-                    if(pgReservePlanDtoList==null||pgReservePlanDtoList.size()==0)
-                        msg="不存在关联的报警预案";
-                    else
+                    if (pgReservePlanDtoList == null || pgReservePlanDtoList.size() == 0)
+                        msg = "不存在关联的报警预案";
+                    else {
                         msg = "关联预案获取成功";
+                        code="200";
+                    }
                 }
             }
             else
@@ -153,6 +162,7 @@
             e.printStackTrace();
             msg="预案关联失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgReservePlanDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
index 0ddbc4d..0ce886b 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
@@ -41,25 +41,19 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getAlarmList(@FormParam("alarmType") String alarmType,
                                             @FormParam("startDay") String startDay,
+                                            @FormParam("partition") String partition,
                                             @FormParam("endDay") String endDay,
                                             @FormParam("isNew") String isNew,
                                             @FormParam("page") int page,
                                             @FormParam("rows") int rows) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
         try {
-            pgAlarmDtoList = pgAlarmManager.getAllAlarm(alarmType,startDay,endDay,isNew,page,rows);
-            if (pgAlarmDtoList==null||pgAlarmDtoList.size() == 0)
-                msg = "没有报警信息";
-            else
-                msg = "报警信息获取成功";
+            resultMap = pgAlarmManager.getAllAlarm(alarmType,partition,startDay,endDay,isNew,page,rows);
+
         } catch (Exception e) {
             e.printStackTrace();
-            msg = "报警信息获取失败";
         }
-        resultMap.put("msg", msg);
-        resultMap.put("result", pgAlarmDtoList);
         return resultMap;
     }
 
@@ -71,9 +65,10 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> clearAlarmList(@FormParam("id") String id) throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        String result = "false";
+        String result = "";
+        String code="0";
 
         try {
             PgAlarm pgAlarm = new PgAlarm();
@@ -86,12 +81,14 @@
                 pgAlarmManager.save(pgAlarm);
                 msg = "报警信息清除成功";
                 result = "true";
+                code = "200";
             }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警信息清除失败";
             result = "false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
@@ -106,21 +103,26 @@
     public Map<String, Object> getAlarmByTypeOrTime(@FormParam("alarmType") String alarmType,
                                                     @FormParam("startTime") String startTime,
                                                     @FormParam("endTime") String endTime) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
-        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<PgAlarmDto>();
+        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
         try {
             pgAlarmDtoList = pgAlarmManager.getAlarmByTypeAndTime(alarmType, startTime, endTime);
             if (pgAlarmDtoList == null || pgAlarmDtoList.size() == 0)
                 msg = "报警信息不存在";
             else
+            {
                 msg = "报警信息获取成功";
+                code="200";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警信息获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
index 29ce8a4..ed0bf34 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
@@ -39,8 +39,8 @@
     public Map<String, Object> getAlarmRule(@FormParam("devType") String devType) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
-        System.out.println("devType:"+devType);
         List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<>();
         try {
             pgAlarmRuleDtoList = pgAlarmRuleManager.getAlarmRuleDto(devType);
@@ -52,6 +52,7 @@
             e.printStackTrace();
             msg = "报警阈值信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmRuleDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
index 24ab894..abef1b1 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
@@ -39,16 +39,21 @@
                                                      @FormParam("endDate") String endDate)throws Exception{
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
+
         List<PgAlarmTjDto> pgAlarmTjDtoList=null;
         try{
             pgAlarmTjDtoList=pgAlarmTjManager.getAlarmTjResultByType(startDate,endDate);
             msg="获取成功";
+            code="200";
         }
         catch(Exception ex) {
             msg = "统计失败";
         }
-        resultMap.put("result",pgAlarmTjDtoList);
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
+        resultMap.put("result",pgAlarmTjDtoList);
+
         return resultMap;
     }
 
@@ -61,23 +66,27 @@
     public Map<String, Object> getAlarmByTime(@FormParam("startTime") String startTime,
                                               @FormParam("endTime") String endTime,
                                               @FormParam("statisticType") String statisticType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code = "0";
 
-        List<PgAlarmTjDto> pgAlarmTjDtoList = new ArrayList<PgAlarmTjDto>();
+        List<PgAlarmTjDto> pgAlarmTjDtoList = new ArrayList<>();
         try {
             pgAlarmTjDtoList = pgAlarmTjManager.getAlarmByTime(startTime, endTime, statisticType);
             if(pgAlarmTjDtoList==null)
                 msg="报警统计信息获取失败";
-            else
-                msg="报警统计信息获取成功";
+            else {
+                msg = "报警统计信息获取成功";
+                code="200";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警统计信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmTjDtoList);
         return resultMap;
     }
 
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
index 28bc811..b6278a9 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
@@ -30,7 +30,6 @@
     @Resource
     private PgAlarmTypeManager pgAlarmTypeManager;
 
-
     /**
      * 获取报警类型
      */
@@ -38,19 +37,24 @@
     @Path("getAlarmType")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getAlarmTypeList()throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
-        List<PgAlarmTypeDto> pgAlarmTypeDtoList=new ArrayList<PgAlarmTypeDto>();
+        String code="";
+
+        List<PgAlarmTypeDto> pgAlarmTypeDtoList=new ArrayList<>();
         try {
             pgAlarmTypeDtoList = pgAlarmTypeManager.getAllAlarmTypeDto();
             if(pgAlarmTypeDtoList.size()==0)
                 msg="没有报警类型信息";
-            else
-                msg="报警类型信息获取成功";
+            else {
+                code="200";
+                msg = "报警类型信息获取成功";
+            }
         }catch(Exception e){
             e.printStackTrace();
             msg="报警类型信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAlarmTypeDtoList);
         return resultMap;
@@ -66,6 +70,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
@@ -83,6 +88,7 @@
                 logger.info("成功保存");
                 result = "true";
                 msg = "保存成功";
+                code="200";
             }
         } catch (Exception e) {
             result = "false";
@@ -90,6 +96,7 @@
             e.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -106,6 +113,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try{
             if(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
@@ -119,6 +127,7 @@
                 pgAlarmTypeManager.save(pgAlarmType);
                 result = "true";
                 msg = "编辑成功";
+                code="200";
             }
         }
         catch(Exception e)
@@ -128,6 +137,7 @@
             e.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("result",result);
         resultMap.put("msg",msg);
 
@@ -146,6 +156,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
         String result="false";
+        String code="0";
 
         try {
             PgAlarmType pgAlarmType=pgAlarmTypeManager.get(Long.valueOf(id));
@@ -157,6 +168,7 @@
             {
                 pgAlarmType.setActive(0);
                 pgAlarmTypeManager.save(pgAlarmType);
+                code="200";
                 msg="报警类型删除成功";
                 result="true";
             }
@@ -165,6 +177,7 @@
             msg="报警类型删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
index 4533e1a..85940bb 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
@@ -33,12 +33,15 @@
                                                  @FormParam("inSpectionPlace") String inSpectionPlace){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
         List<PgAssetPlanDto> pgAssetPlanDtoList=new ArrayList<>();
         try{
             pgAssetPlanDtoList=pgAssetPlanManager.getPgAssetPlanDtoList(startDay,endDay,inSpectionPlace);
-            if(pgAssetPlanDtoList!=null&&pgAssetPlanDtoList.size()!=0)
-                msg="巡检信息获取成功";
+            if(pgAssetPlanDtoList!=null&&pgAssetPlanDtoList.size()!=0) {
+                code="200";
+                msg = "巡检信息获取成功";
+            }
             else
                 msg="不存在巡检信息";
         }
@@ -47,6 +50,7 @@
             msg="巡检信息获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAssetPlanDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
index 47ef9d1..5cbdfcb 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
@@ -30,12 +30,15 @@
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
         String result="";
+        String code="0";
 
         List<PgAssetPlanStatic> pgAssetPlanStaticList = null;
         try{
             pgAssetPlanStaticList=pgAssetPlanManager.getPgAssetPlanStaticLisByTime(startTime,endTime,staticType);
-            if(pgAssetPlanStaticList!=null&&pgAssetPlanStaticList.size()!=0)
-                msg="巡检统计信息获取成功";
+            if(pgAssetPlanStaticList!=null&&pgAssetPlanStaticList.size()!=0) {
+                code = "200";
+                msg = "巡检统计信息获取成功";
+            }
             else
                 msg="统计信息获取失败";
         }
@@ -44,6 +47,7 @@
             msg="统计失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAssetPlanStaticList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
index 26f5d6a..503bfe3 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
@@ -40,6 +40,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="";
 
         try{
             PgAuthority pgAuthority=new PgAuthority();
@@ -50,6 +51,7 @@
 
             pgAuthorityManager.save(pgAuthority);
             msg="用户权限保存成功";
+            code="200";
             result="true";
         }
         catch(Exception e) {
@@ -57,6 +59,7 @@
             msg = "新增权限失败";
             result = "false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -65,22 +68,25 @@
 
     /*
        *编辑角权限信息
-        */
+    */
     @POST
     @Path("editAuthority")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> editAuthority(@FormParam("id") String id,
                                        @FormParam("authority") String authority,
                                        @FormParam("concent") String concent) throws Exception{
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
+
         try {
             PgAuthority pgAuthority=pgAuthorityManager.get(Long.valueOf(id));
             pgAuthority.setAuthority(authority);
             pgAuthority.setConcent(concent);
 
             pgAuthorityManager.save(pgAuthority);
+            code="200";
             msg="权限保存成功";
             result="true";
         }
@@ -90,7 +96,7 @@
             msg="权限编辑失败";
             result="false";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -105,9 +111,10 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> deleteAuthority(@FormParam("id") String id)throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
-        String result="false";
+        String result="";
+        String code="0";
 
         try {
             PgAuthority pgAuthority= pgAuthorityManager.get(Long.valueOf(id));
@@ -119,6 +126,7 @@
             {
                 pgAuthority.setActive(0);
                 pgAuthorityManager.save(pgAuthority);
+                code="200";
                 msg="删除权限成功";
                 result="true";
             }
@@ -127,37 +135,40 @@
             msg="删除权限失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
     }
 
     /*
-* 获取权限信息
- */
+    * 获取权限信息
+    */
     @POST
     @Path("getAuthorityList")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> getAuthorityList() {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgAuthorityDto> pgAuthorityDtoList = new ArrayList<PgAuthorityDto>();
         try {
             pgAuthorityDtoList = pgAuthorityManager.getAuthorityList();
             if (pgAuthorityDtoList == null)
                 msg = "不存在权限信息";
-            else
+            else {
+                code = "200";
                 msg = "权限信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "权限信息获取是失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAuthorityDtoList);
         return resultMap;
     }
 
 
-
-
 }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
index a9ef521..a74ecc7 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
@@ -45,6 +45,7 @@
                                                @FormParam("endDate") String endDate)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgHistoryDataDto> pgHistoryDataDtoList=new ArrayList<>();
 
         try {
@@ -55,13 +56,16 @@
                 pgHistoryDataDtoList=pgCh4Manager.getAllCH4Data(pgDevice,startDate,endDate);
                 if(pgHistoryDataDtoList==null)
                     msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+                else {
+                    code = "200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgHistoryDataDtoList);
         return resultMap;
@@ -75,8 +79,9 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getNewestCh4InfoByDev(@FormParam("assetCode") String assetCode)throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
+        String code="0";
         PgCh4Dto pgCh4Dto=new PgCh4Dto(null);
 
         try {
@@ -87,13 +92,17 @@
                 pgCh4Dto=pgCh4Manager.getNewestCH4Data(pgDevice);
                 if(pgCh4Dto==null)
                     msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgCh4Dto);
         return resultMap;
@@ -111,6 +120,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
@@ -127,6 +137,7 @@
                 pgCh4.setPgDeviceId(pgDevice);
 
                 pgCh4Manager.save(pgCh4);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -135,7 +146,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
index a7eac39..dfc8ca5 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
@@ -43,23 +43,27 @@
                                                       @FormParam("endDate") String endDate)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgHistoryDataDto> pgHistoryDataDtoList=new ArrayList<>();
 
         try {
             PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
                 msg="设备不存在";
-            else{
-                pgHistoryDataDtoList=pgCoManager.getAllCoData(pgDevice, startDate, endDate);
-                if(pgHistoryDataDtoList==null)
-                    msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+            else {
+                pgHistoryDataDtoList = pgCoManager.getAllCoData(pgDevice, startDate, endDate);
+                if (pgHistoryDataDtoList == null)
+                    msg = "没有满足要求的数据";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgHistoryDataDtoList);
         return resultMap;
@@ -75,6 +79,7 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         PgCoDto pgCoDto=new PgCoDto(null);
 
         try {
@@ -85,13 +90,16 @@
                 pgCoDto=pgCoManager.getNewestCoData(pgDevice);
                 if(pgCoDto==null)
                     msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgCoDto);
         return resultMap;
@@ -110,6 +118,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         try {
@@ -126,6 +135,7 @@
 
                 pgCoManager.save(pgCo);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
         } catch (Exception e) {
@@ -133,7 +143,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
index b4b826e..9af98a3 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
@@ -60,6 +60,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         try {
 
@@ -80,8 +81,8 @@
                 pgConstruction.setPgConstructionTypeId(pgConstructionType.getId());
                 pgConstruction.setActive(1);
                 pgConstruction.setParName(parName);
-                logger.info("保存成功");
                 pgConstructionManager.save(pgConstruction);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -90,6 +91,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("success", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -116,6 +118,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
@@ -140,6 +143,7 @@
                 pgConstruction.setParName(parName);
 
                 pgConstructionManager.save(pgConstruction);
+                code="200";
                 result = "true";
                 msg = "编辑成功";
             }
@@ -150,7 +154,7 @@
             e.printStackTrace();
 
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -167,6 +171,8 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
+
         try {
             PgConstruction pgConstruction = pgConstructionManager.get(Long.valueOf(id));
             if (pgConstruction == null)
@@ -177,6 +183,7 @@
             {
                 pgConstruction.setActive(0);
                 pgConstructionManager.save(pgConstruction);
+                code="200";
                 result = "true";
                 msg = "成功删除信息";
             }
@@ -185,6 +192,7 @@
             result = "false";
             msg = "删除失败";
         }
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -204,9 +212,11 @@
                                                   @FormParam("rows") int rows)throws Exception{
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
         List<PgConstructionDto> pgConstructionDtoList=new ArrayList<>();
         try{
             pgConstructionDtoList=pgConstructionManager.getPgContructionDto(cs_name,cs_type,startTime,endTime,page,rows);
+            code="200";
             msg="信息获取成功";
         }
         catch(Exception e)
@@ -214,6 +224,7 @@
             e.printStackTrace();
             msg="查询失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
 
@@ -231,18 +242,22 @@
                                                               @FormParam("statisticType") String statisticType) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgConstructionStiatistic> pgConstructionStiatisticList=new ArrayList<>();
         try {
             pgConstructionStiatisticList = pgConstructionManager.getConstructionByTimeAndStatus(startTime, endTime, statisticType);
             if(pgConstructionStiatisticList==null)
                 msg="施工统计信息获取失败";
-            else
-                msg="施工统计信息获取成功";
+            else {
+                code="200";
+                msg = "施工统计信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "施工统计信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgConstructionStiatisticList);
         return resultMap;
@@ -257,6 +272,7 @@
     public Map<String, Object> getConstructionByType(@FormParam("statisticType") String statisticType){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
         List<PgConstructionStiatistic> pgConstructionStiatisticList=new ArrayList<>();
 
         try{
@@ -268,6 +284,7 @@
                 resultMap.put("result",null);
             }
             else {
+                code="200";
                 msg = "统计信息获取成功";
                 resultMap.put("result", pgConstructionStiatisticList);
             }
@@ -278,6 +295,7 @@
             msg="统计失败";
             resultMap.put("result",null);
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         return resultMap;
     }
@@ -291,9 +309,11 @@
     public Map<String, Object> getConstructionToday() throws Exception{
         Map<String,Object> resultMap=new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgConstructionDto> pgConstructionDtoList=new ArrayList<PgConstructionDto>();
         try {
             pgConstructionDtoList = pgConstructionManager.getConstructionToday();
+            code="200";
             msg = "当天施工信息获取成功";
         }
         catch(Exception e)
@@ -301,7 +321,7 @@
             e.printStackTrace();
             msg="获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
         return resultMap;
@@ -316,6 +336,7 @@
     public Map<String, Object> getConstructionDev(@FormParam("id") String id) throws Exception{
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
         List<PgDeviceDto> pgDeviceDtoList =new ArrayList<>();
         try{
@@ -325,14 +346,17 @@
 
             if(pgDeviceDtoList==null)
                 msg="信息获取失败";
-            else
-                msg="信息获取成功";
+            else {
+                code="200";
+                msg = "信息获取成功";
+            }
         }
         catch(Exception e)
         {
             e.printStackTrace();
-            msg="设备信息获取成功";
+            msg="信息获取是被";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgDeviceDtoList);
 
@@ -346,17 +370,21 @@
     @Path("getConstruction")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getConstruction() throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
-        List<PgConstructionDto> pgConstructionDtoList=new ArrayList<PgConstructionDto>();
+        String code="0";
+
+        List<PgConstructionDto> pgConstructionDtoList=new ArrayList<>();
 
         try{
             pgConstructionDtoList=pgConstructionManager.getPgConstructionList();
             if(pgConstructionDtoList==null||pgConstructionDtoList.size()==0)
                 msg="不存在施工记录";
-            else
-                msg="施工信息获取成功";
+            else {
+                code = "200";
+                msg = "施工信息获取成功";
+            }
         }
         catch(Exception e)
         {
@@ -364,6 +392,7 @@
             msg="施工信息获取失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java
index fd3d53e..2019502 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java
@@ -39,12 +39,12 @@
         try {
             pgConstructionTypeDtoList = pgConstructionTypeManager.getAllConstructionTypeDto();
             if (pgConstructionTypeDtoList.size() == 0)
-                msg = "没有项目类型信息";
+                msg = "获取失败";
             else
-                msg = "项目类型获取成功";
+                msg = "获取成功";
         } catch (Exception e) {
             e.printStackTrace();
-            msg = "项目类型信息获取失败";
+            msg = "获取失败";
         }
         resultMap.put("msg", msg);
         resultMap.put("result", pgConstructionTypeDtoList);
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
index 90d001c..037a399 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
@@ -51,6 +51,7 @@
 
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if (StringUtils.isBlank(construct_doc)||StringUtils.isBlank(doc_name))
@@ -65,6 +66,7 @@
             pgCsDocument.setActive(1);
             pgCsDocumentManager.save(pgCsDocument);
 
+            code="200";
             result = "true";
             msg = "保存成功";
 
@@ -74,6 +76,7 @@
             ex.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("success", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -90,6 +93,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             PgCsDocument pgCsDocument = pgCsDocumentManager.get(Long.valueOf(id));
@@ -103,6 +107,7 @@
 
                 pgCsDocumentManager.save(pgCsDocument);
 
+                code="200";
                 result = "true";
                 msg = "编辑成功";
             }
@@ -112,6 +117,7 @@
             msg = "编辑失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -125,9 +131,9 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
         String result="";
+        String code="0";
 
         try{
-
             PgCsDocument pgCsDocument = pgCsDocumentManager.get(Long.valueOf(id));
             if(pgCsDocument==null)
             {
@@ -137,6 +143,7 @@
             else{
                 pgCsDocument.setActive(0);
                 pgCsDocumentManager.save(pgCsDocument);
+                code="200";
                 result="true";
                 msg="删除成功";
             }
@@ -147,7 +154,7 @@
             msg="预案删除失败";
             result="false";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -168,18 +175,21 @@
 
         String msg="";
         String result="";
+        String code="0";
 
         try {
             pgCsDocumentDtoList = pgCsDocumentManager.getAllDocData(cs_name);
-            if (pgCsDocumentDtoList != null)
+            if (pgCsDocumentDtoList != null) {
+                code="200";
                 msg = "获取数据成功";
+            }
             else
                 msg = "没有满足条件的数据";
         }catch (Exception e){
             e.printStackTrace();
             msg = "获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgCsDocumentDtoList);
         return resultMap;
@@ -192,20 +202,22 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
 
         String msg = "";
+        String code="0";
         ResponseEntity<byte[]> path = null;
         try {
             PgCsDocument pgCsDocument = pgCsDocumentManager.get(Long.valueOf(id));
             path = pgCsDocumentManager.downloadFile(pgCsDocument);
             if (path == null)
                 msg = "不存在该文档";
-            else
+            else {
+                code = "200";
                 msg = "下载成功";
-
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "下载失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", path.getBody());
         resultMap.put("msg", msg);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
index 94c5c84..ffc8b95 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
@@ -41,22 +41,24 @@
     public Map<String, Object> getPgDeviceByDevType(@FormParam("devType") String devType) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
         try {
-            pgDeviceDtoList = pgDeviceManager.getDeviceByDevTypee(devType);
+            pgDeviceDtoList = pgDeviceManager.getDeviceByDevType(devType);
             if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0){
                 msg="不存在满足要求的数据";
-                resultMap.put("result",null);
             }
             else{
-                resultMap.put("result", pgDeviceDtoList);
+                code="200";
                 msg = "获取成功";
             }
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", pgDeviceDtoList);
         return resultMap;
     }
 
@@ -69,25 +71,26 @@
     public Map<String, Object> getPgDeviceByAssetCode(@FormParam("assetCode") String assetCode) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         PgDeviceDto pgDeviceDto=null;
         try {
             PgDevice pgDevice = pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
             {
                 msg="不存在设备信息";
-                resultMap.put("result",null);
             }
             else {
                 pgDeviceDto = new PgDeviceDto(pgDevice);
                 msg = "获取成功";
-                resultMap.put("result", pgDeviceDto);
+                code="200";
             }
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", pgDeviceDto);
         return resultMap;
     }
 
@@ -102,27 +105,61 @@
                                              @FormParam("devType") String devType)throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
         try {
             pgDeviceDtoList = pgDeviceManager.getAllDevice(road,partition,devType);
             if(pgDeviceDtoList.size()==0) {
                 msg = "没有找到设备信息";
-                resultMap.put("result",null);
             }
             else {
                 msg = "设备信息获取成功";
-                resultMap.put("result", pgDeviceDtoList);
+                code="200";
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result", pgDeviceDtoList);
         return resultMap;
     }
 
     /**
+     * 显示设备列表
+     */
+    @POST
+    @Path("getPgDev")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String, Object> getPgDev(@FormParam("road") String road,
+                                             @FormParam("partition") String partition,
+                                             @FormParam("devType") String devType)throws Exception {
+        Map<String, Object> resultMap = new HashMap<>();
+        String msg="";
+        String code="0";
+        List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
+        try {
+            pgDeviceDtoList = pgDeviceManager.getAllDev(road,partition,devType);
+            if(pgDeviceDtoList.size()==0) {
+                msg = "没有找到设备信息";
+            }
+            else {
+                code="200";
+                msg = "设备信息获取成功";
+            }
+        }catch(Exception e){
+            e.printStackTrace();
+            msg="设备信息获取失败";
+        }
+        resultMap.put("code",code);
+        resultMap.put("msg",msg);
+        resultMap.put("result", pgDeviceDtoList);
+        return resultMap;
+    }
+
+
+    /**
      * 新增设备
      */
     @POST
@@ -145,6 +182,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if (pgDeviceManager.getDeviceByAssetCode(assetCode)!=null) {
@@ -169,6 +207,7 @@
 
                 pgDeviceManager.save(pgDevice);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
 
@@ -177,10 +216,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -208,14 +246,9 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
-            /*
-            if (pgDeviceManager.getDeviceByAssetCode(assetCode)!=null) {
-                result = "false";
-                msg = "已存在同名设备";
-            } else {
-            */
             PgDevice pgDevice = pgDeviceManager.get(Long.valueOf(id));
             pgDevice.setPipeGallery(pipeGallery);
             pgDevice.setPartition(partition);
@@ -233,14 +266,14 @@
 
             pgDeviceManager.save(pgDevice);
             result = "true";
+            code="200";
             msg = "编辑成功";
-            //}
         } catch (Exception e) {
             result = "false";
             msg = "编辑失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("result",result);
         resultMap.put("msg",msg);
         return resultMap;
@@ -256,7 +289,8 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
-        String result="false";
+        String result="";
+        String code="0";
 
         try {
             PgDevice pgDevice=pgDeviceManager.get(Long.valueOf(id));
@@ -268,6 +302,7 @@
             {
                 pgDevice.setActive(0);
                 pgDeviceManager.save(pgDevice);
+                code="200";
                 msg="设备删除成功";
                 result="true";
             }
@@ -276,6 +311,7 @@
             msg="设备删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -291,18 +327,18 @@
     {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         PgDeviceDto pgDeviceDto=null;
 
         try{
             PgDevice pgDevice=pgDeviceManager.getDeviceBydevCode(devCode);
             if(pgDevice==null) {
                 msg = "设备信息获取失败";
-                resultMap.put("result",null);
             }
             else{
                 pgDeviceDto = new PgDeviceDto(pgDevice);
                 msg = "设备信息获取成功";
-                resultMap.put("result",pgDeviceDto);
+                code="200";
             }
         }
         catch(Exception ex)
@@ -310,8 +346,9 @@
             ex.printStackTrace();
             msg="设备状态获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgDeviceDto);
         return resultMap;
     }
 
@@ -324,17 +361,17 @@
     public Map<String,Object> getDeviceByPartition(@FormParam("partition") String partition) throws Exception{
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<PgDeviceDto>();
 
         try{
             pgDeviceDtoList=pgDeviceManager.getPgDeviceDtoListByPartition(partition);
             if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0) {
                 msg = "设备信息获取失败";
-                resultMap.put("result",null);
             }
             else {
+                code="200";
                 msg = "设备信息获取成功";
-                resultMap.put("result",pgDeviceDtoList);
             }
         }
         catch(Exception e)
@@ -342,8 +379,9 @@
             e.printStackTrace();
             msg="设备信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgDeviceDtoList);
         return resultMap;
     }
 
@@ -353,17 +391,16 @@
     public Map<String,Object> getDeviceByOldDAssetCodeCode(@FormParam("assetCode") String assetCode) throws Exception{
         Map<String, Object> resultMap = new HashMap<>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
 
         try{
             pgDeviceDtoList=pgDeviceManager.getDeviceByOldDAssetCodeCode(assetCode);
-            if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0) {
-                msg = "设备信息获取失败";;
-                resultMap.put("result",null);
-            }
+            if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0)
+                msg = "设备信息获取失败";
             else {
                 msg = "设备信息获取成功";
-                resultMap.put("result",pgDeviceDtoList);
+                code="200";
             }
         }
         catch(Exception e)
@@ -372,8 +409,9 @@
             msg="设备信息获取失败";
             resultMap.put("result",null);
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgDeviceDtoList);
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java
index 421d249..f6f167d 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java
@@ -38,17 +38,21 @@
     public Map<String, Object> getDeviceTpeyList()throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgDeviceTypeDto> pgDeviceTypeDtoList=new ArrayList<PgDeviceTypeDto>();
         try {
             pgDeviceTypeDtoList = pgDeviceTypeManager.getAllDeviceType();
             if(pgDeviceTypeDtoList.size()==0)
                 msg="没有找到设备类型信息";
-            else
-                msg="设备类型信息获取成功";
+            else {
+                code="200";
+                msg = "设备类型信息获取成功";
+            }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备类型信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgDeviceTypeDtoList);
         return resultMap;
@@ -66,6 +70,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if (pgDeviceTypeManager.getDeviceTypeByDeType(devType)!=null) {
@@ -79,6 +84,7 @@
 
                 pgDeviceTypeManager.save(pgDeviceType);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
 
@@ -87,10 +93,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
index c276fb3..c789960 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
@@ -44,6 +44,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 
         try {
@@ -62,6 +63,7 @@
                 pgEquipment.setActive(1);
 
                 pgEquipmentManager.save(pgEquipment);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -70,9 +72,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -89,9 +91,10 @@
                                             @FormParam("ownerUnit") String ownerUnit,
                                             @FormParam("enterDate") String enterDate,
                                             @FormParam("curUser") String curUser) {
-        HashMap<String, Object> resultMap = new HashMap<String, Object>();
+        HashMap<String, Object> resultMap = new HashMap<>();
         String msg = "";
         String result = "";
+        String code="0";
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 
         try {
@@ -111,6 +114,7 @@
                 pgEquipment.setEnterDate(sdf.parse(enterDate));
 
                 pgEquipmentManager.save(pgEquipment);
+                code="200";
                 msg="编辑成功";
                 result="true";
             }
@@ -119,9 +123,9 @@
             result = "false";
             msg = "编辑失败";
         }
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -134,16 +138,19 @@
     public Map<String, Object> getEquipment(@FormParam("eqName") String eqName,
                                             @FormParam("eqCode") String eqCode,
                                             @FormParam("eqType") String eqType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        List<PgEquipmentDto> pgEquipmentDtoList=new ArrayList<PgEquipmentDto>();
+        String code="0";
+        List<PgEquipmentDto> pgEquipmentDtoList=new ArrayList<>();
 
         try{
             pgEquipmentDtoList=pgEquipmentManager.getEquipmentDtiList(eqName,eqCode,eqType);
             if(pgEquipmentDtoList==null||pgEquipmentDtoList.size()==0)
                 msg="不存在工器具记录";
-            else
-                msg="维获取成功";
+            else {
+                code = "200";
+                msg = "维获取成功";
+            }
         }
         catch(Exception e)
         {
@@ -166,6 +173,7 @@
         HashMap<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
         String result = "";
+        String code="";
 
         try {
             PgEquipment pgEquipment=pgEquipmentManager.get(Long.valueOf(id));
@@ -178,6 +186,7 @@
             {
                 pgEquipment.setActive(0);
                 pgEquipmentManager.save(pgEquipment);
+                code="200";
                 msg="删除成功";
                 result="true";
             }
@@ -186,6 +195,7 @@
             msg="设备信息获取失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -201,16 +211,19 @@
             throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=new ArrayList<PgDeviceTypeStatisticDto>();
 
         try {
             pgDeviceTypeStatisticDtoList=pgEquipmentManager.getDeviceStatisticByDevType(eqType);
 
+            code="200";
             msg = "获取成功";
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceTypeStatisticDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
index 05a9709..a90fd6c 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
@@ -4,9 +4,9 @@
 import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
 import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
 import com.casic.PgInterface.intelPlan.manager.PgPileAcuManager;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import com.casic.PgInterface.test.PlanData;
 import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.ModelAttribute;
 
 import javax.annotation.Resource;
 import javax.ws.rs.FormParam;
@@ -32,23 +32,25 @@
     public Map<String,Object> getPlanResult(@FormParam("planParamStr") String planParamStr){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
-        //List<PgPlanTask> pgPlanTaskList=pgPlanParams.getPgPlanTaskList();
         List<PgPlanTask> pgPlanTaskList=new PgPlanParams().getPgPlanParamsByString(planParamStr);
         List<PgPlanResultRe> pgPlanResultReList=new ArrayList<>();
 
-        try{
-                pgPlanResultReList=pgPileAcuManager.getPgPlanResultList(pgPlanTaskList);
-                if(pgPlanResultReList==null)
-                    msg="管线智能规划出错";
-                else
-                    msg="管线智能规划完成";
+        try {
+            pgPlanResultReList = pgPileAcuManager.getPgPlanResultList(pgPlanTaskList);
+            if (pgPlanResultReList == null)
+                msg = "管线智能规划出错";
+            else {
+                code="200";
+                msg = "管线智能规划完成";
+            }
         }
         catch(Exception ex){
             msg="智能规划出错";
             ex.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgPlanResultReList);
 
@@ -80,4 +82,30 @@
         return resultMap;
     }
 
+    @POST
+    @Path("getPlanTask")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getACUTask(@FormParam("pileAcuList") String pileAcuList){
+
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        String code="0";
+        List<PgAcuTask> pgAcuTaskList=new ArrayList<>();
+
+        try{
+            pgAcuTaskList=pgPileAcuManager.getACUTask(pileAcuList);
+            code="200";
+            msg="任务获取成功";
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            msg="任务获取失败";
+        }
+        resultMap.put("code",code);
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgAcuTaskList);
+
+        return resultMap;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
index ff85c61..66eec76 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
@@ -55,13 +55,13 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         try {
             PgInPgPerson pgInPgPerson = null;//pgInPgPersonManager.getPersonByUserName(userName);
             int iHostName = pgTagMacManager.getCount("select count(1) from PGTagMac where hostname = ?",assetCode);
-//            int iTagMac = pgTagMacManager.getCount("select count(1) from PGTagMac where tagmac = ?",assetCode.toUpperCase());
             if (0==iHostName)
             {
                 result = "false";
@@ -92,9 +92,8 @@
 
                 pgInPgStatusManager.save(pgInPgStatus);
 
-//                String syResult=pgInPgPersonManager.synchorizedInPgInfo(assetCode,userCode,userName,personType);
+                code="200";
                 result = "true";
-//                msg = "人员注册保存成功"+syResult;
                 msg = "人员注册保存成功";
             }
             else {
@@ -106,6 +105,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -120,6 +120,7 @@
     public Map<String, Object> getInPgPerson() throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<>();
         try {
@@ -127,11 +128,15 @@
             if (pgInPgInfoDtoList == null || pgInPgInfoDtoList.size() == 0)
                 msg = "没有找到入廊人员信息";
             else
+            {
+                code="200";
                 msg = "入廊人员信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "入廊人员信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
         return resultMap;
@@ -146,18 +151,22 @@
     public Map<String, Object> getInPgPersonInPg() throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
 
-        List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<PgInPgInfoDto>();
+        List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<>();
         try {
             pgInPgInfoDtoList = pgInPgPersonManager.getPgInPersonList(1);
             if (pgInPgInfoDtoList == null || pgInPgInfoDtoList.size() == 0)
                 msg = "没有找到入廊人员信息";
-            else
+            else {
+                code="200";
                 msg = "入廊人员信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "入廊人员信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
         return resultMap;
@@ -172,6 +181,7 @@
     public Map<String, Object> getInPgPersonByName(@FormParam("userName") String userName) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
 
         PgInPgPerson pgInPgPerson = null;
         PgInPgPersonDto pgInPgPersonDto=null;
@@ -184,12 +194,13 @@
                 pgInPgPersonDto=new PgInPgPersonDto(pgInPgPerson);
                 pgInPgPersonDtoList.add(pgInPgPersonDto);
                 msg = "人员信息获取成功";
+                code="200";
             }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "人员信息获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgPersonDtoList);
         return resultMap;
@@ -206,6 +217,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             PgInPgPerson pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName);
@@ -221,6 +233,7 @@
                     pgInPgPersonManager.save(pgInPgPerson);
                     result = "true";
                     msg = "编辑成功";
+                    code="200";
                 }
             }
         } catch (Exception e) {
@@ -228,9 +241,9 @@
             msg = "编辑失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -244,10 +257,12 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         int inPgNum=0;
         String msg = "";
+        String code="0";
 
         try{
             inPgNum=pgInPgStatusManager.getInPgNum();
 
+            code="200";
             msg="人员入廊次数获取成功";
         }
         catch(Exception e)
@@ -255,6 +270,7 @@
             e.printStackTrace();
             msg="人员入廊次数获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",inPgNum);
 
@@ -272,18 +288,22 @@
                                                    @FormParam("statisticType") String statisticType) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
 
         List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<PgInPgInfoDto>();
         try {
             pgInPgInfoDtoList = pgInPgPersonManager.getPgInPersonListByTime(startTime, endTime, statisticType);
             if(pgInPgInfoDtoList==null)
                 msg="入廊人员统计信息获取失败";
-            else
-                msg="入廊人员统计信息获取成功";
+            else {
+                code="200";
+                msg = "入廊人员统计信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "入廊人员统计信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
         return resultMap;
@@ -296,6 +316,7 @@
 
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
 
         try {
@@ -304,8 +325,10 @@
                 pgDeviceDtoList=pgDeviceManager.getPgCameraListByPosition("",apCodeStr);
                 if(pgDeviceDtoList==null)
                     msg="不存在关联摄像机";
-                else
-                    msg="关联摄像机获取成功";
+                else {
+                    code="200";
+                    msg = "关联摄像机获取成功";
+                }
             } else {
                 msg="请输入Ap编号";
             }
@@ -315,6 +338,7 @@
             msg="关联摄像机获取成功";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgDeviceDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java
index 507b3fe..b43f077 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java
@@ -34,6 +34,7 @@
 
         String result="";
         String msg="";
+        String code="";
         try{
             PgInPgStatus pgInPgStatus=new PgInPgStatus();
 
@@ -44,6 +45,7 @@
             pgInPgStatusManager.save(pgInPgStatus);
             msg="入廊时间提交成功";
             result="true";
+            code="200";
         }
         catch (Exception e){
             e.printStackTrace();
@@ -51,6 +53,7 @@
             result="false";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -66,6 +69,7 @@
 
         String result="";
         String msg="";
+        String code="0";
         try{
             PgInPgPerson pgInPgPerson=pgInPgPersonManager.getPgInPgPersonByAssetCode(assetCode);
 
@@ -79,6 +83,7 @@
             pgInPgStatusManager.save(pgInPgStatus);
 
             msg="出廊时间提交成功";
+            code="200";
             result="true";
         }
         catch (Exception e){
@@ -87,6 +92,7 @@
             result="false";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
index 9def330..9c0ba1f 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
@@ -33,17 +33,20 @@
                                             @FormParam("existNum") String existNum) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         String result="";
 
         try {
             pgIntelPlanManager.savePgIntelPlan(parName,lineName,maxNum,existNum);
             msg="规划数据保存成功";
+            code="200";
             result="true";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "规划数据保存失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
@@ -55,15 +58,18 @@
     public Map<String, Object> getIntelLineType() throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgIntelPlanTypeDto> pgIntelPlanTypeDtoList=new ArrayList<>();
         try {
             pgIntelPlanTypeDtoList=pgIntelPlanManager.getIntelPlanType();
+            code="200";
             msg="获取排线类型成功";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "获取排线类型失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgIntelPlanTypeDtoList);
         return resultMap;
@@ -76,6 +82,7 @@
                                             @FormParam("partitionStr") String partitionStr) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgIntelPlanDto> pgIntelPlanDtoList = new ArrayList<>();
 
@@ -83,8 +90,10 @@
             pgIntelPlanDtoList = pgIntelPlanManager.getPgIntelPlanListByPartion(lineName, partitionStr);
             if(pgIntelPlanDtoList==null||pgIntelPlanDtoList.size()==0)
                 msg="请输入正确的规划参数";
-            else
-                msg="规划数据获取成功";
+            else {
+                code="200";
+                msg = "规划数据获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "规划数据获取失败";
@@ -103,10 +112,12 @@
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
         String result="";
+        String code="0";
 
         try {
             boolean bl=pgIntelPlanManager.addLineUse(lineName,partitionStr,num);
             if(bl){
+                code="200";
                 msg="排线入廊成功";
                 result="true";
             }
@@ -119,6 +130,7 @@
             msg = "排线入廊失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
@@ -132,6 +144,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
         String result="";
+        String code="0";
 
         try {
             PgIntelPlan pgIntelPlan=pgIntelPlanManager.getPgIntelPlanByParNameAndLine(lineName,parName);
@@ -140,11 +153,13 @@
             pgIntelPlanManager.save(pgIntelPlan);
             msg="规划数据删除成功";
             result="true";
+            code="200";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "规划数据删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java b/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java
index 378af00..9c39523 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java
@@ -1,5 +1,6 @@
 package com.casic.PgInterface.rs;
 
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
 import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
 import com.casic.PgInterface.intelPlan.dto.PgLineHoleDTO;
 import com.casic.PgInterface.intelPlan.manager.PgLineHoleManager;
@@ -27,6 +28,9 @@
     @Resource
     private PgPileAcuManager pgPileAcuManager;
 
+    @Resource
+    private PgRoadManager pgRoadManager;
+
     @POST
     @Path("getPgLineAcuHole")
     @Produces(MediaType.APPLICATION_JSON)
@@ -34,23 +38,32 @@
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
         String result="";
+        String code="0";
         List<PgLineHoleDTO> pgLineHoleDTOList=new ArrayList<>();
 
         try {
             PgPileAcu pgPileAcu=pgPileAcuManager.getPgPileAcuByCode(acuCode);
             if(pgPileAcu==null){
                 msg="不存在分区";
-            }else{
-                pgLineHoleDTOList=pgLineHoleManager.getCurrentHoleByAcu(pgPileAcu.getId());
-                if(pgLineHoleDTOList!=null&&pgLineHoleDTOList.size()!=0)
-                    msg="获取成功";
-                else
-                    msg="未找到入廊数据";
+            }else {
+                pgLineHoleDTOList = pgLineHoleManager.getCurrentHoleByAcu(pgPileAcu.getId());
+                if (pgLineHoleDTOList != null && pgLineHoleDTOList.size() != 0)
+                {
+                    code="200";
+                    msg = "获取成功";
+                }
+                else {
+                    PgLineHoleDTO pgLineHoleDTO=new PgLineHoleDTO();
+                    pgLineHoleDTO.setRoad(pgRoadManager.get(pgPileAcu.getRoadId()).getRoadName());
+                    pgLineHoleDTOList.add(pgLineHoleDTO);
+                    msg = "未找到入廊数据";
+                }
             }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgLineHoleDTOList);
         return resultMap;

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 25ded8a..283d7ab 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,20 +7,56 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" 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/construction/manager/PgCsDocumentManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/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/manager/PgAlarmManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/~$说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/~$说明20191207.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.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$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/接口说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明20191207.docx" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
@@ -51,7 +87,7 @@
         <counts>
           <entry key="class" value="4" />
           <entry key="iml" value="2" />
-          <entry key="java" value="707" />
+          <entry key="java" value="820" />
           <entry key="properties" value="14" />
           <entry key="xml" value="7" />
         </counts>
@@ -60,7 +96,7 @@
         <counts>
           <entry key="CLASS" value="4" />
           <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="707" />
+          <entry key="JAVA" value="820" />
           <entry key="Properties" value="14" />
           <entry key="XML" value="7" />
         </counts>
@@ -68,32 +104,32 @@
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
           <entry key="dummy" value="38" />
-          <entry key="java" value="30161" />
+          <entry key="java" value="40859" />
           <entry key="properties" value="100" />
-          <entry key="txt" value="176" />
+          <entry key="txt" value="186" />
           <entry key="xml" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="30161" />
-          <entry key="PLAIN_TEXT" value="214" />
+          <entry key="JAVA" value="40859" />
+          <entry key="PLAIN_TEXT" value="224" />
           <entry key="Properties" value="100" />
           <entry key="XML" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="48" />
+          <entry key="project.closed" value="51" />
           <entry key="project.open.time.1" value="5" />
           <entry key="project.open.time.12" value="2" />
           <entry key="project.open.time.13" value="1" />
           <entry key="project.open.time.15" value="1" />
           <entry key="project.open.time.16" value="1" />
           <entry key="project.open.time.17" value="1" />
-          <entry key="project.open.time.2" value="1" />
+          <entry key="project.open.time.2" value="2" />
           <entry key="project.open.time.20" value="1" />
-          <entry key="project.open.time.23" value="1" />
+          <entry key="project.open.time.23" value="2" />
           <entry key="project.open.time.24" value="2" />
           <entry key="project.open.time.251" value="1" />
           <entry key="project.open.time.27" value="2" />
@@ -106,8 +142,8 @@
           <entry key="project.open.time.36" value="1" />
           <entry key="project.open.time.37" value="1" />
           <entry key="project.open.time.39" value="2" />
-          <entry key="project.open.time.4" value="2" />
-          <entry key="project.open.time.40" value="1" />
+          <entry key="project.open.time.4" value="3" />
+          <entry key="project.open.time.40" value="2" />
           <entry key="project.open.time.41" value="2" />
           <entry key="project.open.time.42" value="2" />
           <entry key="project.open.time.43" value="2" />
@@ -122,23 +158,25 @@
           <entry key="project.open.time.6" value="3" />
           <entry key="project.open.time.63" value="2" />
           <entry key="project.open.time.64" value="1" />
+          <entry key="project.open.time.66" value="1" />
           <entry key="project.open.time.71" value="2" />
+          <entry key="project.open.time.74" value="1" />
           <entry key="project.open.time.76" value="1" />
           <entry key="project.open.time.8" value="2" />
           <entry key="project.open.time.9" value="1" />
           <entry key="project.open.time.97" value="1" />
-          <entry key="project.opened" value="78" />
+          <entry key="project.opened" value="84" />
         </counts>
       </usages-collector>
     </session>
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+            <state relative-caret-position="396">
+              <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
               <folding>
                 <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
                 <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -147,73 +185,6 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <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="99">
-              <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-              <folding>
-                <element signature="imports" expanded="true" />
-                <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-1170">
-              <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state>
-              <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
-              <folding>
-                <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-                <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="true">
-        <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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-              <folding>
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-                <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>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <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="352">
-              <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -225,18 +196,9 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>inCriteria</find>
-      <find>getPgPlanResulList</find>
-      <find>getPileAcuListByPileAcuStr</find>
-      <find>distinct</find>
-      <find>order</find>
-      <find>canPlanLine</find>
-      <find>isExistLine</find>
-      <find>getPlanResult</find>
       <find>pgPipeLine</find>
       <find>getPipeLineBylineName</find>
       <find>StringU</find>
-      <find>getAllAlarm</find>
       <find>getAlarmList</find>
       <find>getPgInPersonListByDay</find>
       <find>getDayInPgStatistic</find>
@@ -254,7 +216,16 @@
       <find>getPgContructionByNameOrType</find>
       <find>&quot;&quot;,&quot;&quot;,</find>
       <find>getPgContructionDtoByNameOrType</find>
+      <find>addConstruction</find>
+      <find>getPgLineAcuHole</find>
+      <find>getPlanResult</find>
       <find>getConstruction</find>
+      <find>addPipeLine</find>
+      <find>未找到入廊数据</find>
+      <find>getCurrentHoleByAcu</find>
+      <find>getAllAlarm</find>
+      <find>getPgDeviceDtoListByPartition</find>
+      <find>getPgDeviceByDevType</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -263,57 +234,57 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlan.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileHoleManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/planData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/PlanData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
       </list>
     </option>
   </component>
@@ -359,7 +330,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -421,53 +391,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="dto" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="manager" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -479,29 +402,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="rs" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -516,6 +416,7 @@
         </subPane>
       </pane>
       <pane id="Scope" />
+      <pane id="PackagesPane" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -710,7 +611,13 @@
       <workItem from="1574902733573" duration="1829000" />
       <workItem from="1574998240004" duration="7016000" />
       <workItem from="1575247959683" duration="6997000" />
-      <workItem from="1575704345590" duration="40473000" />
+      <workItem from="1575704345590" duration="69381000" />
+      <workItem from="1575869479666" duration="721000" />
+      <workItem from="1575947104878" duration="6101000" />
+      <workItem from="1576128264436" duration="3347000" />
+      <workItem from="1576208571543" duration="22000" />
+      <workItem from="1576227513917" duration="862000" />
+      <workItem from="1576293721220" duration="18246000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -817,11 +724,18 @@
       <option name="project" value="LOCAL" />
       <updated>1575775489149</updated>
     </task>
-    <option name="localTasksCounter" value="16" />
+    <task id="LOCAL-00016" summary="整改施工信息">
+      <created>1575791780774</created>
+      <option name="number" value="00016" />
+      <option name="presentableId" value="LOCAL-00016" />
+      <option name="project" value="LOCAL" />
+      <updated>1575791780774</updated>
+    </task>
+    <option name="localTasksCounter" value="17" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="452131000" />
+    <option name="totallyTimeSpent" value="510338000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -834,9 +748,8 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
-    <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.24205749" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2647504" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -847,7 +760,7 @@
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.3295082" />
       <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.4819672" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.65737706" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.3295082" />
@@ -939,7 +852,8 @@
     <MESSAGE value="重新设计智能规划部分" />
     <MESSAGE value="完成智能规划对接" />
     <MESSAGE value="修改报警统计" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改报警统计" />
+    <MESSAGE value="整改施工信息" />
+    <option name="LAST_COMMIT_MESSAGE" value="整改施工信息" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -951,16 +865,10 @@
           <option name="timeStamp" value="3" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java</url>
-          <line>69</line>
+          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java</url>
+          <line>40</line>
           <properties />
-          <option name="timeStamp" value="21" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java</url>
-          <line>96</line>
-          <properties />
-          <option name="timeStamp" value="38" />
+          <option name="timeStamp" value="122" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
@@ -970,394 +878,452 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <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="2068">
-          <caret line="154" column="35" selection-start-line="154" selection-start-column="35" selection-end-line="154" selection-end-column="35" />
-        </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="3300">
-          <caret line="297" column="22" selection-start-line="297" selection-start-column="22" selection-end-line="297" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/StringUtils.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
-          <caret line="13" column="48" lean-forward="true" selection-start-line="13" selection-start-column="48" selection-end-line="13" selection-end-column="48" />
+          <caret line="11" column="5" selection-start-line="11" selection-start-column="5" selection-end-line="11" selection-end-column="5" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="78" lean-forward="true" selection-start-line="78" selection-end-line="78" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="616">
-          <caret line="41" column="1" selection-start-line="41" selection-start-column="1" selection-end-line="41" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="110">
-          <caret line="12" column="23" selection-start-line="12" selection-start-column="23" selection-end-line="12" selection-end-column="23" />
+        <state relative-caret-position="516">
+          <caret line="114" column="12" selection-start-line="114" selection-start-column="12" selection-end-line="114" selection-end-column="12" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="164">
-          <caret line="56" lean-forward="true" selection-start-line="56" selection-end-line="56" />
+        <state relative-caret-position="418">
+          <caret line="33" column="44" selection-start-line="33" selection-start-column="44" selection-end-line="33" selection-end-column="44" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="258">
-          <caret line="27" column="12" lean-forward="true" selection-start-line="27" selection-start-column="12" selection-end-line="27" selection-end-column="12" />
+        <state relative-caret-position="132">
+          <caret line="11" column="20" lean-forward="true" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="20" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.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="-12">
-          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        <state relative-caret-position="516">
+          <caret line="142" column="54" selection-start-line="142" selection-start-column="54" selection-end-line="142" selection-end-column="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="858">
-          <caret line="55" column="27" lean-forward="true" selection-start-line="55" selection-start-column="27" selection-end-line="55" selection-end-column="27" />
+        <state relative-caret-position="66">
+          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="58">
+          <caret line="18" column="28" selection-start-line="18" selection-start-column="19" selection-end-line="18" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="305">
+          <caret line="24" column="31" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="714">
+          <caret line="58" column="5" lean-forward="true" selection-start-line="58" selection-start-column="5" selection-end-line="58" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="924">
+          <caret line="134" column="92" selection-start-line="134" selection-start-column="92" selection-end-line="134" selection-end-column="92" />
+          <folding>
+            <element signature="method#linkDevice#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkPartitionCamera#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkReservePlan#0;class#PgAlarmLinkRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1066">
+          <caret line="90" lean-forward="true" selection-start-line="90" selection-end-line="90" />
+          <folding>
+            <element signature="method#getTjResultByAlarmType#0;class#PgAlarmTjRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="946">
+          <caret line="148" column="11" lean-forward="true" selection-start-line="148" selection-start-column="11" selection-end-line="148" selection-end-column="11" />
+          <folding>
+            <element signature="method#getAlarmTypeList#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#addAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#editAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#deleteAlarmType#0;class#PgAlarmTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="208">
+          <caret line="46" column="23" lean-forward="true" selection-start-line="46" selection-start-column="23" selection-end-line="46" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="113" column="9" lean-forward="true" selection-start-line="113" selection-start-column="9" selection-end-line="113" selection-end-column="9" />
+          <folding>
+            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
+            <element signature="method#getNewestCh4InfoByDev#0;class#PgCh4Rs#0" />
+            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="145" column="6" lean-forward="true" selection-start-line="145" selection-start-column="6" selection-end-line="145" selection-end-column="6" />
+          <folding>
+            <element signature="method#addAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#editAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#deleteAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#getAuthorityList#0;class#PgAuthorityRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="58" column="1" lean-forward="true" selection-start-line="58" selection-start-column="1" selection-end-line="58" selection-end-column="1" />
+          <folding>
+            <element signature="method#getPgAssetPlanList#0;class#PgAssetPlanRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="370">
+          <caret line="371" column="66" selection-start-line="371" selection-start-column="66" selection-end-line="371" selection-end-column="66" />
+          <folding>
+            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#searchConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionDev#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="139" column="13" lean-forward="true" selection-start-line="139" selection-start-column="13" selection-end-line="139" selection-end-column="13" />
+          <folding>
+            <element signature="method#getCoInfoByDevAndDate#0;class#PgCoRs#0" />
+            <element signature="method#getNewestCoInfoByDev#0;class#PgCoRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="540">
+          <caret line="223" column="5" lean-forward="true" selection-start-line="223" selection-start-column="5" selection-end-line="223" selection-end-column="5" />
+          <folding>
+            <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="682">
+          <caret line="100" lean-forward="true" selection-start-line="100" selection-end-line="100" />
+          <folding>
+            <element signature="method#getDeviceTpeyList#0;class#PgDeviceTypeRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="377">
+          <caret line="225" column="35" selection-start-line="225" selection-start-column="35" selection-end-line="225" selection-end-column="35" />
+          <folding>
+            <element signature="method#addEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#addEquipment#1;class#PgEquipmentRs#0" />
+            <element signature="method#getEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#deleteEquipment#0;class#PgEquipmentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="406">
+          <caret line="109" lean-forward="true" selection-start-line="109" selection-end-line="109" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="154">
+          <caret line="28" column="19" selection-start-line="28" selection-start-column="19" selection-end-line="28" selection-end-column="19" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="748">
-          <caret line="49" column="5" lean-forward="true" selection-start-line="49" selection-start-column="5" selection-end-line="49" selection-end-column="5" />
+        <state relative-caret-position="296">
+          <caret line="161" column="35" selection-start-line="161" selection-start-column="35" selection-end-line="161" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="384">
+          <caret line="99" column="5" lean-forward="true" selection-start-line="99" selection-start-column="5" selection-end-line="99" selection-end-column="5" />
+        </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="362">
+          <caret line="340" column="35" selection-start-line="340" selection-start-column="35" selection-end-line="340" selection-end-column="35" />
+          <folding>
+            <element signature="method#addInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPersonInPg#0;class#PgInPgPersonRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-606">
+          <caret line="76" column="20" lean-forward="true" selection-start-line="76" selection-start-column="20" selection-end-line="76" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="65" column="35" selection-start-line="65" selection-start-column="35" selection-end-line="65" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="101" column="35" selection-start-line="101" selection-start-column="35" selection-end-line="101" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="84" column="35" selection-start-line="84" selection-start-column="35" selection-end-line="84" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="59" lean-forward="true" selection-start-line="59" selection-end-line="59" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="60" column="1" lean-forward="true" selection-start-line="60" selection-start-column="1" selection-end-line="60" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="145" column="35" selection-start-line="145" selection-start-column="35" selection-end-line="145" selection-end-column="35" />
+        </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="274">
+          <caret line="350" column="35" selection-start-line="350" selection-start-column="35" selection-end-line="350" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="121" column="39" selection-start-line="121" selection-start-column="39" selection-end-line="121" selection-end-column="39" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="28" column="8" lean-forward="true" selection-start-line="28" selection-start-column="8" selection-end-line="28" selection-end-column="8" />
+        <state relative-caret-position="340">
+          <caret line="103" selection-start-line="103" selection-end-line="103" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="226" column="35" selection-start-line="226" selection-start-column="35" selection-end-line="226" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="203" column="35" selection-start-line="203" selection-start-column="35" selection-end-line="203" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="241" column="35" selection-start-line="241" selection-start-column="35" selection-end-line="241" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="225" column="1" lean-forward="true" selection-start-line="225" selection-start-column="1" selection-end-line="225" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="176" column="5" lean-forward="true" selection-start-line="176" selection-start-column="5" selection-end-line="176" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="178" column="35" lean-forward="true" selection-start-line="178" selection-start-column="35" selection-end-line="178" selection-end-column="35" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="516">
-          <caret line="94" column="53" selection-start-line="94" selection-start-column="53" selection-end-line="94" selection-end-column="53" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="814">
-          <caret line="52" column="9" lean-forward="true" selection-start-line="52" selection-start-column="9" selection-end-line="52" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="182">
-          <caret line="58" column="12" lean-forward="true" selection-start-line="58" selection-start-column="12" selection-end-line="58" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="34" lean-forward="true" selection-start-line="34" selection-end-line="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="32" lean-forward="true" selection-start-line="32" selection-end-line="32" />
-          <folding>
-            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
-            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="185">
-          <caret line="63" column="13" selection-start-line="63" selection-start-column="13" selection-end-line="63" selection-end-column="13" />
-          <folding>
-            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
-            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
-            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="e#6319#6324#0" />
-            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
-          </folding>
+          <caret line="240" lean-forward="true" selection-start-line="240" selection-end-line="240" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
-          <caret line="58" column="28" lean-forward="true" selection-start-line="58" selection-start-column="28" selection-end-line="58" selection-end-column="28" />
-          <folding>
-            <element signature="method#addTempHumData#0;class#PgTempHumRs#0" />
-          </folding>
+        <state relative-caret-position="340">
+          <caret line="148" column="34" selection-start-line="148" selection-start-column="34" selection-end-line="148" selection-end-column="34" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
+        <state relative-caret-position="458">
+          <caret line="99" column="35" selection-start-line="99" selection-start-column="35" selection-end-line="99" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+        <state relative-caret-position="384">
+          <caret line="145" column="32" lean-forward="true" selection-start-line="145" selection-start-column="32" selection-end-line="145" selection-end-column="32" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="414">
-          <caret line="22" column="46" lean-forward="true" selection-start-line="22" selection-start-column="46" selection-end-line="22" selection-end-column="46" />
-        </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="396">
-          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" column="83" selection-start-line="11" selection-start-column="83" selection-end-line="11" selection-end-column="83" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="26">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
-          <folding>
-            <element signature="method#getPgInPgStatusByPerson#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNumByName#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNum#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPersonListByDay#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPgStatusByPgInPgPerson#0;class#PgInPgStatusManager#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="44">
-          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-12">
-          <caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="87" lean-forward="true" selection-start-line="87" selection-end-line="87" />
-          <folding>
-            <element signature="method#getConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#addConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#deleteConstructionType#0;class#PgConstructionTypeRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
-          <folding>
-            <element signature="method#getConstructionTypeByType#0;class#PgConstructionTypeManager#0" />
-            <element signature="method#getAllConstructionTypeDto#0;class#PgConstructionTypeManager#0" />
-          </folding>
-        </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="145">
-          <caret line="258" column="9" lean-forward="true" selection-start-line="258" selection-start-column="9" selection-end-line="258" selection-end-column="9" />
-          <folding>
-            <element signature="method#getMonthInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayInPgStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgOverViewRs#0" />
-            <element signature="method#getAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getMonthAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayAlarmStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgOverViewRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="103">
-          <caret line="105" column="50" lean-forward="true" selection-start-line="105" selection-start-column="50" selection-end-line="105" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateBasicDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="99">
-          <caret line="125" selection-start-line="125" selection-end-line="125" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="190">
-          <caret line="24" column="35" lean-forward="true" selection-start-line="24" selection-start-column="35" selection-end-line="24" selection-end-column="35" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="436">
-          <caret line="24" lean-forward="true" selection-start-line="24" selection-end-line="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" lean-forward="true" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="300">
-          <caret line="34" column="31" lean-forward="true" selection-start-line="34" selection-start-column="31" selection-end-line="34" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="42" column="13" lean-forward="true" selection-start-line="42" selection-start-column="13" selection-end-line="42" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="120" column="72" lean-forward="true" selection-start-line="120" selection-start-column="72" selection-end-line="120" selection-end-column="72" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="293">
-          <caret line="58" column="73" lean-forward="true" selection-start-line="58" selection-start-column="73" selection-end-line="58" selection-end-column="73" />
-          <folding>
-            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
-            <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
-          </folding>
-        </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="307">
-          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
+        <state relative-caret-position="758">
+          <caret line="130" column="5" lean-forward="true" selection-start-line="130" selection-start-column="5" selection-end-line="130" selection-end-column="5" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1170">
-          <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
+        <state relative-caret-position="494">
+          <caret line="86" column="62" lean-forward="true" selection-start-line="86" selection-start-column="62" selection-end-line="86" selection-end-column="62" />
           <folding>
-            <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-            <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+            <element signature="method#getAllDevice#0;class#PgDeviceManager#0" />
+            <element signature="method#getAllDev#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="195" column="28" lean-forward="true" selection-start-line="195" selection-start-column="28" selection-end-line="195" selection-end-column="28" />
+        <state relative-caret-position="166">
+          <caret line="174" column="13" lean-forward="true" selection-start-line="174" selection-start-column="13" selection-end-line="174" selection-end-column="13" />
           <folding>
-            <element signature="method#getAlarmByTypeAndTime#0;class#PgAlarmManager#0" />
-            <element signature="method#getAlarmNum#0;class#PgAlarmManager#0" />
             <element signature="method#getDayAlarmStatistic#0;class#PgAlarmManager#0" />
+            <element signature="method#getAlarmList#0;class#PgAlarmManager#0" />
             <element signature="method#createDTO#0;class#PgAlarmManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="364">
+          <caret line="46" column="56" lean-forward="true" selection-start-line="46" selection-start-column="56" selection-end-line="46" selection-end-column="56" />
+          <folding>
+            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
+            <element signature="method#getPgDev#0;class#PgDeviceRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
+            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+        <state relative-caret-position="396">
+          <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
           <folding>
             <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
             <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -1365,52 +1331,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="239">
-          <caret line="21" column="33" lean-forward="true" selection-start-line="21" selection-start-column="33" selection-end-line="21" selection-end-column="33" />
-        </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="352">
-          <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-        </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="99">
-          <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-          </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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-          <folding>
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-            <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>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
index c436c93..e913155 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
@@ -132,7 +132,10 @@
             this.setAlarmType("");
         else
             this.setAlarmType(pgAlarm.getAlarmTypeId().getAlarmType());
-        this.setAlarmValue(pgAlarm.getAlarmValue());
+        if(pgAlarm.getAlarmValue()==null)
+            this.setAlarmValue("");
+        else
+            this.setAlarmValue(pgAlarm.getAlarmValue());
         if (pgAlarm.getAlarmDate() != null)
             this.setAlarmDate(sdf.format(pgAlarm.getAlarmDate()));
         else
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
index a43965c..565cb41 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -159,11 +159,21 @@
     }
 
     //获取历史报警消息列表
-    public List<PgAlarmDto> getAllAlarm(String alarmType,String startDay,String endDay,String isNew,int page,int rows) {
-        try {
+    public  Map<String, Object> getAllAlarm(String alarmType,String partition,String startDay,String endDay,String isNew,int page,int rows) {
 
+        Map<String, Object> resultMap = new HashMap<>();
+        String msg="";
+
+        try {
             Criteria criteria = createCriteria(PgAlarm.class);
 
+            if (StringUtils.isNotBlank(partition)) {
+                DetachedCriteria inCriteria = DetachedCriteria.forClass(PgDevice.class);
+                inCriteria.add(Restrictions.eq("partition", partition));
+                inCriteria.setProjection(Property.forName("id"));
+                criteria.add(Property.forName("alarmDevId").in(inCriteria));
+            }
+
             if (StringUtils.isNotBlank(alarmType)&&!alarmType.contains("全部")&&pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
                 criteria.add(Restrictions.eq("alarmTypeId", pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)));
 
@@ -190,8 +200,16 @@
             for (PgAlarm pgAlarm : pgAlarmList) {
                 pgAlarmDtoList.add(new PgAlarmDto(pgAlarm));
             }
-
-            return pgAlarmDtoList;
+            if(pgAlarmDtoList==null||pgAlarmDtoList.size()==0) {
+                resultMap.put("msg", "没有报警信息");
+                resultMap.put("code","0");
+            }else {
+                resultMap.put("code","200");
+                resultMap.put("msg", "报警信息获取成功");
+            }
+            resultMap.put("count",pg.getTotalCount());
+            resultMap.put("result",pgAlarmDtoList);
+            return resultMap;
         }
         catch(Exception ex){
             ex.printStackTrace();
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index 7547560..654f49e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -24,11 +24,11 @@
 
         Criteria criteria = createCriteria(PgDevice.class);
 
-        if(road!=null)
+        if(StringUtils.isNotBlank(road))
             criteria.add(Restrictions.eq("road",road));
-        if(partition!=null)
+        if(StringUtils.isNotBlank(partition))
             criteria.add(Restrictions.eq("partition",partition));
-        if(devType!=null)
+        if(StringUtils.isNotBlank(devType))
             criteria.add(Restrictions.eq("devType",devType));
 
         criteria.add(Restrictions.eq("active", 1));
@@ -43,6 +43,29 @@
         return pgDeviceDtoList;
     }
 
+    public List<PgDeviceDto> getAllDev(String road,String partition,String devType) {
+
+        Criteria criteria = createCriteria(PgDevice.class);
+
+        if(StringUtils.isNotBlank(road))
+            criteria.add(Restrictions.eq("road",road));
+        if(StringUtils.isNotBlank(partition))
+            criteria.add(Restrictions.eq("partition",partition));
+        if(StringUtils.isNotBlank(devType))
+            criteria.add(Restrictions.like("devType","%"+devType+"%"));
+
+        criteria.add(Restrictions.eq("active", 1));
+        criteria.addOrder(Order.desc("id"));
+        List<PgDevice> pgDeviceList = criteria.list();
+
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
+        for (PgDevice pgDevice : pgDeviceList) {
+            pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
+        }
+
+        return pgDeviceDtoList;
+    }
+
     //根据名字获取当前设备
     public PgDevice getDeviceByAssetCode(String assetCode) {
         Criteria criteria=createCriteria(PgDevice.class);
@@ -56,9 +79,9 @@
     }
 
     //根据类型获取设备列表
-    public List<PgDeviceDto> getDeviceByDevTypee(String devType) {
+    public List<PgDeviceDto> getDeviceByDevType(String devType) {
         Criteria criteria=createCriteria(PgDevice.class);
-        criteria.add(Restrictions.eq("devType",devType));
+        criteria.add(Restrictions.like("devType","%"+devType+"%"));
 
         List<PgDevice> pgDeviceList=criteria.list();
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
@@ -106,7 +129,7 @@
         criteria.add(Restrictions.eq("partition",partition));
 
         List<PgDevice> pgDeviceList=criteria.list();
-        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<PgDeviceDto>();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
 
         for (PgDevice pgDevice : pgDeviceList) {
             pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
index 3a3bccd..595730e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
@@ -1,10 +1,13 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.devTable.domain.PgAlarmType;
 import com.casic.PgInterface.devTable.domain.PgPartition;
 import com.casic.PgInterface.devTable.domain.PgRoad;
 import com.casic.PgInterface.devTable.domain.PipeGallery;
 import com.casic.PgInterface.devTable.dto.PgPartitionDto;
+import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
@@ -12,7 +15,9 @@
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Created by yxw on 2017/11/4.
@@ -21,7 +26,8 @@
 public class PgPartitionManager extends HibernateEntityDao<PgPartition> {
 
     @Resource
-    PgRoadManager pgRoadManager;
+    private PgRoadManager pgRoadManager;
+
 
     public PgPartition getPartitionByParName(String parName) {
         Criteria criteria = getSession().createCriteria(PgPartition.class);
@@ -99,4 +105,5 @@
         return pgPartitionDtoList;
     }
 
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
index f216360..a6928f1 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
@@ -5,6 +5,7 @@
 public class PgPlanResultRe {
 
     private String taskKey;
+    private List<String> pileAcuList;
     private List<PgPlanResult> pgPlanResultList;
 
     public String getTaskKey() {
@@ -15,6 +16,14 @@
         this.taskKey = taskKey;
     }
 
+    public List<String> getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(List<String> pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+
     public List<PgPlanResult> getPgPlanResultList() {
         return pgPlanResultList;
     }
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
index 71ea765..47eea07 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
@@ -54,9 +54,7 @@
 
         List<PgLineHole> pgLineHoleList=criteria.list();
         List<PgLineHoleDTO> pgLineHoleDTOList=new ArrayList<>();
-        if(pgLineHoleList==null||pgLineHoleList.size()==0)
-            return null;
-        else
+        if(pgLineHoleList!=null&&pgLineHoleList.size()!=0)
             pgLineHoleDTOList=PgLineHoleDTO.ConvertToDTOList(pgLineHoleList,pgPileAcuManager,pgRoadManager);
         return pgLineHoleDTOList;
     }
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
index 0fd9e1f..841a386 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
@@ -1,12 +1,15 @@
 package com.casic.PgInterface.intelPlan.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.devTable.domain.PgPartition;
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
 import com.casic.PgInterface.intelPlan.domain.PgLineHole;
 import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
 import com.casic.PgInterface.intelPlan.domain.PgSection;
 import com.casic.PgInterface.intelPlan.dto.PgPlanResult;
 import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
 import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -22,6 +25,9 @@
     @Resource
     private PgLineHoleManager pgLineHoleManager;
 
+    @Resource
+    private PgRoadManager pgRoadManager;
+
     public PgPileAcu getPgPileAcuByCode(String acuCode){
         List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
 
@@ -58,7 +64,9 @@
         for(PgPlanTask pgPlanTask:pgPlanTaskList){
             List<PgPlanResult> pgPlanResultList=getPgPlanResultByPlantask(pgPlanTask);
             PgPlanResultRe pgPlanResultRe=new PgPlanResultRe();
+
             pgPlanResultRe.setTaskKey(pgPlanTask.getTaskKey());
+            pgPlanResultRe.setPileAcuList(pgPlanTask.getPileAcuList());
             pgPlanResultRe.setPgPlanResultList(pgPlanResultList);
 
             pgPlanResultReList.add(pgPlanResultRe);
@@ -142,4 +150,57 @@
         return length;
     }
 
+    private PgPileAcu getPgPileAcuByAcuCode(String acuCode){
+        List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
+
+        if(pgPileAcuList==null||pgPileAcuList.size()==0)
+            return null;
+        else
+            return pgPileAcuList.get(0);
+    }
+
+    public List<PgAcuTask> getACUTask(String pileAcuList){
+        String[] acuArray=pileAcuList.split(",");
+        List<PgAcuTask> pgAcuTaskList=new ArrayList<>();
+
+        for(String acu:acuArray){
+            PgPileAcu pgPileAcu=this.getPgPileAcuByCode(acu);
+            String roadName=pgRoadManager.get(pgPileAcu.getRoadId()).getRoadName();
+
+            if(!containRoad(roadName,pgAcuTaskList))
+            {
+                PgAcuTask pgAcuTask=new PgAcuTask();
+                pgAcuTask.setRoadName(roadName);
+                pgAcuTask.setPileAcuList(acu);
+                pgAcuTaskList.add(pgAcuTask);
+            }
+            else{
+                PgAcuTask pgAcuTask=getIndexRoad(roadName,pgAcuTaskList);
+                if(pgAcuTask!=null)
+                    pgAcuTask.setPileAcuList(pgAcuTask.getPileAcuList()+","+acu);
+            }
+        }
+
+        return pgAcuTaskList;
+    }
+
+    private boolean containRoad(String roadName,List<PgAcuTask> pgAcuTaskList){
+        if(pgAcuTaskList==null||pgAcuTaskList.size()==0) return false;
+        for(PgAcuTask pgAcuTask:pgAcuTaskList){
+            if(pgAcuTask.getRoadName().equals(roadName))
+                return true;
+        }
+
+        return false;
+    }
+
+    private PgAcuTask getIndexRoad(String roadName, List<PgAcuTask> pgAcuTaskList){
+        for(PgAcuTask pgAcuTask:pgAcuTaskList){
+            if(pgAcuTask.getRoadName().equals(roadName))
+                return pgAcuTask;
+        }
+
+        return null;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java
new file mode 100644
index 0000000..323f7ef
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java
@@ -0,0 +1,25 @@
+package com.casic.PgInterface.reservePlan.dto;
+
+import java.util.List;
+
+public class PgAcuTask {
+
+    private String roadName;//道路
+    private String pileAcuList;//acu分区
+
+    public String getRoadName() {
+        return roadName;
+    }
+
+    public void setRoadName(String roadName) {
+        this.roadName = roadName;
+    }
+
+    public String getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(String pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
index c25e926..c7d7693 100644
--- a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
@@ -70,9 +70,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(Long.valueOf(inPgPersonId));
         PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("hostName",pgInPgPerson.getAssetCode());
-//        PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode());
-//        long maxId = pgTagPositionManager.getMaxId(pgTagMac.getTagMac());
-//        PGTagPosition pgTagPosition = pgTagPositionManager.get(maxId);
+
         PGTagPosition pgTagPosition = tagmacRun.GetTagStatus(pgTagMac);
         boolean bExist = false;
         bExist = pgTagPositionManager.findTagPosition(pgTagPosition.getPositionUpdatetime(),pgTagPosition.getHostId());
@@ -104,8 +102,7 @@
         PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(Long.valueOf(inPgPersonId));
         PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pgInPgPersonId",pgInPgPerson);
         System.out.println("time:"+pgInPgStatus.getInTime());
-//        PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pgInPgPersonId",inPgPersonId);
-//        PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode());
+
         PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("hostName",pgInPgPerson.getAssetCode());
 
         Map<Object,Object> mapPosition = new HashMap<>();
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
index 082ba5d..3eed00a 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
@@ -48,6 +48,7 @@
     public Map<String, Object> linkDevice(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         PgDeviceDto pgDeviceDto = null;
         try {
@@ -62,6 +63,7 @@
                     else {
                         pgDeviceDto = new PgDeviceDto(pgDevice);
                         msg = "报警关联设备获取成功";
+                        code="200";
                     }
                 }
             }
@@ -71,6 +73,7 @@
             e.printStackTrace();
             msg = "获取关联设备失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceDto);
 
@@ -86,6 +89,7 @@
     public Map<String, Object> linkPartitionCamera(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
         try {
@@ -106,6 +110,7 @@
 
                         pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(partition,position);
                         msg = "关联设备获取成功";
+                        code="200";
                     }
                 }
             }
@@ -115,6 +120,7 @@
             e.printStackTrace();
             msg = "分区设备关联失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceDtoList);
         return resultMap;
@@ -129,6 +135,7 @@
     public Map<String, Object> linkReservePlan(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgReservePlanDto> pgReservePlanDtoList=new ArrayList<>();
         try{
@@ -139,10 +146,12 @@
                 else {
                     pgReservePlanDtoList = pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
 
-                    if(pgReservePlanDtoList==null||pgReservePlanDtoList.size()==0)
-                        msg="不存在关联的报警预案";
-                    else
+                    if (pgReservePlanDtoList == null || pgReservePlanDtoList.size() == 0)
+                        msg = "不存在关联的报警预案";
+                    else {
                         msg = "关联预案获取成功";
+                        code="200";
+                    }
                 }
             }
             else
@@ -153,6 +162,7 @@
             e.printStackTrace();
             msg="预案关联失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgReservePlanDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
index 0ddbc4d..0ce886b 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
@@ -41,25 +41,19 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getAlarmList(@FormParam("alarmType") String alarmType,
                                             @FormParam("startDay") String startDay,
+                                            @FormParam("partition") String partition,
                                             @FormParam("endDay") String endDay,
                                             @FormParam("isNew") String isNew,
                                             @FormParam("page") int page,
                                             @FormParam("rows") int rows) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
         try {
-            pgAlarmDtoList = pgAlarmManager.getAllAlarm(alarmType,startDay,endDay,isNew,page,rows);
-            if (pgAlarmDtoList==null||pgAlarmDtoList.size() == 0)
-                msg = "没有报警信息";
-            else
-                msg = "报警信息获取成功";
+            resultMap = pgAlarmManager.getAllAlarm(alarmType,partition,startDay,endDay,isNew,page,rows);
+
         } catch (Exception e) {
             e.printStackTrace();
-            msg = "报警信息获取失败";
         }
-        resultMap.put("msg", msg);
-        resultMap.put("result", pgAlarmDtoList);
         return resultMap;
     }
 
@@ -71,9 +65,10 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> clearAlarmList(@FormParam("id") String id) throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        String result = "false";
+        String result = "";
+        String code="0";
 
         try {
             PgAlarm pgAlarm = new PgAlarm();
@@ -86,12 +81,14 @@
                 pgAlarmManager.save(pgAlarm);
                 msg = "报警信息清除成功";
                 result = "true";
+                code = "200";
             }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警信息清除失败";
             result = "false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
@@ -106,21 +103,26 @@
     public Map<String, Object> getAlarmByTypeOrTime(@FormParam("alarmType") String alarmType,
                                                     @FormParam("startTime") String startTime,
                                                     @FormParam("endTime") String endTime) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
-        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<PgAlarmDto>();
+        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
         try {
             pgAlarmDtoList = pgAlarmManager.getAlarmByTypeAndTime(alarmType, startTime, endTime);
             if (pgAlarmDtoList == null || pgAlarmDtoList.size() == 0)
                 msg = "报警信息不存在";
             else
+            {
                 msg = "报警信息获取成功";
+                code="200";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警信息获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
index 29ce8a4..ed0bf34 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
@@ -39,8 +39,8 @@
     public Map<String, Object> getAlarmRule(@FormParam("devType") String devType) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
-        System.out.println("devType:"+devType);
         List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<>();
         try {
             pgAlarmRuleDtoList = pgAlarmRuleManager.getAlarmRuleDto(devType);
@@ -52,6 +52,7 @@
             e.printStackTrace();
             msg = "报警阈值信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmRuleDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
index 24ab894..abef1b1 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
@@ -39,16 +39,21 @@
                                                      @FormParam("endDate") String endDate)throws Exception{
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
+
         List<PgAlarmTjDto> pgAlarmTjDtoList=null;
         try{
             pgAlarmTjDtoList=pgAlarmTjManager.getAlarmTjResultByType(startDate,endDate);
             msg="获取成功";
+            code="200";
         }
         catch(Exception ex) {
             msg = "统计失败";
         }
-        resultMap.put("result",pgAlarmTjDtoList);
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
+        resultMap.put("result",pgAlarmTjDtoList);
+
         return resultMap;
     }
 
@@ -61,23 +66,27 @@
     public Map<String, Object> getAlarmByTime(@FormParam("startTime") String startTime,
                                               @FormParam("endTime") String endTime,
                                               @FormParam("statisticType") String statisticType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code = "0";
 
-        List<PgAlarmTjDto> pgAlarmTjDtoList = new ArrayList<PgAlarmTjDto>();
+        List<PgAlarmTjDto> pgAlarmTjDtoList = new ArrayList<>();
         try {
             pgAlarmTjDtoList = pgAlarmTjManager.getAlarmByTime(startTime, endTime, statisticType);
             if(pgAlarmTjDtoList==null)
                 msg="报警统计信息获取失败";
-            else
-                msg="报警统计信息获取成功";
+            else {
+                msg = "报警统计信息获取成功";
+                code="200";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警统计信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmTjDtoList);
         return resultMap;
     }
 
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
index 28bc811..b6278a9 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
@@ -30,7 +30,6 @@
     @Resource
     private PgAlarmTypeManager pgAlarmTypeManager;
 
-
     /**
      * 获取报警类型
      */
@@ -38,19 +37,24 @@
     @Path("getAlarmType")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getAlarmTypeList()throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
-        List<PgAlarmTypeDto> pgAlarmTypeDtoList=new ArrayList<PgAlarmTypeDto>();
+        String code="";
+
+        List<PgAlarmTypeDto> pgAlarmTypeDtoList=new ArrayList<>();
         try {
             pgAlarmTypeDtoList = pgAlarmTypeManager.getAllAlarmTypeDto();
             if(pgAlarmTypeDtoList.size()==0)
                 msg="没有报警类型信息";
-            else
-                msg="报警类型信息获取成功";
+            else {
+                code="200";
+                msg = "报警类型信息获取成功";
+            }
         }catch(Exception e){
             e.printStackTrace();
             msg="报警类型信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAlarmTypeDtoList);
         return resultMap;
@@ -66,6 +70,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
@@ -83,6 +88,7 @@
                 logger.info("成功保存");
                 result = "true";
                 msg = "保存成功";
+                code="200";
             }
         } catch (Exception e) {
             result = "false";
@@ -90,6 +96,7 @@
             e.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -106,6 +113,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try{
             if(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
@@ -119,6 +127,7 @@
                 pgAlarmTypeManager.save(pgAlarmType);
                 result = "true";
                 msg = "编辑成功";
+                code="200";
             }
         }
         catch(Exception e)
@@ -128,6 +137,7 @@
             e.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("result",result);
         resultMap.put("msg",msg);
 
@@ -146,6 +156,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
         String result="false";
+        String code="0";
 
         try {
             PgAlarmType pgAlarmType=pgAlarmTypeManager.get(Long.valueOf(id));
@@ -157,6 +168,7 @@
             {
                 pgAlarmType.setActive(0);
                 pgAlarmTypeManager.save(pgAlarmType);
+                code="200";
                 msg="报警类型删除成功";
                 result="true";
             }
@@ -165,6 +177,7 @@
             msg="报警类型删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
index 4533e1a..85940bb 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
@@ -33,12 +33,15 @@
                                                  @FormParam("inSpectionPlace") String inSpectionPlace){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
         List<PgAssetPlanDto> pgAssetPlanDtoList=new ArrayList<>();
         try{
             pgAssetPlanDtoList=pgAssetPlanManager.getPgAssetPlanDtoList(startDay,endDay,inSpectionPlace);
-            if(pgAssetPlanDtoList!=null&&pgAssetPlanDtoList.size()!=0)
-                msg="巡检信息获取成功";
+            if(pgAssetPlanDtoList!=null&&pgAssetPlanDtoList.size()!=0) {
+                code="200";
+                msg = "巡检信息获取成功";
+            }
             else
                 msg="不存在巡检信息";
         }
@@ -47,6 +50,7 @@
             msg="巡检信息获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAssetPlanDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
index 47ef9d1..5cbdfcb 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
@@ -30,12 +30,15 @@
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
         String result="";
+        String code="0";
 
         List<PgAssetPlanStatic> pgAssetPlanStaticList = null;
         try{
             pgAssetPlanStaticList=pgAssetPlanManager.getPgAssetPlanStaticLisByTime(startTime,endTime,staticType);
-            if(pgAssetPlanStaticList!=null&&pgAssetPlanStaticList.size()!=0)
-                msg="巡检统计信息获取成功";
+            if(pgAssetPlanStaticList!=null&&pgAssetPlanStaticList.size()!=0) {
+                code = "200";
+                msg = "巡检统计信息获取成功";
+            }
             else
                 msg="统计信息获取失败";
         }
@@ -44,6 +47,7 @@
             msg="统计失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAssetPlanStaticList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
index 26f5d6a..503bfe3 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
@@ -40,6 +40,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="";
 
         try{
             PgAuthority pgAuthority=new PgAuthority();
@@ -50,6 +51,7 @@
 
             pgAuthorityManager.save(pgAuthority);
             msg="用户权限保存成功";
+            code="200";
             result="true";
         }
         catch(Exception e) {
@@ -57,6 +59,7 @@
             msg = "新增权限失败";
             result = "false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -65,22 +68,25 @@
 
     /*
        *编辑角权限信息
-        */
+    */
     @POST
     @Path("editAuthority")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> editAuthority(@FormParam("id") String id,
                                        @FormParam("authority") String authority,
                                        @FormParam("concent") String concent) throws Exception{
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
+
         try {
             PgAuthority pgAuthority=pgAuthorityManager.get(Long.valueOf(id));
             pgAuthority.setAuthority(authority);
             pgAuthority.setConcent(concent);
 
             pgAuthorityManager.save(pgAuthority);
+            code="200";
             msg="权限保存成功";
             result="true";
         }
@@ -90,7 +96,7 @@
             msg="权限编辑失败";
             result="false";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -105,9 +111,10 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> deleteAuthority(@FormParam("id") String id)throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
-        String result="false";
+        String result="";
+        String code="0";
 
         try {
             PgAuthority pgAuthority= pgAuthorityManager.get(Long.valueOf(id));
@@ -119,6 +126,7 @@
             {
                 pgAuthority.setActive(0);
                 pgAuthorityManager.save(pgAuthority);
+                code="200";
                 msg="删除权限成功";
                 result="true";
             }
@@ -127,37 +135,40 @@
             msg="删除权限失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
     }
 
     /*
-* 获取权限信息
- */
+    * 获取权限信息
+    */
     @POST
     @Path("getAuthorityList")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> getAuthorityList() {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgAuthorityDto> pgAuthorityDtoList = new ArrayList<PgAuthorityDto>();
         try {
             pgAuthorityDtoList = pgAuthorityManager.getAuthorityList();
             if (pgAuthorityDtoList == null)
                 msg = "不存在权限信息";
-            else
+            else {
+                code = "200";
                 msg = "权限信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "权限信息获取是失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAuthorityDtoList);
         return resultMap;
     }
 
 
-
-
 }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
index a9ef521..a74ecc7 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
@@ -45,6 +45,7 @@
                                                @FormParam("endDate") String endDate)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgHistoryDataDto> pgHistoryDataDtoList=new ArrayList<>();
 
         try {
@@ -55,13 +56,16 @@
                 pgHistoryDataDtoList=pgCh4Manager.getAllCH4Data(pgDevice,startDate,endDate);
                 if(pgHistoryDataDtoList==null)
                     msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+                else {
+                    code = "200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgHistoryDataDtoList);
         return resultMap;
@@ -75,8 +79,9 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getNewestCh4InfoByDev(@FormParam("assetCode") String assetCode)throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
+        String code="0";
         PgCh4Dto pgCh4Dto=new PgCh4Dto(null);
 
         try {
@@ -87,13 +92,17 @@
                 pgCh4Dto=pgCh4Manager.getNewestCH4Data(pgDevice);
                 if(pgCh4Dto==null)
                     msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgCh4Dto);
         return resultMap;
@@ -111,6 +120,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
@@ -127,6 +137,7 @@
                 pgCh4.setPgDeviceId(pgDevice);
 
                 pgCh4Manager.save(pgCh4);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -135,7 +146,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
index a7eac39..dfc8ca5 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
@@ -43,23 +43,27 @@
                                                       @FormParam("endDate") String endDate)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgHistoryDataDto> pgHistoryDataDtoList=new ArrayList<>();
 
         try {
             PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
                 msg="设备不存在";
-            else{
-                pgHistoryDataDtoList=pgCoManager.getAllCoData(pgDevice, startDate, endDate);
-                if(pgHistoryDataDtoList==null)
-                    msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+            else {
+                pgHistoryDataDtoList = pgCoManager.getAllCoData(pgDevice, startDate, endDate);
+                if (pgHistoryDataDtoList == null)
+                    msg = "没有满足要求的数据";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgHistoryDataDtoList);
         return resultMap;
@@ -75,6 +79,7 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         PgCoDto pgCoDto=new PgCoDto(null);
 
         try {
@@ -85,13 +90,16 @@
                 pgCoDto=pgCoManager.getNewestCoData(pgDevice);
                 if(pgCoDto==null)
                     msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgCoDto);
         return resultMap;
@@ -110,6 +118,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         try {
@@ -126,6 +135,7 @@
 
                 pgCoManager.save(pgCo);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
         } catch (Exception e) {
@@ -133,7 +143,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
index b4b826e..9af98a3 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
@@ -60,6 +60,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         try {
 
@@ -80,8 +81,8 @@
                 pgConstruction.setPgConstructionTypeId(pgConstructionType.getId());
                 pgConstruction.setActive(1);
                 pgConstruction.setParName(parName);
-                logger.info("保存成功");
                 pgConstructionManager.save(pgConstruction);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -90,6 +91,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("success", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -116,6 +118,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
@@ -140,6 +143,7 @@
                 pgConstruction.setParName(parName);
 
                 pgConstructionManager.save(pgConstruction);
+                code="200";
                 result = "true";
                 msg = "编辑成功";
             }
@@ -150,7 +154,7 @@
             e.printStackTrace();
 
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -167,6 +171,8 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
+
         try {
             PgConstruction pgConstruction = pgConstructionManager.get(Long.valueOf(id));
             if (pgConstruction == null)
@@ -177,6 +183,7 @@
             {
                 pgConstruction.setActive(0);
                 pgConstructionManager.save(pgConstruction);
+                code="200";
                 result = "true";
                 msg = "成功删除信息";
             }
@@ -185,6 +192,7 @@
             result = "false";
             msg = "删除失败";
         }
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -204,9 +212,11 @@
                                                   @FormParam("rows") int rows)throws Exception{
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
         List<PgConstructionDto> pgConstructionDtoList=new ArrayList<>();
         try{
             pgConstructionDtoList=pgConstructionManager.getPgContructionDto(cs_name,cs_type,startTime,endTime,page,rows);
+            code="200";
             msg="信息获取成功";
         }
         catch(Exception e)
@@ -214,6 +224,7 @@
             e.printStackTrace();
             msg="查询失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
 
@@ -231,18 +242,22 @@
                                                               @FormParam("statisticType") String statisticType) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgConstructionStiatistic> pgConstructionStiatisticList=new ArrayList<>();
         try {
             pgConstructionStiatisticList = pgConstructionManager.getConstructionByTimeAndStatus(startTime, endTime, statisticType);
             if(pgConstructionStiatisticList==null)
                 msg="施工统计信息获取失败";
-            else
-                msg="施工统计信息获取成功";
+            else {
+                code="200";
+                msg = "施工统计信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "施工统计信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgConstructionStiatisticList);
         return resultMap;
@@ -257,6 +272,7 @@
     public Map<String, Object> getConstructionByType(@FormParam("statisticType") String statisticType){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
         List<PgConstructionStiatistic> pgConstructionStiatisticList=new ArrayList<>();
 
         try{
@@ -268,6 +284,7 @@
                 resultMap.put("result",null);
             }
             else {
+                code="200";
                 msg = "统计信息获取成功";
                 resultMap.put("result", pgConstructionStiatisticList);
             }
@@ -278,6 +295,7 @@
             msg="统计失败";
             resultMap.put("result",null);
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         return resultMap;
     }
@@ -291,9 +309,11 @@
     public Map<String, Object> getConstructionToday() throws Exception{
         Map<String,Object> resultMap=new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgConstructionDto> pgConstructionDtoList=new ArrayList<PgConstructionDto>();
         try {
             pgConstructionDtoList = pgConstructionManager.getConstructionToday();
+            code="200";
             msg = "当天施工信息获取成功";
         }
         catch(Exception e)
@@ -301,7 +321,7 @@
             e.printStackTrace();
             msg="获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
         return resultMap;
@@ -316,6 +336,7 @@
     public Map<String, Object> getConstructionDev(@FormParam("id") String id) throws Exception{
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
         List<PgDeviceDto> pgDeviceDtoList =new ArrayList<>();
         try{
@@ -325,14 +346,17 @@
 
             if(pgDeviceDtoList==null)
                 msg="信息获取失败";
-            else
-                msg="信息获取成功";
+            else {
+                code="200";
+                msg = "信息获取成功";
+            }
         }
         catch(Exception e)
         {
             e.printStackTrace();
-            msg="设备信息获取成功";
+            msg="信息获取是被";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgDeviceDtoList);
 
@@ -346,17 +370,21 @@
     @Path("getConstruction")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getConstruction() throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
-        List<PgConstructionDto> pgConstructionDtoList=new ArrayList<PgConstructionDto>();
+        String code="0";
+
+        List<PgConstructionDto> pgConstructionDtoList=new ArrayList<>();
 
         try{
             pgConstructionDtoList=pgConstructionManager.getPgConstructionList();
             if(pgConstructionDtoList==null||pgConstructionDtoList.size()==0)
                 msg="不存在施工记录";
-            else
-                msg="施工信息获取成功";
+            else {
+                code = "200";
+                msg = "施工信息获取成功";
+            }
         }
         catch(Exception e)
         {
@@ -364,6 +392,7 @@
             msg="施工信息获取失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java
index fd3d53e..2019502 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java
@@ -39,12 +39,12 @@
         try {
             pgConstructionTypeDtoList = pgConstructionTypeManager.getAllConstructionTypeDto();
             if (pgConstructionTypeDtoList.size() == 0)
-                msg = "没有项目类型信息";
+                msg = "获取失败";
             else
-                msg = "项目类型获取成功";
+                msg = "获取成功";
         } catch (Exception e) {
             e.printStackTrace();
-            msg = "项目类型信息获取失败";
+            msg = "获取失败";
         }
         resultMap.put("msg", msg);
         resultMap.put("result", pgConstructionTypeDtoList);
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
index 90d001c..037a399 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
@@ -51,6 +51,7 @@
 
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if (StringUtils.isBlank(construct_doc)||StringUtils.isBlank(doc_name))
@@ -65,6 +66,7 @@
             pgCsDocument.setActive(1);
             pgCsDocumentManager.save(pgCsDocument);
 
+            code="200";
             result = "true";
             msg = "保存成功";
 
@@ -74,6 +76,7 @@
             ex.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("success", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -90,6 +93,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             PgCsDocument pgCsDocument = pgCsDocumentManager.get(Long.valueOf(id));
@@ -103,6 +107,7 @@
 
                 pgCsDocumentManager.save(pgCsDocument);
 
+                code="200";
                 result = "true";
                 msg = "编辑成功";
             }
@@ -112,6 +117,7 @@
             msg = "编辑失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -125,9 +131,9 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
         String result="";
+        String code="0";
 
         try{
-
             PgCsDocument pgCsDocument = pgCsDocumentManager.get(Long.valueOf(id));
             if(pgCsDocument==null)
             {
@@ -137,6 +143,7 @@
             else{
                 pgCsDocument.setActive(0);
                 pgCsDocumentManager.save(pgCsDocument);
+                code="200";
                 result="true";
                 msg="删除成功";
             }
@@ -147,7 +154,7 @@
             msg="预案删除失败";
             result="false";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -168,18 +175,21 @@
 
         String msg="";
         String result="";
+        String code="0";
 
         try {
             pgCsDocumentDtoList = pgCsDocumentManager.getAllDocData(cs_name);
-            if (pgCsDocumentDtoList != null)
+            if (pgCsDocumentDtoList != null) {
+                code="200";
                 msg = "获取数据成功";
+            }
             else
                 msg = "没有满足条件的数据";
         }catch (Exception e){
             e.printStackTrace();
             msg = "获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgCsDocumentDtoList);
         return resultMap;
@@ -192,20 +202,22 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
 
         String msg = "";
+        String code="0";
         ResponseEntity<byte[]> path = null;
         try {
             PgCsDocument pgCsDocument = pgCsDocumentManager.get(Long.valueOf(id));
             path = pgCsDocumentManager.downloadFile(pgCsDocument);
             if (path == null)
                 msg = "不存在该文档";
-            else
+            else {
+                code = "200";
                 msg = "下载成功";
-
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "下载失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", path.getBody());
         resultMap.put("msg", msg);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
index 94c5c84..ffc8b95 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
@@ -41,22 +41,24 @@
     public Map<String, Object> getPgDeviceByDevType(@FormParam("devType") String devType) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
         try {
-            pgDeviceDtoList = pgDeviceManager.getDeviceByDevTypee(devType);
+            pgDeviceDtoList = pgDeviceManager.getDeviceByDevType(devType);
             if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0){
                 msg="不存在满足要求的数据";
-                resultMap.put("result",null);
             }
             else{
-                resultMap.put("result", pgDeviceDtoList);
+                code="200";
                 msg = "获取成功";
             }
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", pgDeviceDtoList);
         return resultMap;
     }
 
@@ -69,25 +71,26 @@
     public Map<String, Object> getPgDeviceByAssetCode(@FormParam("assetCode") String assetCode) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         PgDeviceDto pgDeviceDto=null;
         try {
             PgDevice pgDevice = pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
             {
                 msg="不存在设备信息";
-                resultMap.put("result",null);
             }
             else {
                 pgDeviceDto = new PgDeviceDto(pgDevice);
                 msg = "获取成功";
-                resultMap.put("result", pgDeviceDto);
+                code="200";
             }
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", pgDeviceDto);
         return resultMap;
     }
 
@@ -102,27 +105,61 @@
                                              @FormParam("devType") String devType)throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
         try {
             pgDeviceDtoList = pgDeviceManager.getAllDevice(road,partition,devType);
             if(pgDeviceDtoList.size()==0) {
                 msg = "没有找到设备信息";
-                resultMap.put("result",null);
             }
             else {
                 msg = "设备信息获取成功";
-                resultMap.put("result", pgDeviceDtoList);
+                code="200";
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result", pgDeviceDtoList);
         return resultMap;
     }
 
     /**
+     * 显示设备列表
+     */
+    @POST
+    @Path("getPgDev")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String, Object> getPgDev(@FormParam("road") String road,
+                                             @FormParam("partition") String partition,
+                                             @FormParam("devType") String devType)throws Exception {
+        Map<String, Object> resultMap = new HashMap<>();
+        String msg="";
+        String code="0";
+        List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
+        try {
+            pgDeviceDtoList = pgDeviceManager.getAllDev(road,partition,devType);
+            if(pgDeviceDtoList.size()==0) {
+                msg = "没有找到设备信息";
+            }
+            else {
+                code="200";
+                msg = "设备信息获取成功";
+            }
+        }catch(Exception e){
+            e.printStackTrace();
+            msg="设备信息获取失败";
+        }
+        resultMap.put("code",code);
+        resultMap.put("msg",msg);
+        resultMap.put("result", pgDeviceDtoList);
+        return resultMap;
+    }
+
+
+    /**
      * 新增设备
      */
     @POST
@@ -145,6 +182,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if (pgDeviceManager.getDeviceByAssetCode(assetCode)!=null) {
@@ -169,6 +207,7 @@
 
                 pgDeviceManager.save(pgDevice);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
 
@@ -177,10 +216,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -208,14 +246,9 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
-            /*
-            if (pgDeviceManager.getDeviceByAssetCode(assetCode)!=null) {
-                result = "false";
-                msg = "已存在同名设备";
-            } else {
-            */
             PgDevice pgDevice = pgDeviceManager.get(Long.valueOf(id));
             pgDevice.setPipeGallery(pipeGallery);
             pgDevice.setPartition(partition);
@@ -233,14 +266,14 @@
 
             pgDeviceManager.save(pgDevice);
             result = "true";
+            code="200";
             msg = "编辑成功";
-            //}
         } catch (Exception e) {
             result = "false";
             msg = "编辑失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("result",result);
         resultMap.put("msg",msg);
         return resultMap;
@@ -256,7 +289,8 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
-        String result="false";
+        String result="";
+        String code="0";
 
         try {
             PgDevice pgDevice=pgDeviceManager.get(Long.valueOf(id));
@@ -268,6 +302,7 @@
             {
                 pgDevice.setActive(0);
                 pgDeviceManager.save(pgDevice);
+                code="200";
                 msg="设备删除成功";
                 result="true";
             }
@@ -276,6 +311,7 @@
             msg="设备删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -291,18 +327,18 @@
     {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         PgDeviceDto pgDeviceDto=null;
 
         try{
             PgDevice pgDevice=pgDeviceManager.getDeviceBydevCode(devCode);
             if(pgDevice==null) {
                 msg = "设备信息获取失败";
-                resultMap.put("result",null);
             }
             else{
                 pgDeviceDto = new PgDeviceDto(pgDevice);
                 msg = "设备信息获取成功";
-                resultMap.put("result",pgDeviceDto);
+                code="200";
             }
         }
         catch(Exception ex)
@@ -310,8 +346,9 @@
             ex.printStackTrace();
             msg="设备状态获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgDeviceDto);
         return resultMap;
     }
 
@@ -324,17 +361,17 @@
     public Map<String,Object> getDeviceByPartition(@FormParam("partition") String partition) throws Exception{
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<PgDeviceDto>();
 
         try{
             pgDeviceDtoList=pgDeviceManager.getPgDeviceDtoListByPartition(partition);
             if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0) {
                 msg = "设备信息获取失败";
-                resultMap.put("result",null);
             }
             else {
+                code="200";
                 msg = "设备信息获取成功";
-                resultMap.put("result",pgDeviceDtoList);
             }
         }
         catch(Exception e)
@@ -342,8 +379,9 @@
             e.printStackTrace();
             msg="设备信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgDeviceDtoList);
         return resultMap;
     }
 
@@ -353,17 +391,16 @@
     public Map<String,Object> getDeviceByOldDAssetCodeCode(@FormParam("assetCode") String assetCode) throws Exception{
         Map<String, Object> resultMap = new HashMap<>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
 
         try{
             pgDeviceDtoList=pgDeviceManager.getDeviceByOldDAssetCodeCode(assetCode);
-            if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0) {
-                msg = "设备信息获取失败";;
-                resultMap.put("result",null);
-            }
+            if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0)
+                msg = "设备信息获取失败";
             else {
                 msg = "设备信息获取成功";
-                resultMap.put("result",pgDeviceDtoList);
+                code="200";
             }
         }
         catch(Exception e)
@@ -372,8 +409,9 @@
             msg="设备信息获取失败";
             resultMap.put("result",null);
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgDeviceDtoList);
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java
index 421d249..f6f167d 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java
@@ -38,17 +38,21 @@
     public Map<String, Object> getDeviceTpeyList()throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgDeviceTypeDto> pgDeviceTypeDtoList=new ArrayList<PgDeviceTypeDto>();
         try {
             pgDeviceTypeDtoList = pgDeviceTypeManager.getAllDeviceType();
             if(pgDeviceTypeDtoList.size()==0)
                 msg="没有找到设备类型信息";
-            else
-                msg="设备类型信息获取成功";
+            else {
+                code="200";
+                msg = "设备类型信息获取成功";
+            }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备类型信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgDeviceTypeDtoList);
         return resultMap;
@@ -66,6 +70,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if (pgDeviceTypeManager.getDeviceTypeByDeType(devType)!=null) {
@@ -79,6 +84,7 @@
 
                 pgDeviceTypeManager.save(pgDeviceType);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
 
@@ -87,10 +93,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
index c276fb3..c789960 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
@@ -44,6 +44,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 
         try {
@@ -62,6 +63,7 @@
                 pgEquipment.setActive(1);
 
                 pgEquipmentManager.save(pgEquipment);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -70,9 +72,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -89,9 +91,10 @@
                                             @FormParam("ownerUnit") String ownerUnit,
                                             @FormParam("enterDate") String enterDate,
                                             @FormParam("curUser") String curUser) {
-        HashMap<String, Object> resultMap = new HashMap<String, Object>();
+        HashMap<String, Object> resultMap = new HashMap<>();
         String msg = "";
         String result = "";
+        String code="0";
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 
         try {
@@ -111,6 +114,7 @@
                 pgEquipment.setEnterDate(sdf.parse(enterDate));
 
                 pgEquipmentManager.save(pgEquipment);
+                code="200";
                 msg="编辑成功";
                 result="true";
             }
@@ -119,9 +123,9 @@
             result = "false";
             msg = "编辑失败";
         }
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -134,16 +138,19 @@
     public Map<String, Object> getEquipment(@FormParam("eqName") String eqName,
                                             @FormParam("eqCode") String eqCode,
                                             @FormParam("eqType") String eqType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        List<PgEquipmentDto> pgEquipmentDtoList=new ArrayList<PgEquipmentDto>();
+        String code="0";
+        List<PgEquipmentDto> pgEquipmentDtoList=new ArrayList<>();
 
         try{
             pgEquipmentDtoList=pgEquipmentManager.getEquipmentDtiList(eqName,eqCode,eqType);
             if(pgEquipmentDtoList==null||pgEquipmentDtoList.size()==0)
                 msg="不存在工器具记录";
-            else
-                msg="维获取成功";
+            else {
+                code = "200";
+                msg = "维获取成功";
+            }
         }
         catch(Exception e)
         {
@@ -166,6 +173,7 @@
         HashMap<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
         String result = "";
+        String code="";
 
         try {
             PgEquipment pgEquipment=pgEquipmentManager.get(Long.valueOf(id));
@@ -178,6 +186,7 @@
             {
                 pgEquipment.setActive(0);
                 pgEquipmentManager.save(pgEquipment);
+                code="200";
                 msg="删除成功";
                 result="true";
             }
@@ -186,6 +195,7 @@
             msg="设备信息获取失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -201,16 +211,19 @@
             throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=new ArrayList<PgDeviceTypeStatisticDto>();
 
         try {
             pgDeviceTypeStatisticDtoList=pgEquipmentManager.getDeviceStatisticByDevType(eqType);
 
+            code="200";
             msg = "获取成功";
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceTypeStatisticDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
index 05a9709..a90fd6c 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
@@ -4,9 +4,9 @@
 import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
 import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
 import com.casic.PgInterface.intelPlan.manager.PgPileAcuManager;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import com.casic.PgInterface.test.PlanData;
 import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.ModelAttribute;
 
 import javax.annotation.Resource;
 import javax.ws.rs.FormParam;
@@ -32,23 +32,25 @@
     public Map<String,Object> getPlanResult(@FormParam("planParamStr") String planParamStr){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
-        //List<PgPlanTask> pgPlanTaskList=pgPlanParams.getPgPlanTaskList();
         List<PgPlanTask> pgPlanTaskList=new PgPlanParams().getPgPlanParamsByString(planParamStr);
         List<PgPlanResultRe> pgPlanResultReList=new ArrayList<>();
 
-        try{
-                pgPlanResultReList=pgPileAcuManager.getPgPlanResultList(pgPlanTaskList);
-                if(pgPlanResultReList==null)
-                    msg="管线智能规划出错";
-                else
-                    msg="管线智能规划完成";
+        try {
+            pgPlanResultReList = pgPileAcuManager.getPgPlanResultList(pgPlanTaskList);
+            if (pgPlanResultReList == null)
+                msg = "管线智能规划出错";
+            else {
+                code="200";
+                msg = "管线智能规划完成";
+            }
         }
         catch(Exception ex){
             msg="智能规划出错";
             ex.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgPlanResultReList);
 
@@ -80,4 +82,30 @@
         return resultMap;
     }
 
+    @POST
+    @Path("getPlanTask")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getACUTask(@FormParam("pileAcuList") String pileAcuList){
+
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        String code="0";
+        List<PgAcuTask> pgAcuTaskList=new ArrayList<>();
+
+        try{
+            pgAcuTaskList=pgPileAcuManager.getACUTask(pileAcuList);
+            code="200";
+            msg="任务获取成功";
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            msg="任务获取失败";
+        }
+        resultMap.put("code",code);
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgAcuTaskList);
+
+        return resultMap;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
index ff85c61..66eec76 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
@@ -55,13 +55,13 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         try {
             PgInPgPerson pgInPgPerson = null;//pgInPgPersonManager.getPersonByUserName(userName);
             int iHostName = pgTagMacManager.getCount("select count(1) from PGTagMac where hostname = ?",assetCode);
-//            int iTagMac = pgTagMacManager.getCount("select count(1) from PGTagMac where tagmac = ?",assetCode.toUpperCase());
             if (0==iHostName)
             {
                 result = "false";
@@ -92,9 +92,8 @@
 
                 pgInPgStatusManager.save(pgInPgStatus);
 
-//                String syResult=pgInPgPersonManager.synchorizedInPgInfo(assetCode,userCode,userName,personType);
+                code="200";
                 result = "true";
-//                msg = "人员注册保存成功"+syResult;
                 msg = "人员注册保存成功";
             }
             else {
@@ -106,6 +105,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -120,6 +120,7 @@
     public Map<String, Object> getInPgPerson() throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<>();
         try {
@@ -127,11 +128,15 @@
             if (pgInPgInfoDtoList == null || pgInPgInfoDtoList.size() == 0)
                 msg = "没有找到入廊人员信息";
             else
+            {
+                code="200";
                 msg = "入廊人员信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "入廊人员信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
         return resultMap;
@@ -146,18 +151,22 @@
     public Map<String, Object> getInPgPersonInPg() throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
 
-        List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<PgInPgInfoDto>();
+        List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<>();
         try {
             pgInPgInfoDtoList = pgInPgPersonManager.getPgInPersonList(1);
             if (pgInPgInfoDtoList == null || pgInPgInfoDtoList.size() == 0)
                 msg = "没有找到入廊人员信息";
-            else
+            else {
+                code="200";
                 msg = "入廊人员信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "入廊人员信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
         return resultMap;
@@ -172,6 +181,7 @@
     public Map<String, Object> getInPgPersonByName(@FormParam("userName") String userName) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
 
         PgInPgPerson pgInPgPerson = null;
         PgInPgPersonDto pgInPgPersonDto=null;
@@ -184,12 +194,13 @@
                 pgInPgPersonDto=new PgInPgPersonDto(pgInPgPerson);
                 pgInPgPersonDtoList.add(pgInPgPersonDto);
                 msg = "人员信息获取成功";
+                code="200";
             }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "人员信息获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgPersonDtoList);
         return resultMap;
@@ -206,6 +217,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             PgInPgPerson pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName);
@@ -221,6 +233,7 @@
                     pgInPgPersonManager.save(pgInPgPerson);
                     result = "true";
                     msg = "编辑成功";
+                    code="200";
                 }
             }
         } catch (Exception e) {
@@ -228,9 +241,9 @@
             msg = "编辑失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -244,10 +257,12 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         int inPgNum=0;
         String msg = "";
+        String code="0";
 
         try{
             inPgNum=pgInPgStatusManager.getInPgNum();
 
+            code="200";
             msg="人员入廊次数获取成功";
         }
         catch(Exception e)
@@ -255,6 +270,7 @@
             e.printStackTrace();
             msg="人员入廊次数获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",inPgNum);
 
@@ -272,18 +288,22 @@
                                                    @FormParam("statisticType") String statisticType) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
 
         List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<PgInPgInfoDto>();
         try {
             pgInPgInfoDtoList = pgInPgPersonManager.getPgInPersonListByTime(startTime, endTime, statisticType);
             if(pgInPgInfoDtoList==null)
                 msg="入廊人员统计信息获取失败";
-            else
-                msg="入廊人员统计信息获取成功";
+            else {
+                code="200";
+                msg = "入廊人员统计信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "入廊人员统计信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
         return resultMap;
@@ -296,6 +316,7 @@
 
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
 
         try {
@@ -304,8 +325,10 @@
                 pgDeviceDtoList=pgDeviceManager.getPgCameraListByPosition("",apCodeStr);
                 if(pgDeviceDtoList==null)
                     msg="不存在关联摄像机";
-                else
-                    msg="关联摄像机获取成功";
+                else {
+                    code="200";
+                    msg = "关联摄像机获取成功";
+                }
             } else {
                 msg="请输入Ap编号";
             }
@@ -315,6 +338,7 @@
             msg="关联摄像机获取成功";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgDeviceDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java
index 507b3fe..b43f077 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java
@@ -34,6 +34,7 @@
 
         String result="";
         String msg="";
+        String code="";
         try{
             PgInPgStatus pgInPgStatus=new PgInPgStatus();
 
@@ -44,6 +45,7 @@
             pgInPgStatusManager.save(pgInPgStatus);
             msg="入廊时间提交成功";
             result="true";
+            code="200";
         }
         catch (Exception e){
             e.printStackTrace();
@@ -51,6 +53,7 @@
             result="false";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -66,6 +69,7 @@
 
         String result="";
         String msg="";
+        String code="0";
         try{
             PgInPgPerson pgInPgPerson=pgInPgPersonManager.getPgInPgPersonByAssetCode(assetCode);
 
@@ -79,6 +83,7 @@
             pgInPgStatusManager.save(pgInPgStatus);
 
             msg="出廊时间提交成功";
+            code="200";
             result="true";
         }
         catch (Exception e){
@@ -87,6 +92,7 @@
             result="false";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
index 9def330..9c0ba1f 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
@@ -33,17 +33,20 @@
                                             @FormParam("existNum") String existNum) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         String result="";
 
         try {
             pgIntelPlanManager.savePgIntelPlan(parName,lineName,maxNum,existNum);
             msg="规划数据保存成功";
+            code="200";
             result="true";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "规划数据保存失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
@@ -55,15 +58,18 @@
     public Map<String, Object> getIntelLineType() throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgIntelPlanTypeDto> pgIntelPlanTypeDtoList=new ArrayList<>();
         try {
             pgIntelPlanTypeDtoList=pgIntelPlanManager.getIntelPlanType();
+            code="200";
             msg="获取排线类型成功";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "获取排线类型失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgIntelPlanTypeDtoList);
         return resultMap;
@@ -76,6 +82,7 @@
                                             @FormParam("partitionStr") String partitionStr) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgIntelPlanDto> pgIntelPlanDtoList = new ArrayList<>();
 
@@ -83,8 +90,10 @@
             pgIntelPlanDtoList = pgIntelPlanManager.getPgIntelPlanListByPartion(lineName, partitionStr);
             if(pgIntelPlanDtoList==null||pgIntelPlanDtoList.size()==0)
                 msg="请输入正确的规划参数";
-            else
-                msg="规划数据获取成功";
+            else {
+                code="200";
+                msg = "规划数据获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "规划数据获取失败";
@@ -103,10 +112,12 @@
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
         String result="";
+        String code="0";
 
         try {
             boolean bl=pgIntelPlanManager.addLineUse(lineName,partitionStr,num);
             if(bl){
+                code="200";
                 msg="排线入廊成功";
                 result="true";
             }
@@ -119,6 +130,7 @@
             msg = "排线入廊失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
@@ -132,6 +144,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
         String result="";
+        String code="0";
 
         try {
             PgIntelPlan pgIntelPlan=pgIntelPlanManager.getPgIntelPlanByParNameAndLine(lineName,parName);
@@ -140,11 +153,13 @@
             pgIntelPlanManager.save(pgIntelPlan);
             msg="规划数据删除成功";
             result="true";
+            code="200";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "规划数据删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java b/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java
index 378af00..9c39523 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java
@@ -1,5 +1,6 @@
 package com.casic.PgInterface.rs;
 
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
 import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
 import com.casic.PgInterface.intelPlan.dto.PgLineHoleDTO;
 import com.casic.PgInterface.intelPlan.manager.PgLineHoleManager;
@@ -27,6 +28,9 @@
     @Resource
     private PgPileAcuManager pgPileAcuManager;
 
+    @Resource
+    private PgRoadManager pgRoadManager;
+
     @POST
     @Path("getPgLineAcuHole")
     @Produces(MediaType.APPLICATION_JSON)
@@ -34,23 +38,32 @@
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
         String result="";
+        String code="0";
         List<PgLineHoleDTO> pgLineHoleDTOList=new ArrayList<>();
 
         try {
             PgPileAcu pgPileAcu=pgPileAcuManager.getPgPileAcuByCode(acuCode);
             if(pgPileAcu==null){
                 msg="不存在分区";
-            }else{
-                pgLineHoleDTOList=pgLineHoleManager.getCurrentHoleByAcu(pgPileAcu.getId());
-                if(pgLineHoleDTOList!=null&&pgLineHoleDTOList.size()!=0)
-                    msg="获取成功";
-                else
-                    msg="未找到入廊数据";
+            }else {
+                pgLineHoleDTOList = pgLineHoleManager.getCurrentHoleByAcu(pgPileAcu.getId());
+                if (pgLineHoleDTOList != null && pgLineHoleDTOList.size() != 0)
+                {
+                    code="200";
+                    msg = "获取成功";
+                }
+                else {
+                    PgLineHoleDTO pgLineHoleDTO=new PgLineHoleDTO();
+                    pgLineHoleDTO.setRoad(pgRoadManager.get(pgPileAcu.getRoadId()).getRoadName());
+                    pgLineHoleDTOList.add(pgLineHoleDTO);
+                    msg = "未找到入廊数据";
+                }
             }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgLineHoleDTOList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgLogRs.java b/src/main/java/com/casic/PgInterface/rs/PgLogRs.java
index 39cff52..30db63b 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgLogRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgLogRs.java
@@ -45,6 +45,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         PgLog pgLog=new PgLog();
         try {
             PgUser pgUser = new PgUser();
@@ -60,14 +61,15 @@
             pgLogManager.save(pgLog);
             result = "true";
             msg = "保存成功";
-
+            code="200";
         } catch (Exception e) {
             result = "false";
             msg = "保存失败";
             e.printStackTrace();
         }
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -83,17 +85,21 @@
             throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgLogDto> pgLogDtoList = new ArrayList<PgLogDto>();
         try {
             pgLogDtoList = pgLogManager.getAllLogs(userName, startTime, endTime);
             if (pgLogDtoList == null || pgLogDtoList.size() == 0)
                 msg = "没有找到日志信息";
-            else
+            else {
+                code="200";
                 msg = "日志信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "日志信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgLogDtoList);
         return resultMap;

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 25ded8a..283d7ab 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,20 +7,56 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" 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/construction/manager/PgCsDocumentManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/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/manager/PgAlarmManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/~$说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/~$说明20191207.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.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$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/接口说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明20191207.docx" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
@@ -51,7 +87,7 @@
         <counts>
           <entry key="class" value="4" />
           <entry key="iml" value="2" />
-          <entry key="java" value="707" />
+          <entry key="java" value="820" />
           <entry key="properties" value="14" />
           <entry key="xml" value="7" />
         </counts>
@@ -60,7 +96,7 @@
         <counts>
           <entry key="CLASS" value="4" />
           <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="707" />
+          <entry key="JAVA" value="820" />
           <entry key="Properties" value="14" />
           <entry key="XML" value="7" />
         </counts>
@@ -68,32 +104,32 @@
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
           <entry key="dummy" value="38" />
-          <entry key="java" value="30161" />
+          <entry key="java" value="40859" />
           <entry key="properties" value="100" />
-          <entry key="txt" value="176" />
+          <entry key="txt" value="186" />
           <entry key="xml" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="30161" />
-          <entry key="PLAIN_TEXT" value="214" />
+          <entry key="JAVA" value="40859" />
+          <entry key="PLAIN_TEXT" value="224" />
           <entry key="Properties" value="100" />
           <entry key="XML" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="48" />
+          <entry key="project.closed" value="51" />
           <entry key="project.open.time.1" value="5" />
           <entry key="project.open.time.12" value="2" />
           <entry key="project.open.time.13" value="1" />
           <entry key="project.open.time.15" value="1" />
           <entry key="project.open.time.16" value="1" />
           <entry key="project.open.time.17" value="1" />
-          <entry key="project.open.time.2" value="1" />
+          <entry key="project.open.time.2" value="2" />
           <entry key="project.open.time.20" value="1" />
-          <entry key="project.open.time.23" value="1" />
+          <entry key="project.open.time.23" value="2" />
           <entry key="project.open.time.24" value="2" />
           <entry key="project.open.time.251" value="1" />
           <entry key="project.open.time.27" value="2" />
@@ -106,8 +142,8 @@
           <entry key="project.open.time.36" value="1" />
           <entry key="project.open.time.37" value="1" />
           <entry key="project.open.time.39" value="2" />
-          <entry key="project.open.time.4" value="2" />
-          <entry key="project.open.time.40" value="1" />
+          <entry key="project.open.time.4" value="3" />
+          <entry key="project.open.time.40" value="2" />
           <entry key="project.open.time.41" value="2" />
           <entry key="project.open.time.42" value="2" />
           <entry key="project.open.time.43" value="2" />
@@ -122,23 +158,25 @@
           <entry key="project.open.time.6" value="3" />
           <entry key="project.open.time.63" value="2" />
           <entry key="project.open.time.64" value="1" />
+          <entry key="project.open.time.66" value="1" />
           <entry key="project.open.time.71" value="2" />
+          <entry key="project.open.time.74" value="1" />
           <entry key="project.open.time.76" value="1" />
           <entry key="project.open.time.8" value="2" />
           <entry key="project.open.time.9" value="1" />
           <entry key="project.open.time.97" value="1" />
-          <entry key="project.opened" value="78" />
+          <entry key="project.opened" value="84" />
         </counts>
       </usages-collector>
     </session>
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+            <state relative-caret-position="396">
+              <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
               <folding>
                 <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
                 <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -147,73 +185,6 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <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="99">
-              <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-              <folding>
-                <element signature="imports" expanded="true" />
-                <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-1170">
-              <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state>
-              <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
-              <folding>
-                <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-                <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="true">
-        <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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-              <folding>
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-                <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>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <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="352">
-              <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -225,18 +196,9 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>inCriteria</find>
-      <find>getPgPlanResulList</find>
-      <find>getPileAcuListByPileAcuStr</find>
-      <find>distinct</find>
-      <find>order</find>
-      <find>canPlanLine</find>
-      <find>isExistLine</find>
-      <find>getPlanResult</find>
       <find>pgPipeLine</find>
       <find>getPipeLineBylineName</find>
       <find>StringU</find>
-      <find>getAllAlarm</find>
       <find>getAlarmList</find>
       <find>getPgInPersonListByDay</find>
       <find>getDayInPgStatistic</find>
@@ -254,7 +216,16 @@
       <find>getPgContructionByNameOrType</find>
       <find>&quot;&quot;,&quot;&quot;,</find>
       <find>getPgContructionDtoByNameOrType</find>
+      <find>addConstruction</find>
+      <find>getPgLineAcuHole</find>
+      <find>getPlanResult</find>
       <find>getConstruction</find>
+      <find>addPipeLine</find>
+      <find>未找到入廊数据</find>
+      <find>getCurrentHoleByAcu</find>
+      <find>getAllAlarm</find>
+      <find>getPgDeviceDtoListByPartition</find>
+      <find>getPgDeviceByDevType</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -263,57 +234,57 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlan.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileHoleManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/planData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/PlanData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
       </list>
     </option>
   </component>
@@ -359,7 +330,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -421,53 +391,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="dto" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="manager" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -479,29 +402,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="rs" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -516,6 +416,7 @@
         </subPane>
       </pane>
       <pane id="Scope" />
+      <pane id="PackagesPane" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -710,7 +611,13 @@
       <workItem from="1574902733573" duration="1829000" />
       <workItem from="1574998240004" duration="7016000" />
       <workItem from="1575247959683" duration="6997000" />
-      <workItem from="1575704345590" duration="40473000" />
+      <workItem from="1575704345590" duration="69381000" />
+      <workItem from="1575869479666" duration="721000" />
+      <workItem from="1575947104878" duration="6101000" />
+      <workItem from="1576128264436" duration="3347000" />
+      <workItem from="1576208571543" duration="22000" />
+      <workItem from="1576227513917" duration="862000" />
+      <workItem from="1576293721220" duration="18246000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -817,11 +724,18 @@
       <option name="project" value="LOCAL" />
       <updated>1575775489149</updated>
     </task>
-    <option name="localTasksCounter" value="16" />
+    <task id="LOCAL-00016" summary="整改施工信息">
+      <created>1575791780774</created>
+      <option name="number" value="00016" />
+      <option name="presentableId" value="LOCAL-00016" />
+      <option name="project" value="LOCAL" />
+      <updated>1575791780774</updated>
+    </task>
+    <option name="localTasksCounter" value="17" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="452131000" />
+    <option name="totallyTimeSpent" value="510338000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -834,9 +748,8 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
-    <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.24205749" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2647504" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -847,7 +760,7 @@
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.3295082" />
       <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.4819672" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.65737706" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.3295082" />
@@ -939,7 +852,8 @@
     <MESSAGE value="重新设计智能规划部分" />
     <MESSAGE value="完成智能规划对接" />
     <MESSAGE value="修改报警统计" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改报警统计" />
+    <MESSAGE value="整改施工信息" />
+    <option name="LAST_COMMIT_MESSAGE" value="整改施工信息" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -951,16 +865,10 @@
           <option name="timeStamp" value="3" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java</url>
-          <line>69</line>
+          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java</url>
+          <line>40</line>
           <properties />
-          <option name="timeStamp" value="21" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java</url>
-          <line>96</line>
-          <properties />
-          <option name="timeStamp" value="38" />
+          <option name="timeStamp" value="122" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
@@ -970,394 +878,452 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <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="2068">
-          <caret line="154" column="35" selection-start-line="154" selection-start-column="35" selection-end-line="154" selection-end-column="35" />
-        </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="3300">
-          <caret line="297" column="22" selection-start-line="297" selection-start-column="22" selection-end-line="297" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/StringUtils.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
-          <caret line="13" column="48" lean-forward="true" selection-start-line="13" selection-start-column="48" selection-end-line="13" selection-end-column="48" />
+          <caret line="11" column="5" selection-start-line="11" selection-start-column="5" selection-end-line="11" selection-end-column="5" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="78" lean-forward="true" selection-start-line="78" selection-end-line="78" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="616">
-          <caret line="41" column="1" selection-start-line="41" selection-start-column="1" selection-end-line="41" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="110">
-          <caret line="12" column="23" selection-start-line="12" selection-start-column="23" selection-end-line="12" selection-end-column="23" />
+        <state relative-caret-position="516">
+          <caret line="114" column="12" selection-start-line="114" selection-start-column="12" selection-end-line="114" selection-end-column="12" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="164">
-          <caret line="56" lean-forward="true" selection-start-line="56" selection-end-line="56" />
+        <state relative-caret-position="418">
+          <caret line="33" column="44" selection-start-line="33" selection-start-column="44" selection-end-line="33" selection-end-column="44" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="258">
-          <caret line="27" column="12" lean-forward="true" selection-start-line="27" selection-start-column="12" selection-end-line="27" selection-end-column="12" />
+        <state relative-caret-position="132">
+          <caret line="11" column="20" lean-forward="true" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="20" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.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="-12">
-          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        <state relative-caret-position="516">
+          <caret line="142" column="54" selection-start-line="142" selection-start-column="54" selection-end-line="142" selection-end-column="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="858">
-          <caret line="55" column="27" lean-forward="true" selection-start-line="55" selection-start-column="27" selection-end-line="55" selection-end-column="27" />
+        <state relative-caret-position="66">
+          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="58">
+          <caret line="18" column="28" selection-start-line="18" selection-start-column="19" selection-end-line="18" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="305">
+          <caret line="24" column="31" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="714">
+          <caret line="58" column="5" lean-forward="true" selection-start-line="58" selection-start-column="5" selection-end-line="58" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="924">
+          <caret line="134" column="92" selection-start-line="134" selection-start-column="92" selection-end-line="134" selection-end-column="92" />
+          <folding>
+            <element signature="method#linkDevice#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkPartitionCamera#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkReservePlan#0;class#PgAlarmLinkRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1066">
+          <caret line="90" lean-forward="true" selection-start-line="90" selection-end-line="90" />
+          <folding>
+            <element signature="method#getTjResultByAlarmType#0;class#PgAlarmTjRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="946">
+          <caret line="148" column="11" lean-forward="true" selection-start-line="148" selection-start-column="11" selection-end-line="148" selection-end-column="11" />
+          <folding>
+            <element signature="method#getAlarmTypeList#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#addAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#editAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#deleteAlarmType#0;class#PgAlarmTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="208">
+          <caret line="46" column="23" lean-forward="true" selection-start-line="46" selection-start-column="23" selection-end-line="46" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="113" column="9" lean-forward="true" selection-start-line="113" selection-start-column="9" selection-end-line="113" selection-end-column="9" />
+          <folding>
+            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
+            <element signature="method#getNewestCh4InfoByDev#0;class#PgCh4Rs#0" />
+            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="145" column="6" lean-forward="true" selection-start-line="145" selection-start-column="6" selection-end-line="145" selection-end-column="6" />
+          <folding>
+            <element signature="method#addAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#editAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#deleteAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#getAuthorityList#0;class#PgAuthorityRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="58" column="1" lean-forward="true" selection-start-line="58" selection-start-column="1" selection-end-line="58" selection-end-column="1" />
+          <folding>
+            <element signature="method#getPgAssetPlanList#0;class#PgAssetPlanRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="370">
+          <caret line="371" column="66" selection-start-line="371" selection-start-column="66" selection-end-line="371" selection-end-column="66" />
+          <folding>
+            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#searchConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionDev#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="139" column="13" lean-forward="true" selection-start-line="139" selection-start-column="13" selection-end-line="139" selection-end-column="13" />
+          <folding>
+            <element signature="method#getCoInfoByDevAndDate#0;class#PgCoRs#0" />
+            <element signature="method#getNewestCoInfoByDev#0;class#PgCoRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="540">
+          <caret line="223" column="5" lean-forward="true" selection-start-line="223" selection-start-column="5" selection-end-line="223" selection-end-column="5" />
+          <folding>
+            <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="682">
+          <caret line="100" lean-forward="true" selection-start-line="100" selection-end-line="100" />
+          <folding>
+            <element signature="method#getDeviceTpeyList#0;class#PgDeviceTypeRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="377">
+          <caret line="225" column="35" selection-start-line="225" selection-start-column="35" selection-end-line="225" selection-end-column="35" />
+          <folding>
+            <element signature="method#addEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#addEquipment#1;class#PgEquipmentRs#0" />
+            <element signature="method#getEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#deleteEquipment#0;class#PgEquipmentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="406">
+          <caret line="109" lean-forward="true" selection-start-line="109" selection-end-line="109" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="154">
+          <caret line="28" column="19" selection-start-line="28" selection-start-column="19" selection-end-line="28" selection-end-column="19" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="748">
-          <caret line="49" column="5" lean-forward="true" selection-start-line="49" selection-start-column="5" selection-end-line="49" selection-end-column="5" />
+        <state relative-caret-position="296">
+          <caret line="161" column="35" selection-start-line="161" selection-start-column="35" selection-end-line="161" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="384">
+          <caret line="99" column="5" lean-forward="true" selection-start-line="99" selection-start-column="5" selection-end-line="99" selection-end-column="5" />
+        </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="362">
+          <caret line="340" column="35" selection-start-line="340" selection-start-column="35" selection-end-line="340" selection-end-column="35" />
+          <folding>
+            <element signature="method#addInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPersonInPg#0;class#PgInPgPersonRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-606">
+          <caret line="76" column="20" lean-forward="true" selection-start-line="76" selection-start-column="20" selection-end-line="76" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="65" column="35" selection-start-line="65" selection-start-column="35" selection-end-line="65" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="101" column="35" selection-start-line="101" selection-start-column="35" selection-end-line="101" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="84" column="35" selection-start-line="84" selection-start-column="35" selection-end-line="84" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="59" lean-forward="true" selection-start-line="59" selection-end-line="59" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="60" column="1" lean-forward="true" selection-start-line="60" selection-start-column="1" selection-end-line="60" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="145" column="35" selection-start-line="145" selection-start-column="35" selection-end-line="145" selection-end-column="35" />
+        </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="274">
+          <caret line="350" column="35" selection-start-line="350" selection-start-column="35" selection-end-line="350" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="121" column="39" selection-start-line="121" selection-start-column="39" selection-end-line="121" selection-end-column="39" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="28" column="8" lean-forward="true" selection-start-line="28" selection-start-column="8" selection-end-line="28" selection-end-column="8" />
+        <state relative-caret-position="340">
+          <caret line="103" selection-start-line="103" selection-end-line="103" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="226" column="35" selection-start-line="226" selection-start-column="35" selection-end-line="226" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="203" column="35" selection-start-line="203" selection-start-column="35" selection-end-line="203" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="241" column="35" selection-start-line="241" selection-start-column="35" selection-end-line="241" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="225" column="1" lean-forward="true" selection-start-line="225" selection-start-column="1" selection-end-line="225" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="176" column="5" lean-forward="true" selection-start-line="176" selection-start-column="5" selection-end-line="176" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="178" column="35" lean-forward="true" selection-start-line="178" selection-start-column="35" selection-end-line="178" selection-end-column="35" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="516">
-          <caret line="94" column="53" selection-start-line="94" selection-start-column="53" selection-end-line="94" selection-end-column="53" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="814">
-          <caret line="52" column="9" lean-forward="true" selection-start-line="52" selection-start-column="9" selection-end-line="52" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="182">
-          <caret line="58" column="12" lean-forward="true" selection-start-line="58" selection-start-column="12" selection-end-line="58" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="34" lean-forward="true" selection-start-line="34" selection-end-line="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="32" lean-forward="true" selection-start-line="32" selection-end-line="32" />
-          <folding>
-            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
-            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="185">
-          <caret line="63" column="13" selection-start-line="63" selection-start-column="13" selection-end-line="63" selection-end-column="13" />
-          <folding>
-            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
-            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
-            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="e#6319#6324#0" />
-            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
-          </folding>
+          <caret line="240" lean-forward="true" selection-start-line="240" selection-end-line="240" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
-          <caret line="58" column="28" lean-forward="true" selection-start-line="58" selection-start-column="28" selection-end-line="58" selection-end-column="28" />
-          <folding>
-            <element signature="method#addTempHumData#0;class#PgTempHumRs#0" />
-          </folding>
+        <state relative-caret-position="340">
+          <caret line="148" column="34" selection-start-line="148" selection-start-column="34" selection-end-line="148" selection-end-column="34" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
+        <state relative-caret-position="458">
+          <caret line="99" column="35" selection-start-line="99" selection-start-column="35" selection-end-line="99" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+        <state relative-caret-position="384">
+          <caret line="145" column="32" lean-forward="true" selection-start-line="145" selection-start-column="32" selection-end-line="145" selection-end-column="32" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="414">
-          <caret line="22" column="46" lean-forward="true" selection-start-line="22" selection-start-column="46" selection-end-line="22" selection-end-column="46" />
-        </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="396">
-          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" column="83" selection-start-line="11" selection-start-column="83" selection-end-line="11" selection-end-column="83" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="26">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
-          <folding>
-            <element signature="method#getPgInPgStatusByPerson#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNumByName#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNum#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPersonListByDay#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPgStatusByPgInPgPerson#0;class#PgInPgStatusManager#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="44">
-          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-12">
-          <caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="87" lean-forward="true" selection-start-line="87" selection-end-line="87" />
-          <folding>
-            <element signature="method#getConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#addConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#deleteConstructionType#0;class#PgConstructionTypeRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
-          <folding>
-            <element signature="method#getConstructionTypeByType#0;class#PgConstructionTypeManager#0" />
-            <element signature="method#getAllConstructionTypeDto#0;class#PgConstructionTypeManager#0" />
-          </folding>
-        </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="145">
-          <caret line="258" column="9" lean-forward="true" selection-start-line="258" selection-start-column="9" selection-end-line="258" selection-end-column="9" />
-          <folding>
-            <element signature="method#getMonthInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayInPgStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgOverViewRs#0" />
-            <element signature="method#getAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getMonthAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayAlarmStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgOverViewRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="103">
-          <caret line="105" column="50" lean-forward="true" selection-start-line="105" selection-start-column="50" selection-end-line="105" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateBasicDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="99">
-          <caret line="125" selection-start-line="125" selection-end-line="125" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="190">
-          <caret line="24" column="35" lean-forward="true" selection-start-line="24" selection-start-column="35" selection-end-line="24" selection-end-column="35" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="436">
-          <caret line="24" lean-forward="true" selection-start-line="24" selection-end-line="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" lean-forward="true" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="300">
-          <caret line="34" column="31" lean-forward="true" selection-start-line="34" selection-start-column="31" selection-end-line="34" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="42" column="13" lean-forward="true" selection-start-line="42" selection-start-column="13" selection-end-line="42" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="120" column="72" lean-forward="true" selection-start-line="120" selection-start-column="72" selection-end-line="120" selection-end-column="72" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="293">
-          <caret line="58" column="73" lean-forward="true" selection-start-line="58" selection-start-column="73" selection-end-line="58" selection-end-column="73" />
-          <folding>
-            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
-            <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
-          </folding>
-        </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="307">
-          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
+        <state relative-caret-position="758">
+          <caret line="130" column="5" lean-forward="true" selection-start-line="130" selection-start-column="5" selection-end-line="130" selection-end-column="5" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1170">
-          <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
+        <state relative-caret-position="494">
+          <caret line="86" column="62" lean-forward="true" selection-start-line="86" selection-start-column="62" selection-end-line="86" selection-end-column="62" />
           <folding>
-            <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-            <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+            <element signature="method#getAllDevice#0;class#PgDeviceManager#0" />
+            <element signature="method#getAllDev#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="195" column="28" lean-forward="true" selection-start-line="195" selection-start-column="28" selection-end-line="195" selection-end-column="28" />
+        <state relative-caret-position="166">
+          <caret line="174" column="13" lean-forward="true" selection-start-line="174" selection-start-column="13" selection-end-line="174" selection-end-column="13" />
           <folding>
-            <element signature="method#getAlarmByTypeAndTime#0;class#PgAlarmManager#0" />
-            <element signature="method#getAlarmNum#0;class#PgAlarmManager#0" />
             <element signature="method#getDayAlarmStatistic#0;class#PgAlarmManager#0" />
+            <element signature="method#getAlarmList#0;class#PgAlarmManager#0" />
             <element signature="method#createDTO#0;class#PgAlarmManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="364">
+          <caret line="46" column="56" lean-forward="true" selection-start-line="46" selection-start-column="56" selection-end-line="46" selection-end-column="56" />
+          <folding>
+            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
+            <element signature="method#getPgDev#0;class#PgDeviceRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
+            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+        <state relative-caret-position="396">
+          <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
           <folding>
             <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
             <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -1365,52 +1331,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="239">
-          <caret line="21" column="33" lean-forward="true" selection-start-line="21" selection-start-column="33" selection-end-line="21" selection-end-column="33" />
-        </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="352">
-          <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-        </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="99">
-          <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-          </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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-          <folding>
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-            <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>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
index c436c93..e913155 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
@@ -132,7 +132,10 @@
             this.setAlarmType("");
         else
             this.setAlarmType(pgAlarm.getAlarmTypeId().getAlarmType());
-        this.setAlarmValue(pgAlarm.getAlarmValue());
+        if(pgAlarm.getAlarmValue()==null)
+            this.setAlarmValue("");
+        else
+            this.setAlarmValue(pgAlarm.getAlarmValue());
         if (pgAlarm.getAlarmDate() != null)
             this.setAlarmDate(sdf.format(pgAlarm.getAlarmDate()));
         else
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
index a43965c..565cb41 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -159,11 +159,21 @@
     }
 
     //获取历史报警消息列表
-    public List<PgAlarmDto> getAllAlarm(String alarmType,String startDay,String endDay,String isNew,int page,int rows) {
-        try {
+    public  Map<String, Object> getAllAlarm(String alarmType,String partition,String startDay,String endDay,String isNew,int page,int rows) {
 
+        Map<String, Object> resultMap = new HashMap<>();
+        String msg="";
+
+        try {
             Criteria criteria = createCriteria(PgAlarm.class);
 
+            if (StringUtils.isNotBlank(partition)) {
+                DetachedCriteria inCriteria = DetachedCriteria.forClass(PgDevice.class);
+                inCriteria.add(Restrictions.eq("partition", partition));
+                inCriteria.setProjection(Property.forName("id"));
+                criteria.add(Property.forName("alarmDevId").in(inCriteria));
+            }
+
             if (StringUtils.isNotBlank(alarmType)&&!alarmType.contains("全部")&&pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
                 criteria.add(Restrictions.eq("alarmTypeId", pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)));
 
@@ -190,8 +200,16 @@
             for (PgAlarm pgAlarm : pgAlarmList) {
                 pgAlarmDtoList.add(new PgAlarmDto(pgAlarm));
             }
-
-            return pgAlarmDtoList;
+            if(pgAlarmDtoList==null||pgAlarmDtoList.size()==0) {
+                resultMap.put("msg", "没有报警信息");
+                resultMap.put("code","0");
+            }else {
+                resultMap.put("code","200");
+                resultMap.put("msg", "报警信息获取成功");
+            }
+            resultMap.put("count",pg.getTotalCount());
+            resultMap.put("result",pgAlarmDtoList);
+            return resultMap;
         }
         catch(Exception ex){
             ex.printStackTrace();
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index 7547560..654f49e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -24,11 +24,11 @@
 
         Criteria criteria = createCriteria(PgDevice.class);
 
-        if(road!=null)
+        if(StringUtils.isNotBlank(road))
             criteria.add(Restrictions.eq("road",road));
-        if(partition!=null)
+        if(StringUtils.isNotBlank(partition))
             criteria.add(Restrictions.eq("partition",partition));
-        if(devType!=null)
+        if(StringUtils.isNotBlank(devType))
             criteria.add(Restrictions.eq("devType",devType));
 
         criteria.add(Restrictions.eq("active", 1));
@@ -43,6 +43,29 @@
         return pgDeviceDtoList;
     }
 
+    public List<PgDeviceDto> getAllDev(String road,String partition,String devType) {
+
+        Criteria criteria = createCriteria(PgDevice.class);
+
+        if(StringUtils.isNotBlank(road))
+            criteria.add(Restrictions.eq("road",road));
+        if(StringUtils.isNotBlank(partition))
+            criteria.add(Restrictions.eq("partition",partition));
+        if(StringUtils.isNotBlank(devType))
+            criteria.add(Restrictions.like("devType","%"+devType+"%"));
+
+        criteria.add(Restrictions.eq("active", 1));
+        criteria.addOrder(Order.desc("id"));
+        List<PgDevice> pgDeviceList = criteria.list();
+
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
+        for (PgDevice pgDevice : pgDeviceList) {
+            pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
+        }
+
+        return pgDeviceDtoList;
+    }
+
     //根据名字获取当前设备
     public PgDevice getDeviceByAssetCode(String assetCode) {
         Criteria criteria=createCriteria(PgDevice.class);
@@ -56,9 +79,9 @@
     }
 
     //根据类型获取设备列表
-    public List<PgDeviceDto> getDeviceByDevTypee(String devType) {
+    public List<PgDeviceDto> getDeviceByDevType(String devType) {
         Criteria criteria=createCriteria(PgDevice.class);
-        criteria.add(Restrictions.eq("devType",devType));
+        criteria.add(Restrictions.like("devType","%"+devType+"%"));
 
         List<PgDevice> pgDeviceList=criteria.list();
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
@@ -106,7 +129,7 @@
         criteria.add(Restrictions.eq("partition",partition));
 
         List<PgDevice> pgDeviceList=criteria.list();
-        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<PgDeviceDto>();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
 
         for (PgDevice pgDevice : pgDeviceList) {
             pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
index 3a3bccd..595730e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
@@ -1,10 +1,13 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.devTable.domain.PgAlarmType;
 import com.casic.PgInterface.devTable.domain.PgPartition;
 import com.casic.PgInterface.devTable.domain.PgRoad;
 import com.casic.PgInterface.devTable.domain.PipeGallery;
 import com.casic.PgInterface.devTable.dto.PgPartitionDto;
+import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
@@ -12,7 +15,9 @@
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Created by yxw on 2017/11/4.
@@ -21,7 +26,8 @@
 public class PgPartitionManager extends HibernateEntityDao<PgPartition> {
 
     @Resource
-    PgRoadManager pgRoadManager;
+    private PgRoadManager pgRoadManager;
+
 
     public PgPartition getPartitionByParName(String parName) {
         Criteria criteria = getSession().createCriteria(PgPartition.class);
@@ -99,4 +105,5 @@
         return pgPartitionDtoList;
     }
 
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
index f216360..a6928f1 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
@@ -5,6 +5,7 @@
 public class PgPlanResultRe {
 
     private String taskKey;
+    private List<String> pileAcuList;
     private List<PgPlanResult> pgPlanResultList;
 
     public String getTaskKey() {
@@ -15,6 +16,14 @@
         this.taskKey = taskKey;
     }
 
+    public List<String> getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(List<String> pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+
     public List<PgPlanResult> getPgPlanResultList() {
         return pgPlanResultList;
     }
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
index 71ea765..47eea07 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
@@ -54,9 +54,7 @@
 
         List<PgLineHole> pgLineHoleList=criteria.list();
         List<PgLineHoleDTO> pgLineHoleDTOList=new ArrayList<>();
-        if(pgLineHoleList==null||pgLineHoleList.size()==0)
-            return null;
-        else
+        if(pgLineHoleList!=null&&pgLineHoleList.size()!=0)
             pgLineHoleDTOList=PgLineHoleDTO.ConvertToDTOList(pgLineHoleList,pgPileAcuManager,pgRoadManager);
         return pgLineHoleDTOList;
     }
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
index 0fd9e1f..841a386 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
@@ -1,12 +1,15 @@
 package com.casic.PgInterface.intelPlan.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.devTable.domain.PgPartition;
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
 import com.casic.PgInterface.intelPlan.domain.PgLineHole;
 import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
 import com.casic.PgInterface.intelPlan.domain.PgSection;
 import com.casic.PgInterface.intelPlan.dto.PgPlanResult;
 import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
 import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -22,6 +25,9 @@
     @Resource
     private PgLineHoleManager pgLineHoleManager;
 
+    @Resource
+    private PgRoadManager pgRoadManager;
+
     public PgPileAcu getPgPileAcuByCode(String acuCode){
         List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
 
@@ -58,7 +64,9 @@
         for(PgPlanTask pgPlanTask:pgPlanTaskList){
             List<PgPlanResult> pgPlanResultList=getPgPlanResultByPlantask(pgPlanTask);
             PgPlanResultRe pgPlanResultRe=new PgPlanResultRe();
+
             pgPlanResultRe.setTaskKey(pgPlanTask.getTaskKey());
+            pgPlanResultRe.setPileAcuList(pgPlanTask.getPileAcuList());
             pgPlanResultRe.setPgPlanResultList(pgPlanResultList);
 
             pgPlanResultReList.add(pgPlanResultRe);
@@ -142,4 +150,57 @@
         return length;
     }
 
+    private PgPileAcu getPgPileAcuByAcuCode(String acuCode){
+        List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
+
+        if(pgPileAcuList==null||pgPileAcuList.size()==0)
+            return null;
+        else
+            return pgPileAcuList.get(0);
+    }
+
+    public List<PgAcuTask> getACUTask(String pileAcuList){
+        String[] acuArray=pileAcuList.split(",");
+        List<PgAcuTask> pgAcuTaskList=new ArrayList<>();
+
+        for(String acu:acuArray){
+            PgPileAcu pgPileAcu=this.getPgPileAcuByCode(acu);
+            String roadName=pgRoadManager.get(pgPileAcu.getRoadId()).getRoadName();
+
+            if(!containRoad(roadName,pgAcuTaskList))
+            {
+                PgAcuTask pgAcuTask=new PgAcuTask();
+                pgAcuTask.setRoadName(roadName);
+                pgAcuTask.setPileAcuList(acu);
+                pgAcuTaskList.add(pgAcuTask);
+            }
+            else{
+                PgAcuTask pgAcuTask=getIndexRoad(roadName,pgAcuTaskList);
+                if(pgAcuTask!=null)
+                    pgAcuTask.setPileAcuList(pgAcuTask.getPileAcuList()+","+acu);
+            }
+        }
+
+        return pgAcuTaskList;
+    }
+
+    private boolean containRoad(String roadName,List<PgAcuTask> pgAcuTaskList){
+        if(pgAcuTaskList==null||pgAcuTaskList.size()==0) return false;
+        for(PgAcuTask pgAcuTask:pgAcuTaskList){
+            if(pgAcuTask.getRoadName().equals(roadName))
+                return true;
+        }
+
+        return false;
+    }
+
+    private PgAcuTask getIndexRoad(String roadName, List<PgAcuTask> pgAcuTaskList){
+        for(PgAcuTask pgAcuTask:pgAcuTaskList){
+            if(pgAcuTask.getRoadName().equals(roadName))
+                return pgAcuTask;
+        }
+
+        return null;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java
new file mode 100644
index 0000000..323f7ef
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java
@@ -0,0 +1,25 @@
+package com.casic.PgInterface.reservePlan.dto;
+
+import java.util.List;
+
+public class PgAcuTask {
+
+    private String roadName;//道路
+    private String pileAcuList;//acu分区
+
+    public String getRoadName() {
+        return roadName;
+    }
+
+    public void setRoadName(String roadName) {
+        this.roadName = roadName;
+    }
+
+    public String getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(String pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
index c25e926..c7d7693 100644
--- a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
@@ -70,9 +70,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(Long.valueOf(inPgPersonId));
         PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("hostName",pgInPgPerson.getAssetCode());
-//        PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode());
-//        long maxId = pgTagPositionManager.getMaxId(pgTagMac.getTagMac());
-//        PGTagPosition pgTagPosition = pgTagPositionManager.get(maxId);
+
         PGTagPosition pgTagPosition = tagmacRun.GetTagStatus(pgTagMac);
         boolean bExist = false;
         bExist = pgTagPositionManager.findTagPosition(pgTagPosition.getPositionUpdatetime(),pgTagPosition.getHostId());
@@ -104,8 +102,7 @@
         PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(Long.valueOf(inPgPersonId));
         PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pgInPgPersonId",pgInPgPerson);
         System.out.println("time:"+pgInPgStatus.getInTime());
-//        PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pgInPgPersonId",inPgPersonId);
-//        PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode());
+
         PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("hostName",pgInPgPerson.getAssetCode());
 
         Map<Object,Object> mapPosition = new HashMap<>();
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
index 082ba5d..3eed00a 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
@@ -48,6 +48,7 @@
     public Map<String, Object> linkDevice(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         PgDeviceDto pgDeviceDto = null;
         try {
@@ -62,6 +63,7 @@
                     else {
                         pgDeviceDto = new PgDeviceDto(pgDevice);
                         msg = "报警关联设备获取成功";
+                        code="200";
                     }
                 }
             }
@@ -71,6 +73,7 @@
             e.printStackTrace();
             msg = "获取关联设备失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceDto);
 
@@ -86,6 +89,7 @@
     public Map<String, Object> linkPartitionCamera(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
         try {
@@ -106,6 +110,7 @@
 
                         pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(partition,position);
                         msg = "关联设备获取成功";
+                        code="200";
                     }
                 }
             }
@@ -115,6 +120,7 @@
             e.printStackTrace();
             msg = "分区设备关联失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceDtoList);
         return resultMap;
@@ -129,6 +135,7 @@
     public Map<String, Object> linkReservePlan(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgReservePlanDto> pgReservePlanDtoList=new ArrayList<>();
         try{
@@ -139,10 +146,12 @@
                 else {
                     pgReservePlanDtoList = pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
 
-                    if(pgReservePlanDtoList==null||pgReservePlanDtoList.size()==0)
-                        msg="不存在关联的报警预案";
-                    else
+                    if (pgReservePlanDtoList == null || pgReservePlanDtoList.size() == 0)
+                        msg = "不存在关联的报警预案";
+                    else {
                         msg = "关联预案获取成功";
+                        code="200";
+                    }
                 }
             }
             else
@@ -153,6 +162,7 @@
             e.printStackTrace();
             msg="预案关联失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgReservePlanDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
index 0ddbc4d..0ce886b 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
@@ -41,25 +41,19 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getAlarmList(@FormParam("alarmType") String alarmType,
                                             @FormParam("startDay") String startDay,
+                                            @FormParam("partition") String partition,
                                             @FormParam("endDay") String endDay,
                                             @FormParam("isNew") String isNew,
                                             @FormParam("page") int page,
                                             @FormParam("rows") int rows) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
         try {
-            pgAlarmDtoList = pgAlarmManager.getAllAlarm(alarmType,startDay,endDay,isNew,page,rows);
-            if (pgAlarmDtoList==null||pgAlarmDtoList.size() == 0)
-                msg = "没有报警信息";
-            else
-                msg = "报警信息获取成功";
+            resultMap = pgAlarmManager.getAllAlarm(alarmType,partition,startDay,endDay,isNew,page,rows);
+
         } catch (Exception e) {
             e.printStackTrace();
-            msg = "报警信息获取失败";
         }
-        resultMap.put("msg", msg);
-        resultMap.put("result", pgAlarmDtoList);
         return resultMap;
     }
 
@@ -71,9 +65,10 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> clearAlarmList(@FormParam("id") String id) throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        String result = "false";
+        String result = "";
+        String code="0";
 
         try {
             PgAlarm pgAlarm = new PgAlarm();
@@ -86,12 +81,14 @@
                 pgAlarmManager.save(pgAlarm);
                 msg = "报警信息清除成功";
                 result = "true";
+                code = "200";
             }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警信息清除失败";
             result = "false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
@@ -106,21 +103,26 @@
     public Map<String, Object> getAlarmByTypeOrTime(@FormParam("alarmType") String alarmType,
                                                     @FormParam("startTime") String startTime,
                                                     @FormParam("endTime") String endTime) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
-        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<PgAlarmDto>();
+        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
         try {
             pgAlarmDtoList = pgAlarmManager.getAlarmByTypeAndTime(alarmType, startTime, endTime);
             if (pgAlarmDtoList == null || pgAlarmDtoList.size() == 0)
                 msg = "报警信息不存在";
             else
+            {
                 msg = "报警信息获取成功";
+                code="200";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警信息获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
index 29ce8a4..ed0bf34 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
@@ -39,8 +39,8 @@
     public Map<String, Object> getAlarmRule(@FormParam("devType") String devType) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
-        System.out.println("devType:"+devType);
         List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<>();
         try {
             pgAlarmRuleDtoList = pgAlarmRuleManager.getAlarmRuleDto(devType);
@@ -52,6 +52,7 @@
             e.printStackTrace();
             msg = "报警阈值信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmRuleDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
index 24ab894..abef1b1 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
@@ -39,16 +39,21 @@
                                                      @FormParam("endDate") String endDate)throws Exception{
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
+
         List<PgAlarmTjDto> pgAlarmTjDtoList=null;
         try{
             pgAlarmTjDtoList=pgAlarmTjManager.getAlarmTjResultByType(startDate,endDate);
             msg="获取成功";
+            code="200";
         }
         catch(Exception ex) {
             msg = "统计失败";
         }
-        resultMap.put("result",pgAlarmTjDtoList);
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
+        resultMap.put("result",pgAlarmTjDtoList);
+
         return resultMap;
     }
 
@@ -61,23 +66,27 @@
     public Map<String, Object> getAlarmByTime(@FormParam("startTime") String startTime,
                                               @FormParam("endTime") String endTime,
                                               @FormParam("statisticType") String statisticType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code = "0";
 
-        List<PgAlarmTjDto> pgAlarmTjDtoList = new ArrayList<PgAlarmTjDto>();
+        List<PgAlarmTjDto> pgAlarmTjDtoList = new ArrayList<>();
         try {
             pgAlarmTjDtoList = pgAlarmTjManager.getAlarmByTime(startTime, endTime, statisticType);
             if(pgAlarmTjDtoList==null)
                 msg="报警统计信息获取失败";
-            else
-                msg="报警统计信息获取成功";
+            else {
+                msg = "报警统计信息获取成功";
+                code="200";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警统计信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmTjDtoList);
         return resultMap;
     }
 
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
index 28bc811..b6278a9 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
@@ -30,7 +30,6 @@
     @Resource
     private PgAlarmTypeManager pgAlarmTypeManager;
 
-
     /**
      * 获取报警类型
      */
@@ -38,19 +37,24 @@
     @Path("getAlarmType")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getAlarmTypeList()throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
-        List<PgAlarmTypeDto> pgAlarmTypeDtoList=new ArrayList<PgAlarmTypeDto>();
+        String code="";
+
+        List<PgAlarmTypeDto> pgAlarmTypeDtoList=new ArrayList<>();
         try {
             pgAlarmTypeDtoList = pgAlarmTypeManager.getAllAlarmTypeDto();
             if(pgAlarmTypeDtoList.size()==0)
                 msg="没有报警类型信息";
-            else
-                msg="报警类型信息获取成功";
+            else {
+                code="200";
+                msg = "报警类型信息获取成功";
+            }
         }catch(Exception e){
             e.printStackTrace();
             msg="报警类型信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAlarmTypeDtoList);
         return resultMap;
@@ -66,6 +70,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
@@ -83,6 +88,7 @@
                 logger.info("成功保存");
                 result = "true";
                 msg = "保存成功";
+                code="200";
             }
         } catch (Exception e) {
             result = "false";
@@ -90,6 +96,7 @@
             e.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -106,6 +113,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try{
             if(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
@@ -119,6 +127,7 @@
                 pgAlarmTypeManager.save(pgAlarmType);
                 result = "true";
                 msg = "编辑成功";
+                code="200";
             }
         }
         catch(Exception e)
@@ -128,6 +137,7 @@
             e.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("result",result);
         resultMap.put("msg",msg);
 
@@ -146,6 +156,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
         String result="false";
+        String code="0";
 
         try {
             PgAlarmType pgAlarmType=pgAlarmTypeManager.get(Long.valueOf(id));
@@ -157,6 +168,7 @@
             {
                 pgAlarmType.setActive(0);
                 pgAlarmTypeManager.save(pgAlarmType);
+                code="200";
                 msg="报警类型删除成功";
                 result="true";
             }
@@ -165,6 +177,7 @@
             msg="报警类型删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
index 4533e1a..85940bb 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
@@ -33,12 +33,15 @@
                                                  @FormParam("inSpectionPlace") String inSpectionPlace){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
         List<PgAssetPlanDto> pgAssetPlanDtoList=new ArrayList<>();
         try{
             pgAssetPlanDtoList=pgAssetPlanManager.getPgAssetPlanDtoList(startDay,endDay,inSpectionPlace);
-            if(pgAssetPlanDtoList!=null&&pgAssetPlanDtoList.size()!=0)
-                msg="巡检信息获取成功";
+            if(pgAssetPlanDtoList!=null&&pgAssetPlanDtoList.size()!=0) {
+                code="200";
+                msg = "巡检信息获取成功";
+            }
             else
                 msg="不存在巡检信息";
         }
@@ -47,6 +50,7 @@
             msg="巡检信息获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAssetPlanDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
index 47ef9d1..5cbdfcb 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
@@ -30,12 +30,15 @@
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
         String result="";
+        String code="0";
 
         List<PgAssetPlanStatic> pgAssetPlanStaticList = null;
         try{
             pgAssetPlanStaticList=pgAssetPlanManager.getPgAssetPlanStaticLisByTime(startTime,endTime,staticType);
-            if(pgAssetPlanStaticList!=null&&pgAssetPlanStaticList.size()!=0)
-                msg="巡检统计信息获取成功";
+            if(pgAssetPlanStaticList!=null&&pgAssetPlanStaticList.size()!=0) {
+                code = "200";
+                msg = "巡检统计信息获取成功";
+            }
             else
                 msg="统计信息获取失败";
         }
@@ -44,6 +47,7 @@
             msg="统计失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAssetPlanStaticList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
index 26f5d6a..503bfe3 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
@@ -40,6 +40,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="";
 
         try{
             PgAuthority pgAuthority=new PgAuthority();
@@ -50,6 +51,7 @@
 
             pgAuthorityManager.save(pgAuthority);
             msg="用户权限保存成功";
+            code="200";
             result="true";
         }
         catch(Exception e) {
@@ -57,6 +59,7 @@
             msg = "新增权限失败";
             result = "false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -65,22 +68,25 @@
 
     /*
        *编辑角权限信息
-        */
+    */
     @POST
     @Path("editAuthority")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> editAuthority(@FormParam("id") String id,
                                        @FormParam("authority") String authority,
                                        @FormParam("concent") String concent) throws Exception{
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
+
         try {
             PgAuthority pgAuthority=pgAuthorityManager.get(Long.valueOf(id));
             pgAuthority.setAuthority(authority);
             pgAuthority.setConcent(concent);
 
             pgAuthorityManager.save(pgAuthority);
+            code="200";
             msg="权限保存成功";
             result="true";
         }
@@ -90,7 +96,7 @@
             msg="权限编辑失败";
             result="false";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -105,9 +111,10 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> deleteAuthority(@FormParam("id") String id)throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
-        String result="false";
+        String result="";
+        String code="0";
 
         try {
             PgAuthority pgAuthority= pgAuthorityManager.get(Long.valueOf(id));
@@ -119,6 +126,7 @@
             {
                 pgAuthority.setActive(0);
                 pgAuthorityManager.save(pgAuthority);
+                code="200";
                 msg="删除权限成功";
                 result="true";
             }
@@ -127,37 +135,40 @@
             msg="删除权限失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
     }
 
     /*
-* 获取权限信息
- */
+    * 获取权限信息
+    */
     @POST
     @Path("getAuthorityList")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> getAuthorityList() {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgAuthorityDto> pgAuthorityDtoList = new ArrayList<PgAuthorityDto>();
         try {
             pgAuthorityDtoList = pgAuthorityManager.getAuthorityList();
             if (pgAuthorityDtoList == null)
                 msg = "不存在权限信息";
-            else
+            else {
+                code = "200";
                 msg = "权限信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "权限信息获取是失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAuthorityDtoList);
         return resultMap;
     }
 
 
-
-
 }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
index a9ef521..a74ecc7 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
@@ -45,6 +45,7 @@
                                                @FormParam("endDate") String endDate)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgHistoryDataDto> pgHistoryDataDtoList=new ArrayList<>();
 
         try {
@@ -55,13 +56,16 @@
                 pgHistoryDataDtoList=pgCh4Manager.getAllCH4Data(pgDevice,startDate,endDate);
                 if(pgHistoryDataDtoList==null)
                     msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+                else {
+                    code = "200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgHistoryDataDtoList);
         return resultMap;
@@ -75,8 +79,9 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getNewestCh4InfoByDev(@FormParam("assetCode") String assetCode)throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
+        String code="0";
         PgCh4Dto pgCh4Dto=new PgCh4Dto(null);
 
         try {
@@ -87,13 +92,17 @@
                 pgCh4Dto=pgCh4Manager.getNewestCH4Data(pgDevice);
                 if(pgCh4Dto==null)
                     msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgCh4Dto);
         return resultMap;
@@ -111,6 +120,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
@@ -127,6 +137,7 @@
                 pgCh4.setPgDeviceId(pgDevice);
 
                 pgCh4Manager.save(pgCh4);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -135,7 +146,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
index a7eac39..dfc8ca5 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
@@ -43,23 +43,27 @@
                                                       @FormParam("endDate") String endDate)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgHistoryDataDto> pgHistoryDataDtoList=new ArrayList<>();
 
         try {
             PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
                 msg="设备不存在";
-            else{
-                pgHistoryDataDtoList=pgCoManager.getAllCoData(pgDevice, startDate, endDate);
-                if(pgHistoryDataDtoList==null)
-                    msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+            else {
+                pgHistoryDataDtoList = pgCoManager.getAllCoData(pgDevice, startDate, endDate);
+                if (pgHistoryDataDtoList == null)
+                    msg = "没有满足要求的数据";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgHistoryDataDtoList);
         return resultMap;
@@ -75,6 +79,7 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         PgCoDto pgCoDto=new PgCoDto(null);
 
         try {
@@ -85,13 +90,16 @@
                 pgCoDto=pgCoManager.getNewestCoData(pgDevice);
                 if(pgCoDto==null)
                     msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgCoDto);
         return resultMap;
@@ -110,6 +118,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         try {
@@ -126,6 +135,7 @@
 
                 pgCoManager.save(pgCo);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
         } catch (Exception e) {
@@ -133,7 +143,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
index b4b826e..9af98a3 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
@@ -60,6 +60,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         try {
 
@@ -80,8 +81,8 @@
                 pgConstruction.setPgConstructionTypeId(pgConstructionType.getId());
                 pgConstruction.setActive(1);
                 pgConstruction.setParName(parName);
-                logger.info("保存成功");
                 pgConstructionManager.save(pgConstruction);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -90,6 +91,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("success", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -116,6 +118,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
@@ -140,6 +143,7 @@
                 pgConstruction.setParName(parName);
 
                 pgConstructionManager.save(pgConstruction);
+                code="200";
                 result = "true";
                 msg = "编辑成功";
             }
@@ -150,7 +154,7 @@
             e.printStackTrace();
 
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -167,6 +171,8 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
+
         try {
             PgConstruction pgConstruction = pgConstructionManager.get(Long.valueOf(id));
             if (pgConstruction == null)
@@ -177,6 +183,7 @@
             {
                 pgConstruction.setActive(0);
                 pgConstructionManager.save(pgConstruction);
+                code="200";
                 result = "true";
                 msg = "成功删除信息";
             }
@@ -185,6 +192,7 @@
             result = "false";
             msg = "删除失败";
         }
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -204,9 +212,11 @@
                                                   @FormParam("rows") int rows)throws Exception{
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
         List<PgConstructionDto> pgConstructionDtoList=new ArrayList<>();
         try{
             pgConstructionDtoList=pgConstructionManager.getPgContructionDto(cs_name,cs_type,startTime,endTime,page,rows);
+            code="200";
             msg="信息获取成功";
         }
         catch(Exception e)
@@ -214,6 +224,7 @@
             e.printStackTrace();
             msg="查询失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
 
@@ -231,18 +242,22 @@
                                                               @FormParam("statisticType") String statisticType) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgConstructionStiatistic> pgConstructionStiatisticList=new ArrayList<>();
         try {
             pgConstructionStiatisticList = pgConstructionManager.getConstructionByTimeAndStatus(startTime, endTime, statisticType);
             if(pgConstructionStiatisticList==null)
                 msg="施工统计信息获取失败";
-            else
-                msg="施工统计信息获取成功";
+            else {
+                code="200";
+                msg = "施工统计信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "施工统计信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgConstructionStiatisticList);
         return resultMap;
@@ -257,6 +272,7 @@
     public Map<String, Object> getConstructionByType(@FormParam("statisticType") String statisticType){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
         List<PgConstructionStiatistic> pgConstructionStiatisticList=new ArrayList<>();
 
         try{
@@ -268,6 +284,7 @@
                 resultMap.put("result",null);
             }
             else {
+                code="200";
                 msg = "统计信息获取成功";
                 resultMap.put("result", pgConstructionStiatisticList);
             }
@@ -278,6 +295,7 @@
             msg="统计失败";
             resultMap.put("result",null);
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         return resultMap;
     }
@@ -291,9 +309,11 @@
     public Map<String, Object> getConstructionToday() throws Exception{
         Map<String,Object> resultMap=new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgConstructionDto> pgConstructionDtoList=new ArrayList<PgConstructionDto>();
         try {
             pgConstructionDtoList = pgConstructionManager.getConstructionToday();
+            code="200";
             msg = "当天施工信息获取成功";
         }
         catch(Exception e)
@@ -301,7 +321,7 @@
             e.printStackTrace();
             msg="获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
         return resultMap;
@@ -316,6 +336,7 @@
     public Map<String, Object> getConstructionDev(@FormParam("id") String id) throws Exception{
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
         List<PgDeviceDto> pgDeviceDtoList =new ArrayList<>();
         try{
@@ -325,14 +346,17 @@
 
             if(pgDeviceDtoList==null)
                 msg="信息获取失败";
-            else
-                msg="信息获取成功";
+            else {
+                code="200";
+                msg = "信息获取成功";
+            }
         }
         catch(Exception e)
         {
             e.printStackTrace();
-            msg="设备信息获取成功";
+            msg="信息获取是被";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgDeviceDtoList);
 
@@ -346,17 +370,21 @@
     @Path("getConstruction")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getConstruction() throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
-        List<PgConstructionDto> pgConstructionDtoList=new ArrayList<PgConstructionDto>();
+        String code="0";
+
+        List<PgConstructionDto> pgConstructionDtoList=new ArrayList<>();
 
         try{
             pgConstructionDtoList=pgConstructionManager.getPgConstructionList();
             if(pgConstructionDtoList==null||pgConstructionDtoList.size()==0)
                 msg="不存在施工记录";
-            else
-                msg="施工信息获取成功";
+            else {
+                code = "200";
+                msg = "施工信息获取成功";
+            }
         }
         catch(Exception e)
         {
@@ -364,6 +392,7 @@
             msg="施工信息获取失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java
index fd3d53e..2019502 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java
@@ -39,12 +39,12 @@
         try {
             pgConstructionTypeDtoList = pgConstructionTypeManager.getAllConstructionTypeDto();
             if (pgConstructionTypeDtoList.size() == 0)
-                msg = "没有项目类型信息";
+                msg = "获取失败";
             else
-                msg = "项目类型获取成功";
+                msg = "获取成功";
         } catch (Exception e) {
             e.printStackTrace();
-            msg = "项目类型信息获取失败";
+            msg = "获取失败";
         }
         resultMap.put("msg", msg);
         resultMap.put("result", pgConstructionTypeDtoList);
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
index 90d001c..037a399 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
@@ -51,6 +51,7 @@
 
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if (StringUtils.isBlank(construct_doc)||StringUtils.isBlank(doc_name))
@@ -65,6 +66,7 @@
             pgCsDocument.setActive(1);
             pgCsDocumentManager.save(pgCsDocument);
 
+            code="200";
             result = "true";
             msg = "保存成功";
 
@@ -74,6 +76,7 @@
             ex.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("success", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -90,6 +93,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             PgCsDocument pgCsDocument = pgCsDocumentManager.get(Long.valueOf(id));
@@ -103,6 +107,7 @@
 
                 pgCsDocumentManager.save(pgCsDocument);
 
+                code="200";
                 result = "true";
                 msg = "编辑成功";
             }
@@ -112,6 +117,7 @@
             msg = "编辑失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -125,9 +131,9 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
         String result="";
+        String code="0";
 
         try{
-
             PgCsDocument pgCsDocument = pgCsDocumentManager.get(Long.valueOf(id));
             if(pgCsDocument==null)
             {
@@ -137,6 +143,7 @@
             else{
                 pgCsDocument.setActive(0);
                 pgCsDocumentManager.save(pgCsDocument);
+                code="200";
                 result="true";
                 msg="删除成功";
             }
@@ -147,7 +154,7 @@
             msg="预案删除失败";
             result="false";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -168,18 +175,21 @@
 
         String msg="";
         String result="";
+        String code="0";
 
         try {
             pgCsDocumentDtoList = pgCsDocumentManager.getAllDocData(cs_name);
-            if (pgCsDocumentDtoList != null)
+            if (pgCsDocumentDtoList != null) {
+                code="200";
                 msg = "获取数据成功";
+            }
             else
                 msg = "没有满足条件的数据";
         }catch (Exception e){
             e.printStackTrace();
             msg = "获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgCsDocumentDtoList);
         return resultMap;
@@ -192,20 +202,22 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
 
         String msg = "";
+        String code="0";
         ResponseEntity<byte[]> path = null;
         try {
             PgCsDocument pgCsDocument = pgCsDocumentManager.get(Long.valueOf(id));
             path = pgCsDocumentManager.downloadFile(pgCsDocument);
             if (path == null)
                 msg = "不存在该文档";
-            else
+            else {
+                code = "200";
                 msg = "下载成功";
-
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "下载失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", path.getBody());
         resultMap.put("msg", msg);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
index 94c5c84..ffc8b95 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
@@ -41,22 +41,24 @@
     public Map<String, Object> getPgDeviceByDevType(@FormParam("devType") String devType) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
         try {
-            pgDeviceDtoList = pgDeviceManager.getDeviceByDevTypee(devType);
+            pgDeviceDtoList = pgDeviceManager.getDeviceByDevType(devType);
             if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0){
                 msg="不存在满足要求的数据";
-                resultMap.put("result",null);
             }
             else{
-                resultMap.put("result", pgDeviceDtoList);
+                code="200";
                 msg = "获取成功";
             }
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", pgDeviceDtoList);
         return resultMap;
     }
 
@@ -69,25 +71,26 @@
     public Map<String, Object> getPgDeviceByAssetCode(@FormParam("assetCode") String assetCode) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         PgDeviceDto pgDeviceDto=null;
         try {
             PgDevice pgDevice = pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
             {
                 msg="不存在设备信息";
-                resultMap.put("result",null);
             }
             else {
                 pgDeviceDto = new PgDeviceDto(pgDevice);
                 msg = "获取成功";
-                resultMap.put("result", pgDeviceDto);
+                code="200";
             }
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", pgDeviceDto);
         return resultMap;
     }
 
@@ -102,27 +105,61 @@
                                              @FormParam("devType") String devType)throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
         try {
             pgDeviceDtoList = pgDeviceManager.getAllDevice(road,partition,devType);
             if(pgDeviceDtoList.size()==0) {
                 msg = "没有找到设备信息";
-                resultMap.put("result",null);
             }
             else {
                 msg = "设备信息获取成功";
-                resultMap.put("result", pgDeviceDtoList);
+                code="200";
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result", pgDeviceDtoList);
         return resultMap;
     }
 
     /**
+     * 显示设备列表
+     */
+    @POST
+    @Path("getPgDev")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String, Object> getPgDev(@FormParam("road") String road,
+                                             @FormParam("partition") String partition,
+                                             @FormParam("devType") String devType)throws Exception {
+        Map<String, Object> resultMap = new HashMap<>();
+        String msg="";
+        String code="0";
+        List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
+        try {
+            pgDeviceDtoList = pgDeviceManager.getAllDev(road,partition,devType);
+            if(pgDeviceDtoList.size()==0) {
+                msg = "没有找到设备信息";
+            }
+            else {
+                code="200";
+                msg = "设备信息获取成功";
+            }
+        }catch(Exception e){
+            e.printStackTrace();
+            msg="设备信息获取失败";
+        }
+        resultMap.put("code",code);
+        resultMap.put("msg",msg);
+        resultMap.put("result", pgDeviceDtoList);
+        return resultMap;
+    }
+
+
+    /**
      * 新增设备
      */
     @POST
@@ -145,6 +182,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if (pgDeviceManager.getDeviceByAssetCode(assetCode)!=null) {
@@ -169,6 +207,7 @@
 
                 pgDeviceManager.save(pgDevice);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
 
@@ -177,10 +216,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -208,14 +246,9 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
-            /*
-            if (pgDeviceManager.getDeviceByAssetCode(assetCode)!=null) {
-                result = "false";
-                msg = "已存在同名设备";
-            } else {
-            */
             PgDevice pgDevice = pgDeviceManager.get(Long.valueOf(id));
             pgDevice.setPipeGallery(pipeGallery);
             pgDevice.setPartition(partition);
@@ -233,14 +266,14 @@
 
             pgDeviceManager.save(pgDevice);
             result = "true";
+            code="200";
             msg = "编辑成功";
-            //}
         } catch (Exception e) {
             result = "false";
             msg = "编辑失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("result",result);
         resultMap.put("msg",msg);
         return resultMap;
@@ -256,7 +289,8 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
-        String result="false";
+        String result="";
+        String code="0";
 
         try {
             PgDevice pgDevice=pgDeviceManager.get(Long.valueOf(id));
@@ -268,6 +302,7 @@
             {
                 pgDevice.setActive(0);
                 pgDeviceManager.save(pgDevice);
+                code="200";
                 msg="设备删除成功";
                 result="true";
             }
@@ -276,6 +311,7 @@
             msg="设备删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -291,18 +327,18 @@
     {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         PgDeviceDto pgDeviceDto=null;
 
         try{
             PgDevice pgDevice=pgDeviceManager.getDeviceBydevCode(devCode);
             if(pgDevice==null) {
                 msg = "设备信息获取失败";
-                resultMap.put("result",null);
             }
             else{
                 pgDeviceDto = new PgDeviceDto(pgDevice);
                 msg = "设备信息获取成功";
-                resultMap.put("result",pgDeviceDto);
+                code="200";
             }
         }
         catch(Exception ex)
@@ -310,8 +346,9 @@
             ex.printStackTrace();
             msg="设备状态获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgDeviceDto);
         return resultMap;
     }
 
@@ -324,17 +361,17 @@
     public Map<String,Object> getDeviceByPartition(@FormParam("partition") String partition) throws Exception{
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<PgDeviceDto>();
 
         try{
             pgDeviceDtoList=pgDeviceManager.getPgDeviceDtoListByPartition(partition);
             if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0) {
                 msg = "设备信息获取失败";
-                resultMap.put("result",null);
             }
             else {
+                code="200";
                 msg = "设备信息获取成功";
-                resultMap.put("result",pgDeviceDtoList);
             }
         }
         catch(Exception e)
@@ -342,8 +379,9 @@
             e.printStackTrace();
             msg="设备信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgDeviceDtoList);
         return resultMap;
     }
 
@@ -353,17 +391,16 @@
     public Map<String,Object> getDeviceByOldDAssetCodeCode(@FormParam("assetCode") String assetCode) throws Exception{
         Map<String, Object> resultMap = new HashMap<>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
 
         try{
             pgDeviceDtoList=pgDeviceManager.getDeviceByOldDAssetCodeCode(assetCode);
-            if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0) {
-                msg = "设备信息获取失败";;
-                resultMap.put("result",null);
-            }
+            if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0)
+                msg = "设备信息获取失败";
             else {
                 msg = "设备信息获取成功";
-                resultMap.put("result",pgDeviceDtoList);
+                code="200";
             }
         }
         catch(Exception e)
@@ -372,8 +409,9 @@
             msg="设备信息获取失败";
             resultMap.put("result",null);
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgDeviceDtoList);
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java
index 421d249..f6f167d 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java
@@ -38,17 +38,21 @@
     public Map<String, Object> getDeviceTpeyList()throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgDeviceTypeDto> pgDeviceTypeDtoList=new ArrayList<PgDeviceTypeDto>();
         try {
             pgDeviceTypeDtoList = pgDeviceTypeManager.getAllDeviceType();
             if(pgDeviceTypeDtoList.size()==0)
                 msg="没有找到设备类型信息";
-            else
-                msg="设备类型信息获取成功";
+            else {
+                code="200";
+                msg = "设备类型信息获取成功";
+            }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备类型信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgDeviceTypeDtoList);
         return resultMap;
@@ -66,6 +70,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if (pgDeviceTypeManager.getDeviceTypeByDeType(devType)!=null) {
@@ -79,6 +84,7 @@
 
                 pgDeviceTypeManager.save(pgDeviceType);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
 
@@ -87,10 +93,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
index c276fb3..c789960 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
@@ -44,6 +44,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 
         try {
@@ -62,6 +63,7 @@
                 pgEquipment.setActive(1);
 
                 pgEquipmentManager.save(pgEquipment);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -70,9 +72,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -89,9 +91,10 @@
                                             @FormParam("ownerUnit") String ownerUnit,
                                             @FormParam("enterDate") String enterDate,
                                             @FormParam("curUser") String curUser) {
-        HashMap<String, Object> resultMap = new HashMap<String, Object>();
+        HashMap<String, Object> resultMap = new HashMap<>();
         String msg = "";
         String result = "";
+        String code="0";
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 
         try {
@@ -111,6 +114,7 @@
                 pgEquipment.setEnterDate(sdf.parse(enterDate));
 
                 pgEquipmentManager.save(pgEquipment);
+                code="200";
                 msg="编辑成功";
                 result="true";
             }
@@ -119,9 +123,9 @@
             result = "false";
             msg = "编辑失败";
         }
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -134,16 +138,19 @@
     public Map<String, Object> getEquipment(@FormParam("eqName") String eqName,
                                             @FormParam("eqCode") String eqCode,
                                             @FormParam("eqType") String eqType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        List<PgEquipmentDto> pgEquipmentDtoList=new ArrayList<PgEquipmentDto>();
+        String code="0";
+        List<PgEquipmentDto> pgEquipmentDtoList=new ArrayList<>();
 
         try{
             pgEquipmentDtoList=pgEquipmentManager.getEquipmentDtiList(eqName,eqCode,eqType);
             if(pgEquipmentDtoList==null||pgEquipmentDtoList.size()==0)
                 msg="不存在工器具记录";
-            else
-                msg="维获取成功";
+            else {
+                code = "200";
+                msg = "维获取成功";
+            }
         }
         catch(Exception e)
         {
@@ -166,6 +173,7 @@
         HashMap<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
         String result = "";
+        String code="";
 
         try {
             PgEquipment pgEquipment=pgEquipmentManager.get(Long.valueOf(id));
@@ -178,6 +186,7 @@
             {
                 pgEquipment.setActive(0);
                 pgEquipmentManager.save(pgEquipment);
+                code="200";
                 msg="删除成功";
                 result="true";
             }
@@ -186,6 +195,7 @@
             msg="设备信息获取失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -201,16 +211,19 @@
             throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=new ArrayList<PgDeviceTypeStatisticDto>();
 
         try {
             pgDeviceTypeStatisticDtoList=pgEquipmentManager.getDeviceStatisticByDevType(eqType);
 
+            code="200";
             msg = "获取成功";
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceTypeStatisticDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
index 05a9709..a90fd6c 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
@@ -4,9 +4,9 @@
 import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
 import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
 import com.casic.PgInterface.intelPlan.manager.PgPileAcuManager;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import com.casic.PgInterface.test.PlanData;
 import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.ModelAttribute;
 
 import javax.annotation.Resource;
 import javax.ws.rs.FormParam;
@@ -32,23 +32,25 @@
     public Map<String,Object> getPlanResult(@FormParam("planParamStr") String planParamStr){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
-        //List<PgPlanTask> pgPlanTaskList=pgPlanParams.getPgPlanTaskList();
         List<PgPlanTask> pgPlanTaskList=new PgPlanParams().getPgPlanParamsByString(planParamStr);
         List<PgPlanResultRe> pgPlanResultReList=new ArrayList<>();
 
-        try{
-                pgPlanResultReList=pgPileAcuManager.getPgPlanResultList(pgPlanTaskList);
-                if(pgPlanResultReList==null)
-                    msg="管线智能规划出错";
-                else
-                    msg="管线智能规划完成";
+        try {
+            pgPlanResultReList = pgPileAcuManager.getPgPlanResultList(pgPlanTaskList);
+            if (pgPlanResultReList == null)
+                msg = "管线智能规划出错";
+            else {
+                code="200";
+                msg = "管线智能规划完成";
+            }
         }
         catch(Exception ex){
             msg="智能规划出错";
             ex.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgPlanResultReList);
 
@@ -80,4 +82,30 @@
         return resultMap;
     }
 
+    @POST
+    @Path("getPlanTask")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getACUTask(@FormParam("pileAcuList") String pileAcuList){
+
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        String code="0";
+        List<PgAcuTask> pgAcuTaskList=new ArrayList<>();
+
+        try{
+            pgAcuTaskList=pgPileAcuManager.getACUTask(pileAcuList);
+            code="200";
+            msg="任务获取成功";
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            msg="任务获取失败";
+        }
+        resultMap.put("code",code);
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgAcuTaskList);
+
+        return resultMap;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
index ff85c61..66eec76 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
@@ -55,13 +55,13 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         try {
             PgInPgPerson pgInPgPerson = null;//pgInPgPersonManager.getPersonByUserName(userName);
             int iHostName = pgTagMacManager.getCount("select count(1) from PGTagMac where hostname = ?",assetCode);
-//            int iTagMac = pgTagMacManager.getCount("select count(1) from PGTagMac where tagmac = ?",assetCode.toUpperCase());
             if (0==iHostName)
             {
                 result = "false";
@@ -92,9 +92,8 @@
 
                 pgInPgStatusManager.save(pgInPgStatus);
 
-//                String syResult=pgInPgPersonManager.synchorizedInPgInfo(assetCode,userCode,userName,personType);
+                code="200";
                 result = "true";
-//                msg = "人员注册保存成功"+syResult;
                 msg = "人员注册保存成功";
             }
             else {
@@ -106,6 +105,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -120,6 +120,7 @@
     public Map<String, Object> getInPgPerson() throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<>();
         try {
@@ -127,11 +128,15 @@
             if (pgInPgInfoDtoList == null || pgInPgInfoDtoList.size() == 0)
                 msg = "没有找到入廊人员信息";
             else
+            {
+                code="200";
                 msg = "入廊人员信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "入廊人员信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
         return resultMap;
@@ -146,18 +151,22 @@
     public Map<String, Object> getInPgPersonInPg() throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
 
-        List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<PgInPgInfoDto>();
+        List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<>();
         try {
             pgInPgInfoDtoList = pgInPgPersonManager.getPgInPersonList(1);
             if (pgInPgInfoDtoList == null || pgInPgInfoDtoList.size() == 0)
                 msg = "没有找到入廊人员信息";
-            else
+            else {
+                code="200";
                 msg = "入廊人员信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "入廊人员信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
         return resultMap;
@@ -172,6 +181,7 @@
     public Map<String, Object> getInPgPersonByName(@FormParam("userName") String userName) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
 
         PgInPgPerson pgInPgPerson = null;
         PgInPgPersonDto pgInPgPersonDto=null;
@@ -184,12 +194,13 @@
                 pgInPgPersonDto=new PgInPgPersonDto(pgInPgPerson);
                 pgInPgPersonDtoList.add(pgInPgPersonDto);
                 msg = "人员信息获取成功";
+                code="200";
             }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "人员信息获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgPersonDtoList);
         return resultMap;
@@ -206,6 +217,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             PgInPgPerson pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName);
@@ -221,6 +233,7 @@
                     pgInPgPersonManager.save(pgInPgPerson);
                     result = "true";
                     msg = "编辑成功";
+                    code="200";
                 }
             }
         } catch (Exception e) {
@@ -228,9 +241,9 @@
             msg = "编辑失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -244,10 +257,12 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         int inPgNum=0;
         String msg = "";
+        String code="0";
 
         try{
             inPgNum=pgInPgStatusManager.getInPgNum();
 
+            code="200";
             msg="人员入廊次数获取成功";
         }
         catch(Exception e)
@@ -255,6 +270,7 @@
             e.printStackTrace();
             msg="人员入廊次数获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",inPgNum);
 
@@ -272,18 +288,22 @@
                                                    @FormParam("statisticType") String statisticType) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
 
         List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<PgInPgInfoDto>();
         try {
             pgInPgInfoDtoList = pgInPgPersonManager.getPgInPersonListByTime(startTime, endTime, statisticType);
             if(pgInPgInfoDtoList==null)
                 msg="入廊人员统计信息获取失败";
-            else
-                msg="入廊人员统计信息获取成功";
+            else {
+                code="200";
+                msg = "入廊人员统计信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "入廊人员统计信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
         return resultMap;
@@ -296,6 +316,7 @@
 
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
 
         try {
@@ -304,8 +325,10 @@
                 pgDeviceDtoList=pgDeviceManager.getPgCameraListByPosition("",apCodeStr);
                 if(pgDeviceDtoList==null)
                     msg="不存在关联摄像机";
-                else
-                    msg="关联摄像机获取成功";
+                else {
+                    code="200";
+                    msg = "关联摄像机获取成功";
+                }
             } else {
                 msg="请输入Ap编号";
             }
@@ -315,6 +338,7 @@
             msg="关联摄像机获取成功";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgDeviceDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java
index 507b3fe..b43f077 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java
@@ -34,6 +34,7 @@
 
         String result="";
         String msg="";
+        String code="";
         try{
             PgInPgStatus pgInPgStatus=new PgInPgStatus();
 
@@ -44,6 +45,7 @@
             pgInPgStatusManager.save(pgInPgStatus);
             msg="入廊时间提交成功";
             result="true";
+            code="200";
         }
         catch (Exception e){
             e.printStackTrace();
@@ -51,6 +53,7 @@
             result="false";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -66,6 +69,7 @@
 
         String result="";
         String msg="";
+        String code="0";
         try{
             PgInPgPerson pgInPgPerson=pgInPgPersonManager.getPgInPgPersonByAssetCode(assetCode);
 
@@ -79,6 +83,7 @@
             pgInPgStatusManager.save(pgInPgStatus);
 
             msg="出廊时间提交成功";
+            code="200";
             result="true";
         }
         catch (Exception e){
@@ -87,6 +92,7 @@
             result="false";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
index 9def330..9c0ba1f 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
@@ -33,17 +33,20 @@
                                             @FormParam("existNum") String existNum) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         String result="";
 
         try {
             pgIntelPlanManager.savePgIntelPlan(parName,lineName,maxNum,existNum);
             msg="规划数据保存成功";
+            code="200";
             result="true";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "规划数据保存失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
@@ -55,15 +58,18 @@
     public Map<String, Object> getIntelLineType() throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgIntelPlanTypeDto> pgIntelPlanTypeDtoList=new ArrayList<>();
         try {
             pgIntelPlanTypeDtoList=pgIntelPlanManager.getIntelPlanType();
+            code="200";
             msg="获取排线类型成功";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "获取排线类型失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgIntelPlanTypeDtoList);
         return resultMap;
@@ -76,6 +82,7 @@
                                             @FormParam("partitionStr") String partitionStr) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgIntelPlanDto> pgIntelPlanDtoList = new ArrayList<>();
 
@@ -83,8 +90,10 @@
             pgIntelPlanDtoList = pgIntelPlanManager.getPgIntelPlanListByPartion(lineName, partitionStr);
             if(pgIntelPlanDtoList==null||pgIntelPlanDtoList.size()==0)
                 msg="请输入正确的规划参数";
-            else
-                msg="规划数据获取成功";
+            else {
+                code="200";
+                msg = "规划数据获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "规划数据获取失败";
@@ -103,10 +112,12 @@
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
         String result="";
+        String code="0";
 
         try {
             boolean bl=pgIntelPlanManager.addLineUse(lineName,partitionStr,num);
             if(bl){
+                code="200";
                 msg="排线入廊成功";
                 result="true";
             }
@@ -119,6 +130,7 @@
             msg = "排线入廊失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
@@ -132,6 +144,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
         String result="";
+        String code="0";
 
         try {
             PgIntelPlan pgIntelPlan=pgIntelPlanManager.getPgIntelPlanByParNameAndLine(lineName,parName);
@@ -140,11 +153,13 @@
             pgIntelPlanManager.save(pgIntelPlan);
             msg="规划数据删除成功";
             result="true";
+            code="200";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "规划数据删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java b/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java
index 378af00..9c39523 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java
@@ -1,5 +1,6 @@
 package com.casic.PgInterface.rs;
 
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
 import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
 import com.casic.PgInterface.intelPlan.dto.PgLineHoleDTO;
 import com.casic.PgInterface.intelPlan.manager.PgLineHoleManager;
@@ -27,6 +28,9 @@
     @Resource
     private PgPileAcuManager pgPileAcuManager;
 
+    @Resource
+    private PgRoadManager pgRoadManager;
+
     @POST
     @Path("getPgLineAcuHole")
     @Produces(MediaType.APPLICATION_JSON)
@@ -34,23 +38,32 @@
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
         String result="";
+        String code="0";
         List<PgLineHoleDTO> pgLineHoleDTOList=new ArrayList<>();
 
         try {
             PgPileAcu pgPileAcu=pgPileAcuManager.getPgPileAcuByCode(acuCode);
             if(pgPileAcu==null){
                 msg="不存在分区";
-            }else{
-                pgLineHoleDTOList=pgLineHoleManager.getCurrentHoleByAcu(pgPileAcu.getId());
-                if(pgLineHoleDTOList!=null&&pgLineHoleDTOList.size()!=0)
-                    msg="获取成功";
-                else
-                    msg="未找到入廊数据";
+            }else {
+                pgLineHoleDTOList = pgLineHoleManager.getCurrentHoleByAcu(pgPileAcu.getId());
+                if (pgLineHoleDTOList != null && pgLineHoleDTOList.size() != 0)
+                {
+                    code="200";
+                    msg = "获取成功";
+                }
+                else {
+                    PgLineHoleDTO pgLineHoleDTO=new PgLineHoleDTO();
+                    pgLineHoleDTO.setRoad(pgRoadManager.get(pgPileAcu.getRoadId()).getRoadName());
+                    pgLineHoleDTOList.add(pgLineHoleDTO);
+                    msg = "未找到入廊数据";
+                }
             }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgLineHoleDTOList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgLogRs.java b/src/main/java/com/casic/PgInterface/rs/PgLogRs.java
index 39cff52..30db63b 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgLogRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgLogRs.java
@@ -45,6 +45,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         PgLog pgLog=new PgLog();
         try {
             PgUser pgUser = new PgUser();
@@ -60,14 +61,15 @@
             pgLogManager.save(pgLog);
             result = "true";
             msg = "保存成功";
-
+            code="200";
         } catch (Exception e) {
             result = "false";
             msg = "保存失败";
             e.printStackTrace();
         }
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -83,17 +85,21 @@
             throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgLogDto> pgLogDtoList = new ArrayList<PgLogDto>();
         try {
             pgLogDtoList = pgLogManager.getAllLogs(userName, startTime, endTime);
             if (pgLogDtoList == null || pgLogDtoList.size() == 0)
                 msg = "没有找到日志信息";
-            else
+            else {
+                code="200";
                 msg = "日志信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "日志信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgLogDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java
index 9fd0a5f..37b72f6 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java
@@ -36,19 +36,23 @@
         Map<String,Object> resultMap=new HashMap<>();
 
         String msg = "";
+        String code="0";
         List<PgMaintainType> pgMaintainTypeList=new ArrayList<>();
         try{
             pgMaintainTypeList=pgMaintainTypeManager.getMaintainType();
             if(pgMaintainTypeList!=null&&pgMaintainTypeList.size()!=0)
                 msg="不存在运维类别";
-            else
-                msg="运维类别获取成功";
+            else {
+                code="200";
+                msg = "运维类别获取成功";
+            }
         }
         catch(Exception ex)
         {
             ex.printStackTrace();
             msg="运维类别获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgMaintainTypeList);
 
@@ -65,10 +69,11 @@
         Map<String,Object> resultMap=new HashMap<>();
 
         String msg = "";
+        String code="0";
         List<PgMaintainTypeDto> pgMaintainTypeDtoList=new ArrayList<PgMaintainTypeDto>();
         try{
             pgMaintainTypeDtoList=pgMaintainTypeManager.getMaintainTypeModel(type);
-
+            code="200";
             msg="维护类型获取成功";
         }
         catch(Exception ex)
@@ -77,9 +82,9 @@
             msg="维护类型获取失败";
         }
 
-        resultMap.put("result",pgMaintainTypeDtoList);
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgMaintainTypeDtoList);
         return resultMap;
     }
 

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 25ded8a..283d7ab 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,20 +7,56 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" 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/construction/manager/PgCsDocumentManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/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/manager/PgAlarmManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/~$说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/~$说明20191207.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.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$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/接口说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明20191207.docx" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
@@ -51,7 +87,7 @@
         <counts>
           <entry key="class" value="4" />
           <entry key="iml" value="2" />
-          <entry key="java" value="707" />
+          <entry key="java" value="820" />
           <entry key="properties" value="14" />
           <entry key="xml" value="7" />
         </counts>
@@ -60,7 +96,7 @@
         <counts>
           <entry key="CLASS" value="4" />
           <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="707" />
+          <entry key="JAVA" value="820" />
           <entry key="Properties" value="14" />
           <entry key="XML" value="7" />
         </counts>
@@ -68,32 +104,32 @@
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
           <entry key="dummy" value="38" />
-          <entry key="java" value="30161" />
+          <entry key="java" value="40859" />
           <entry key="properties" value="100" />
-          <entry key="txt" value="176" />
+          <entry key="txt" value="186" />
           <entry key="xml" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="30161" />
-          <entry key="PLAIN_TEXT" value="214" />
+          <entry key="JAVA" value="40859" />
+          <entry key="PLAIN_TEXT" value="224" />
           <entry key="Properties" value="100" />
           <entry key="XML" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="48" />
+          <entry key="project.closed" value="51" />
           <entry key="project.open.time.1" value="5" />
           <entry key="project.open.time.12" value="2" />
           <entry key="project.open.time.13" value="1" />
           <entry key="project.open.time.15" value="1" />
           <entry key="project.open.time.16" value="1" />
           <entry key="project.open.time.17" value="1" />
-          <entry key="project.open.time.2" value="1" />
+          <entry key="project.open.time.2" value="2" />
           <entry key="project.open.time.20" value="1" />
-          <entry key="project.open.time.23" value="1" />
+          <entry key="project.open.time.23" value="2" />
           <entry key="project.open.time.24" value="2" />
           <entry key="project.open.time.251" value="1" />
           <entry key="project.open.time.27" value="2" />
@@ -106,8 +142,8 @@
           <entry key="project.open.time.36" value="1" />
           <entry key="project.open.time.37" value="1" />
           <entry key="project.open.time.39" value="2" />
-          <entry key="project.open.time.4" value="2" />
-          <entry key="project.open.time.40" value="1" />
+          <entry key="project.open.time.4" value="3" />
+          <entry key="project.open.time.40" value="2" />
           <entry key="project.open.time.41" value="2" />
           <entry key="project.open.time.42" value="2" />
           <entry key="project.open.time.43" value="2" />
@@ -122,23 +158,25 @@
           <entry key="project.open.time.6" value="3" />
           <entry key="project.open.time.63" value="2" />
           <entry key="project.open.time.64" value="1" />
+          <entry key="project.open.time.66" value="1" />
           <entry key="project.open.time.71" value="2" />
+          <entry key="project.open.time.74" value="1" />
           <entry key="project.open.time.76" value="1" />
           <entry key="project.open.time.8" value="2" />
           <entry key="project.open.time.9" value="1" />
           <entry key="project.open.time.97" value="1" />
-          <entry key="project.opened" value="78" />
+          <entry key="project.opened" value="84" />
         </counts>
       </usages-collector>
     </session>
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+            <state relative-caret-position="396">
+              <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
               <folding>
                 <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
                 <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -147,73 +185,6 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <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="99">
-              <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-              <folding>
-                <element signature="imports" expanded="true" />
-                <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-1170">
-              <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state>
-              <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
-              <folding>
-                <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-                <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="true">
-        <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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-              <folding>
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-                <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>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <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="352">
-              <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -225,18 +196,9 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>inCriteria</find>
-      <find>getPgPlanResulList</find>
-      <find>getPileAcuListByPileAcuStr</find>
-      <find>distinct</find>
-      <find>order</find>
-      <find>canPlanLine</find>
-      <find>isExistLine</find>
-      <find>getPlanResult</find>
       <find>pgPipeLine</find>
       <find>getPipeLineBylineName</find>
       <find>StringU</find>
-      <find>getAllAlarm</find>
       <find>getAlarmList</find>
       <find>getPgInPersonListByDay</find>
       <find>getDayInPgStatistic</find>
@@ -254,7 +216,16 @@
       <find>getPgContructionByNameOrType</find>
       <find>&quot;&quot;,&quot;&quot;,</find>
       <find>getPgContructionDtoByNameOrType</find>
+      <find>addConstruction</find>
+      <find>getPgLineAcuHole</find>
+      <find>getPlanResult</find>
       <find>getConstruction</find>
+      <find>addPipeLine</find>
+      <find>未找到入廊数据</find>
+      <find>getCurrentHoleByAcu</find>
+      <find>getAllAlarm</find>
+      <find>getPgDeviceDtoListByPartition</find>
+      <find>getPgDeviceByDevType</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -263,57 +234,57 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlan.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileHoleManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/planData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/PlanData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
       </list>
     </option>
   </component>
@@ -359,7 +330,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -421,53 +391,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="dto" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="manager" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -479,29 +402,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="rs" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -516,6 +416,7 @@
         </subPane>
       </pane>
       <pane id="Scope" />
+      <pane id="PackagesPane" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -710,7 +611,13 @@
       <workItem from="1574902733573" duration="1829000" />
       <workItem from="1574998240004" duration="7016000" />
       <workItem from="1575247959683" duration="6997000" />
-      <workItem from="1575704345590" duration="40473000" />
+      <workItem from="1575704345590" duration="69381000" />
+      <workItem from="1575869479666" duration="721000" />
+      <workItem from="1575947104878" duration="6101000" />
+      <workItem from="1576128264436" duration="3347000" />
+      <workItem from="1576208571543" duration="22000" />
+      <workItem from="1576227513917" duration="862000" />
+      <workItem from="1576293721220" duration="18246000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -817,11 +724,18 @@
       <option name="project" value="LOCAL" />
       <updated>1575775489149</updated>
     </task>
-    <option name="localTasksCounter" value="16" />
+    <task id="LOCAL-00016" summary="整改施工信息">
+      <created>1575791780774</created>
+      <option name="number" value="00016" />
+      <option name="presentableId" value="LOCAL-00016" />
+      <option name="project" value="LOCAL" />
+      <updated>1575791780774</updated>
+    </task>
+    <option name="localTasksCounter" value="17" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="452131000" />
+    <option name="totallyTimeSpent" value="510338000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -834,9 +748,8 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
-    <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.24205749" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2647504" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -847,7 +760,7 @@
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.3295082" />
       <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.4819672" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.65737706" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.3295082" />
@@ -939,7 +852,8 @@
     <MESSAGE value="重新设计智能规划部分" />
     <MESSAGE value="完成智能规划对接" />
     <MESSAGE value="修改报警统计" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改报警统计" />
+    <MESSAGE value="整改施工信息" />
+    <option name="LAST_COMMIT_MESSAGE" value="整改施工信息" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -951,16 +865,10 @@
           <option name="timeStamp" value="3" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java</url>
-          <line>69</line>
+          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java</url>
+          <line>40</line>
           <properties />
-          <option name="timeStamp" value="21" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java</url>
-          <line>96</line>
-          <properties />
-          <option name="timeStamp" value="38" />
+          <option name="timeStamp" value="122" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
@@ -970,394 +878,452 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <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="2068">
-          <caret line="154" column="35" selection-start-line="154" selection-start-column="35" selection-end-line="154" selection-end-column="35" />
-        </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="3300">
-          <caret line="297" column="22" selection-start-line="297" selection-start-column="22" selection-end-line="297" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/StringUtils.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
-          <caret line="13" column="48" lean-forward="true" selection-start-line="13" selection-start-column="48" selection-end-line="13" selection-end-column="48" />
+          <caret line="11" column="5" selection-start-line="11" selection-start-column="5" selection-end-line="11" selection-end-column="5" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="78" lean-forward="true" selection-start-line="78" selection-end-line="78" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="616">
-          <caret line="41" column="1" selection-start-line="41" selection-start-column="1" selection-end-line="41" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="110">
-          <caret line="12" column="23" selection-start-line="12" selection-start-column="23" selection-end-line="12" selection-end-column="23" />
+        <state relative-caret-position="516">
+          <caret line="114" column="12" selection-start-line="114" selection-start-column="12" selection-end-line="114" selection-end-column="12" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="164">
-          <caret line="56" lean-forward="true" selection-start-line="56" selection-end-line="56" />
+        <state relative-caret-position="418">
+          <caret line="33" column="44" selection-start-line="33" selection-start-column="44" selection-end-line="33" selection-end-column="44" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="258">
-          <caret line="27" column="12" lean-forward="true" selection-start-line="27" selection-start-column="12" selection-end-line="27" selection-end-column="12" />
+        <state relative-caret-position="132">
+          <caret line="11" column="20" lean-forward="true" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="20" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.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="-12">
-          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        <state relative-caret-position="516">
+          <caret line="142" column="54" selection-start-line="142" selection-start-column="54" selection-end-line="142" selection-end-column="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="858">
-          <caret line="55" column="27" lean-forward="true" selection-start-line="55" selection-start-column="27" selection-end-line="55" selection-end-column="27" />
+        <state relative-caret-position="66">
+          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="58">
+          <caret line="18" column="28" selection-start-line="18" selection-start-column="19" selection-end-line="18" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="305">
+          <caret line="24" column="31" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="714">
+          <caret line="58" column="5" lean-forward="true" selection-start-line="58" selection-start-column="5" selection-end-line="58" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="924">
+          <caret line="134" column="92" selection-start-line="134" selection-start-column="92" selection-end-line="134" selection-end-column="92" />
+          <folding>
+            <element signature="method#linkDevice#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkPartitionCamera#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkReservePlan#0;class#PgAlarmLinkRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1066">
+          <caret line="90" lean-forward="true" selection-start-line="90" selection-end-line="90" />
+          <folding>
+            <element signature="method#getTjResultByAlarmType#0;class#PgAlarmTjRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="946">
+          <caret line="148" column="11" lean-forward="true" selection-start-line="148" selection-start-column="11" selection-end-line="148" selection-end-column="11" />
+          <folding>
+            <element signature="method#getAlarmTypeList#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#addAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#editAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#deleteAlarmType#0;class#PgAlarmTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="208">
+          <caret line="46" column="23" lean-forward="true" selection-start-line="46" selection-start-column="23" selection-end-line="46" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="113" column="9" lean-forward="true" selection-start-line="113" selection-start-column="9" selection-end-line="113" selection-end-column="9" />
+          <folding>
+            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
+            <element signature="method#getNewestCh4InfoByDev#0;class#PgCh4Rs#0" />
+            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="145" column="6" lean-forward="true" selection-start-line="145" selection-start-column="6" selection-end-line="145" selection-end-column="6" />
+          <folding>
+            <element signature="method#addAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#editAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#deleteAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#getAuthorityList#0;class#PgAuthorityRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="58" column="1" lean-forward="true" selection-start-line="58" selection-start-column="1" selection-end-line="58" selection-end-column="1" />
+          <folding>
+            <element signature="method#getPgAssetPlanList#0;class#PgAssetPlanRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="370">
+          <caret line="371" column="66" selection-start-line="371" selection-start-column="66" selection-end-line="371" selection-end-column="66" />
+          <folding>
+            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#searchConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionDev#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="139" column="13" lean-forward="true" selection-start-line="139" selection-start-column="13" selection-end-line="139" selection-end-column="13" />
+          <folding>
+            <element signature="method#getCoInfoByDevAndDate#0;class#PgCoRs#0" />
+            <element signature="method#getNewestCoInfoByDev#0;class#PgCoRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="540">
+          <caret line="223" column="5" lean-forward="true" selection-start-line="223" selection-start-column="5" selection-end-line="223" selection-end-column="5" />
+          <folding>
+            <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="682">
+          <caret line="100" lean-forward="true" selection-start-line="100" selection-end-line="100" />
+          <folding>
+            <element signature="method#getDeviceTpeyList#0;class#PgDeviceTypeRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="377">
+          <caret line="225" column="35" selection-start-line="225" selection-start-column="35" selection-end-line="225" selection-end-column="35" />
+          <folding>
+            <element signature="method#addEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#addEquipment#1;class#PgEquipmentRs#0" />
+            <element signature="method#getEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#deleteEquipment#0;class#PgEquipmentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="406">
+          <caret line="109" lean-forward="true" selection-start-line="109" selection-end-line="109" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="154">
+          <caret line="28" column="19" selection-start-line="28" selection-start-column="19" selection-end-line="28" selection-end-column="19" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="748">
-          <caret line="49" column="5" lean-forward="true" selection-start-line="49" selection-start-column="5" selection-end-line="49" selection-end-column="5" />
+        <state relative-caret-position="296">
+          <caret line="161" column="35" selection-start-line="161" selection-start-column="35" selection-end-line="161" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="384">
+          <caret line="99" column="5" lean-forward="true" selection-start-line="99" selection-start-column="5" selection-end-line="99" selection-end-column="5" />
+        </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="362">
+          <caret line="340" column="35" selection-start-line="340" selection-start-column="35" selection-end-line="340" selection-end-column="35" />
+          <folding>
+            <element signature="method#addInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPersonInPg#0;class#PgInPgPersonRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-606">
+          <caret line="76" column="20" lean-forward="true" selection-start-line="76" selection-start-column="20" selection-end-line="76" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="65" column="35" selection-start-line="65" selection-start-column="35" selection-end-line="65" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="101" column="35" selection-start-line="101" selection-start-column="35" selection-end-line="101" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="84" column="35" selection-start-line="84" selection-start-column="35" selection-end-line="84" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="59" lean-forward="true" selection-start-line="59" selection-end-line="59" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="60" column="1" lean-forward="true" selection-start-line="60" selection-start-column="1" selection-end-line="60" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="145" column="35" selection-start-line="145" selection-start-column="35" selection-end-line="145" selection-end-column="35" />
+        </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="274">
+          <caret line="350" column="35" selection-start-line="350" selection-start-column="35" selection-end-line="350" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="121" column="39" selection-start-line="121" selection-start-column="39" selection-end-line="121" selection-end-column="39" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="28" column="8" lean-forward="true" selection-start-line="28" selection-start-column="8" selection-end-line="28" selection-end-column="8" />
+        <state relative-caret-position="340">
+          <caret line="103" selection-start-line="103" selection-end-line="103" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="226" column="35" selection-start-line="226" selection-start-column="35" selection-end-line="226" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="203" column="35" selection-start-line="203" selection-start-column="35" selection-end-line="203" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="241" column="35" selection-start-line="241" selection-start-column="35" selection-end-line="241" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="225" column="1" lean-forward="true" selection-start-line="225" selection-start-column="1" selection-end-line="225" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="176" column="5" lean-forward="true" selection-start-line="176" selection-start-column="5" selection-end-line="176" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="178" column="35" lean-forward="true" selection-start-line="178" selection-start-column="35" selection-end-line="178" selection-end-column="35" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="516">
-          <caret line="94" column="53" selection-start-line="94" selection-start-column="53" selection-end-line="94" selection-end-column="53" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="814">
-          <caret line="52" column="9" lean-forward="true" selection-start-line="52" selection-start-column="9" selection-end-line="52" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="182">
-          <caret line="58" column="12" lean-forward="true" selection-start-line="58" selection-start-column="12" selection-end-line="58" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="34" lean-forward="true" selection-start-line="34" selection-end-line="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="32" lean-forward="true" selection-start-line="32" selection-end-line="32" />
-          <folding>
-            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
-            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="185">
-          <caret line="63" column="13" selection-start-line="63" selection-start-column="13" selection-end-line="63" selection-end-column="13" />
-          <folding>
-            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
-            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
-            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="e#6319#6324#0" />
-            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
-          </folding>
+          <caret line="240" lean-forward="true" selection-start-line="240" selection-end-line="240" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
-          <caret line="58" column="28" lean-forward="true" selection-start-line="58" selection-start-column="28" selection-end-line="58" selection-end-column="28" />
-          <folding>
-            <element signature="method#addTempHumData#0;class#PgTempHumRs#0" />
-          </folding>
+        <state relative-caret-position="340">
+          <caret line="148" column="34" selection-start-line="148" selection-start-column="34" selection-end-line="148" selection-end-column="34" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
+        <state relative-caret-position="458">
+          <caret line="99" column="35" selection-start-line="99" selection-start-column="35" selection-end-line="99" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+        <state relative-caret-position="384">
+          <caret line="145" column="32" lean-forward="true" selection-start-line="145" selection-start-column="32" selection-end-line="145" selection-end-column="32" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="414">
-          <caret line="22" column="46" lean-forward="true" selection-start-line="22" selection-start-column="46" selection-end-line="22" selection-end-column="46" />
-        </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="396">
-          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" column="83" selection-start-line="11" selection-start-column="83" selection-end-line="11" selection-end-column="83" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="26">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
-          <folding>
-            <element signature="method#getPgInPgStatusByPerson#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNumByName#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNum#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPersonListByDay#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPgStatusByPgInPgPerson#0;class#PgInPgStatusManager#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="44">
-          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-12">
-          <caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="87" lean-forward="true" selection-start-line="87" selection-end-line="87" />
-          <folding>
-            <element signature="method#getConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#addConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#deleteConstructionType#0;class#PgConstructionTypeRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
-          <folding>
-            <element signature="method#getConstructionTypeByType#0;class#PgConstructionTypeManager#0" />
-            <element signature="method#getAllConstructionTypeDto#0;class#PgConstructionTypeManager#0" />
-          </folding>
-        </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="145">
-          <caret line="258" column="9" lean-forward="true" selection-start-line="258" selection-start-column="9" selection-end-line="258" selection-end-column="9" />
-          <folding>
-            <element signature="method#getMonthInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayInPgStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgOverViewRs#0" />
-            <element signature="method#getAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getMonthAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayAlarmStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgOverViewRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="103">
-          <caret line="105" column="50" lean-forward="true" selection-start-line="105" selection-start-column="50" selection-end-line="105" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateBasicDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="99">
-          <caret line="125" selection-start-line="125" selection-end-line="125" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="190">
-          <caret line="24" column="35" lean-forward="true" selection-start-line="24" selection-start-column="35" selection-end-line="24" selection-end-column="35" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="436">
-          <caret line="24" lean-forward="true" selection-start-line="24" selection-end-line="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" lean-forward="true" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="300">
-          <caret line="34" column="31" lean-forward="true" selection-start-line="34" selection-start-column="31" selection-end-line="34" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="42" column="13" lean-forward="true" selection-start-line="42" selection-start-column="13" selection-end-line="42" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="120" column="72" lean-forward="true" selection-start-line="120" selection-start-column="72" selection-end-line="120" selection-end-column="72" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="293">
-          <caret line="58" column="73" lean-forward="true" selection-start-line="58" selection-start-column="73" selection-end-line="58" selection-end-column="73" />
-          <folding>
-            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
-            <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
-          </folding>
-        </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="307">
-          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
+        <state relative-caret-position="758">
+          <caret line="130" column="5" lean-forward="true" selection-start-line="130" selection-start-column="5" selection-end-line="130" selection-end-column="5" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1170">
-          <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
+        <state relative-caret-position="494">
+          <caret line="86" column="62" lean-forward="true" selection-start-line="86" selection-start-column="62" selection-end-line="86" selection-end-column="62" />
           <folding>
-            <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-            <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+            <element signature="method#getAllDevice#0;class#PgDeviceManager#0" />
+            <element signature="method#getAllDev#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="195" column="28" lean-forward="true" selection-start-line="195" selection-start-column="28" selection-end-line="195" selection-end-column="28" />
+        <state relative-caret-position="166">
+          <caret line="174" column="13" lean-forward="true" selection-start-line="174" selection-start-column="13" selection-end-line="174" selection-end-column="13" />
           <folding>
-            <element signature="method#getAlarmByTypeAndTime#0;class#PgAlarmManager#0" />
-            <element signature="method#getAlarmNum#0;class#PgAlarmManager#0" />
             <element signature="method#getDayAlarmStatistic#0;class#PgAlarmManager#0" />
+            <element signature="method#getAlarmList#0;class#PgAlarmManager#0" />
             <element signature="method#createDTO#0;class#PgAlarmManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="364">
+          <caret line="46" column="56" lean-forward="true" selection-start-line="46" selection-start-column="56" selection-end-line="46" selection-end-column="56" />
+          <folding>
+            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
+            <element signature="method#getPgDev#0;class#PgDeviceRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
+            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+        <state relative-caret-position="396">
+          <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
           <folding>
             <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
             <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -1365,52 +1331,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="239">
-          <caret line="21" column="33" lean-forward="true" selection-start-line="21" selection-start-column="33" selection-end-line="21" selection-end-column="33" />
-        </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="352">
-          <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-        </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="99">
-          <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-          </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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-          <folding>
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-            <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>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
index c436c93..e913155 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
@@ -132,7 +132,10 @@
             this.setAlarmType("");
         else
             this.setAlarmType(pgAlarm.getAlarmTypeId().getAlarmType());
-        this.setAlarmValue(pgAlarm.getAlarmValue());
+        if(pgAlarm.getAlarmValue()==null)
+            this.setAlarmValue("");
+        else
+            this.setAlarmValue(pgAlarm.getAlarmValue());
         if (pgAlarm.getAlarmDate() != null)
             this.setAlarmDate(sdf.format(pgAlarm.getAlarmDate()));
         else
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
index a43965c..565cb41 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -159,11 +159,21 @@
     }
 
     //获取历史报警消息列表
-    public List<PgAlarmDto> getAllAlarm(String alarmType,String startDay,String endDay,String isNew,int page,int rows) {
-        try {
+    public  Map<String, Object> getAllAlarm(String alarmType,String partition,String startDay,String endDay,String isNew,int page,int rows) {
 
+        Map<String, Object> resultMap = new HashMap<>();
+        String msg="";
+
+        try {
             Criteria criteria = createCriteria(PgAlarm.class);
 
+            if (StringUtils.isNotBlank(partition)) {
+                DetachedCriteria inCriteria = DetachedCriteria.forClass(PgDevice.class);
+                inCriteria.add(Restrictions.eq("partition", partition));
+                inCriteria.setProjection(Property.forName("id"));
+                criteria.add(Property.forName("alarmDevId").in(inCriteria));
+            }
+
             if (StringUtils.isNotBlank(alarmType)&&!alarmType.contains("全部")&&pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
                 criteria.add(Restrictions.eq("alarmTypeId", pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)));
 
@@ -190,8 +200,16 @@
             for (PgAlarm pgAlarm : pgAlarmList) {
                 pgAlarmDtoList.add(new PgAlarmDto(pgAlarm));
             }
-
-            return pgAlarmDtoList;
+            if(pgAlarmDtoList==null||pgAlarmDtoList.size()==0) {
+                resultMap.put("msg", "没有报警信息");
+                resultMap.put("code","0");
+            }else {
+                resultMap.put("code","200");
+                resultMap.put("msg", "报警信息获取成功");
+            }
+            resultMap.put("count",pg.getTotalCount());
+            resultMap.put("result",pgAlarmDtoList);
+            return resultMap;
         }
         catch(Exception ex){
             ex.printStackTrace();
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index 7547560..654f49e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -24,11 +24,11 @@
 
         Criteria criteria = createCriteria(PgDevice.class);
 
-        if(road!=null)
+        if(StringUtils.isNotBlank(road))
             criteria.add(Restrictions.eq("road",road));
-        if(partition!=null)
+        if(StringUtils.isNotBlank(partition))
             criteria.add(Restrictions.eq("partition",partition));
-        if(devType!=null)
+        if(StringUtils.isNotBlank(devType))
             criteria.add(Restrictions.eq("devType",devType));
 
         criteria.add(Restrictions.eq("active", 1));
@@ -43,6 +43,29 @@
         return pgDeviceDtoList;
     }
 
+    public List<PgDeviceDto> getAllDev(String road,String partition,String devType) {
+
+        Criteria criteria = createCriteria(PgDevice.class);
+
+        if(StringUtils.isNotBlank(road))
+            criteria.add(Restrictions.eq("road",road));
+        if(StringUtils.isNotBlank(partition))
+            criteria.add(Restrictions.eq("partition",partition));
+        if(StringUtils.isNotBlank(devType))
+            criteria.add(Restrictions.like("devType","%"+devType+"%"));
+
+        criteria.add(Restrictions.eq("active", 1));
+        criteria.addOrder(Order.desc("id"));
+        List<PgDevice> pgDeviceList = criteria.list();
+
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
+        for (PgDevice pgDevice : pgDeviceList) {
+            pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
+        }
+
+        return pgDeviceDtoList;
+    }
+
     //根据名字获取当前设备
     public PgDevice getDeviceByAssetCode(String assetCode) {
         Criteria criteria=createCriteria(PgDevice.class);
@@ -56,9 +79,9 @@
     }
 
     //根据类型获取设备列表
-    public List<PgDeviceDto> getDeviceByDevTypee(String devType) {
+    public List<PgDeviceDto> getDeviceByDevType(String devType) {
         Criteria criteria=createCriteria(PgDevice.class);
-        criteria.add(Restrictions.eq("devType",devType));
+        criteria.add(Restrictions.like("devType","%"+devType+"%"));
 
         List<PgDevice> pgDeviceList=criteria.list();
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
@@ -106,7 +129,7 @@
         criteria.add(Restrictions.eq("partition",partition));
 
         List<PgDevice> pgDeviceList=criteria.list();
-        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<PgDeviceDto>();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
 
         for (PgDevice pgDevice : pgDeviceList) {
             pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
index 3a3bccd..595730e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
@@ -1,10 +1,13 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.devTable.domain.PgAlarmType;
 import com.casic.PgInterface.devTable.domain.PgPartition;
 import com.casic.PgInterface.devTable.domain.PgRoad;
 import com.casic.PgInterface.devTable.domain.PipeGallery;
 import com.casic.PgInterface.devTable.dto.PgPartitionDto;
+import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
@@ -12,7 +15,9 @@
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Created by yxw on 2017/11/4.
@@ -21,7 +26,8 @@
 public class PgPartitionManager extends HibernateEntityDao<PgPartition> {
 
     @Resource
-    PgRoadManager pgRoadManager;
+    private PgRoadManager pgRoadManager;
+
 
     public PgPartition getPartitionByParName(String parName) {
         Criteria criteria = getSession().createCriteria(PgPartition.class);
@@ -99,4 +105,5 @@
         return pgPartitionDtoList;
     }
 
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
index f216360..a6928f1 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
@@ -5,6 +5,7 @@
 public class PgPlanResultRe {
 
     private String taskKey;
+    private List<String> pileAcuList;
     private List<PgPlanResult> pgPlanResultList;
 
     public String getTaskKey() {
@@ -15,6 +16,14 @@
         this.taskKey = taskKey;
     }
 
+    public List<String> getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(List<String> pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+
     public List<PgPlanResult> getPgPlanResultList() {
         return pgPlanResultList;
     }
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
index 71ea765..47eea07 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
@@ -54,9 +54,7 @@
 
         List<PgLineHole> pgLineHoleList=criteria.list();
         List<PgLineHoleDTO> pgLineHoleDTOList=new ArrayList<>();
-        if(pgLineHoleList==null||pgLineHoleList.size()==0)
-            return null;
-        else
+        if(pgLineHoleList!=null&&pgLineHoleList.size()!=0)
             pgLineHoleDTOList=PgLineHoleDTO.ConvertToDTOList(pgLineHoleList,pgPileAcuManager,pgRoadManager);
         return pgLineHoleDTOList;
     }
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
index 0fd9e1f..841a386 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
@@ -1,12 +1,15 @@
 package com.casic.PgInterface.intelPlan.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.devTable.domain.PgPartition;
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
 import com.casic.PgInterface.intelPlan.domain.PgLineHole;
 import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
 import com.casic.PgInterface.intelPlan.domain.PgSection;
 import com.casic.PgInterface.intelPlan.dto.PgPlanResult;
 import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
 import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -22,6 +25,9 @@
     @Resource
     private PgLineHoleManager pgLineHoleManager;
 
+    @Resource
+    private PgRoadManager pgRoadManager;
+
     public PgPileAcu getPgPileAcuByCode(String acuCode){
         List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
 
@@ -58,7 +64,9 @@
         for(PgPlanTask pgPlanTask:pgPlanTaskList){
             List<PgPlanResult> pgPlanResultList=getPgPlanResultByPlantask(pgPlanTask);
             PgPlanResultRe pgPlanResultRe=new PgPlanResultRe();
+
             pgPlanResultRe.setTaskKey(pgPlanTask.getTaskKey());
+            pgPlanResultRe.setPileAcuList(pgPlanTask.getPileAcuList());
             pgPlanResultRe.setPgPlanResultList(pgPlanResultList);
 
             pgPlanResultReList.add(pgPlanResultRe);
@@ -142,4 +150,57 @@
         return length;
     }
 
+    private PgPileAcu getPgPileAcuByAcuCode(String acuCode){
+        List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
+
+        if(pgPileAcuList==null||pgPileAcuList.size()==0)
+            return null;
+        else
+            return pgPileAcuList.get(0);
+    }
+
+    public List<PgAcuTask> getACUTask(String pileAcuList){
+        String[] acuArray=pileAcuList.split(",");
+        List<PgAcuTask> pgAcuTaskList=new ArrayList<>();
+
+        for(String acu:acuArray){
+            PgPileAcu pgPileAcu=this.getPgPileAcuByCode(acu);
+            String roadName=pgRoadManager.get(pgPileAcu.getRoadId()).getRoadName();
+
+            if(!containRoad(roadName,pgAcuTaskList))
+            {
+                PgAcuTask pgAcuTask=new PgAcuTask();
+                pgAcuTask.setRoadName(roadName);
+                pgAcuTask.setPileAcuList(acu);
+                pgAcuTaskList.add(pgAcuTask);
+            }
+            else{
+                PgAcuTask pgAcuTask=getIndexRoad(roadName,pgAcuTaskList);
+                if(pgAcuTask!=null)
+                    pgAcuTask.setPileAcuList(pgAcuTask.getPileAcuList()+","+acu);
+            }
+        }
+
+        return pgAcuTaskList;
+    }
+
+    private boolean containRoad(String roadName,List<PgAcuTask> pgAcuTaskList){
+        if(pgAcuTaskList==null||pgAcuTaskList.size()==0) return false;
+        for(PgAcuTask pgAcuTask:pgAcuTaskList){
+            if(pgAcuTask.getRoadName().equals(roadName))
+                return true;
+        }
+
+        return false;
+    }
+
+    private PgAcuTask getIndexRoad(String roadName, List<PgAcuTask> pgAcuTaskList){
+        for(PgAcuTask pgAcuTask:pgAcuTaskList){
+            if(pgAcuTask.getRoadName().equals(roadName))
+                return pgAcuTask;
+        }
+
+        return null;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java
new file mode 100644
index 0000000..323f7ef
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java
@@ -0,0 +1,25 @@
+package com.casic.PgInterface.reservePlan.dto;
+
+import java.util.List;
+
+public class PgAcuTask {
+
+    private String roadName;//道路
+    private String pileAcuList;//acu分区
+
+    public String getRoadName() {
+        return roadName;
+    }
+
+    public void setRoadName(String roadName) {
+        this.roadName = roadName;
+    }
+
+    public String getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(String pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
index c25e926..c7d7693 100644
--- a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
@@ -70,9 +70,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(Long.valueOf(inPgPersonId));
         PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("hostName",pgInPgPerson.getAssetCode());
-//        PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode());
-//        long maxId = pgTagPositionManager.getMaxId(pgTagMac.getTagMac());
-//        PGTagPosition pgTagPosition = pgTagPositionManager.get(maxId);
+
         PGTagPosition pgTagPosition = tagmacRun.GetTagStatus(pgTagMac);
         boolean bExist = false;
         bExist = pgTagPositionManager.findTagPosition(pgTagPosition.getPositionUpdatetime(),pgTagPosition.getHostId());
@@ -104,8 +102,7 @@
         PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(Long.valueOf(inPgPersonId));
         PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pgInPgPersonId",pgInPgPerson);
         System.out.println("time:"+pgInPgStatus.getInTime());
-//        PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pgInPgPersonId",inPgPersonId);
-//        PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode());
+
         PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("hostName",pgInPgPerson.getAssetCode());
 
         Map<Object,Object> mapPosition = new HashMap<>();
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
index 082ba5d..3eed00a 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
@@ -48,6 +48,7 @@
     public Map<String, Object> linkDevice(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         PgDeviceDto pgDeviceDto = null;
         try {
@@ -62,6 +63,7 @@
                     else {
                         pgDeviceDto = new PgDeviceDto(pgDevice);
                         msg = "报警关联设备获取成功";
+                        code="200";
                     }
                 }
             }
@@ -71,6 +73,7 @@
             e.printStackTrace();
             msg = "获取关联设备失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceDto);
 
@@ -86,6 +89,7 @@
     public Map<String, Object> linkPartitionCamera(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
         try {
@@ -106,6 +110,7 @@
 
                         pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(partition,position);
                         msg = "关联设备获取成功";
+                        code="200";
                     }
                 }
             }
@@ -115,6 +120,7 @@
             e.printStackTrace();
             msg = "分区设备关联失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceDtoList);
         return resultMap;
@@ -129,6 +135,7 @@
     public Map<String, Object> linkReservePlan(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgReservePlanDto> pgReservePlanDtoList=new ArrayList<>();
         try{
@@ -139,10 +146,12 @@
                 else {
                     pgReservePlanDtoList = pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
 
-                    if(pgReservePlanDtoList==null||pgReservePlanDtoList.size()==0)
-                        msg="不存在关联的报警预案";
-                    else
+                    if (pgReservePlanDtoList == null || pgReservePlanDtoList.size() == 0)
+                        msg = "不存在关联的报警预案";
+                    else {
                         msg = "关联预案获取成功";
+                        code="200";
+                    }
                 }
             }
             else
@@ -153,6 +162,7 @@
             e.printStackTrace();
             msg="预案关联失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgReservePlanDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
index 0ddbc4d..0ce886b 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
@@ -41,25 +41,19 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getAlarmList(@FormParam("alarmType") String alarmType,
                                             @FormParam("startDay") String startDay,
+                                            @FormParam("partition") String partition,
                                             @FormParam("endDay") String endDay,
                                             @FormParam("isNew") String isNew,
                                             @FormParam("page") int page,
                                             @FormParam("rows") int rows) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
         try {
-            pgAlarmDtoList = pgAlarmManager.getAllAlarm(alarmType,startDay,endDay,isNew,page,rows);
-            if (pgAlarmDtoList==null||pgAlarmDtoList.size() == 0)
-                msg = "没有报警信息";
-            else
-                msg = "报警信息获取成功";
+            resultMap = pgAlarmManager.getAllAlarm(alarmType,partition,startDay,endDay,isNew,page,rows);
+
         } catch (Exception e) {
             e.printStackTrace();
-            msg = "报警信息获取失败";
         }
-        resultMap.put("msg", msg);
-        resultMap.put("result", pgAlarmDtoList);
         return resultMap;
     }
 
@@ -71,9 +65,10 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> clearAlarmList(@FormParam("id") String id) throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        String result = "false";
+        String result = "";
+        String code="0";
 
         try {
             PgAlarm pgAlarm = new PgAlarm();
@@ -86,12 +81,14 @@
                 pgAlarmManager.save(pgAlarm);
                 msg = "报警信息清除成功";
                 result = "true";
+                code = "200";
             }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警信息清除失败";
             result = "false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
@@ -106,21 +103,26 @@
     public Map<String, Object> getAlarmByTypeOrTime(@FormParam("alarmType") String alarmType,
                                                     @FormParam("startTime") String startTime,
                                                     @FormParam("endTime") String endTime) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
-        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<PgAlarmDto>();
+        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
         try {
             pgAlarmDtoList = pgAlarmManager.getAlarmByTypeAndTime(alarmType, startTime, endTime);
             if (pgAlarmDtoList == null || pgAlarmDtoList.size() == 0)
                 msg = "报警信息不存在";
             else
+            {
                 msg = "报警信息获取成功";
+                code="200";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警信息获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
index 29ce8a4..ed0bf34 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
@@ -39,8 +39,8 @@
     public Map<String, Object> getAlarmRule(@FormParam("devType") String devType) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
-        System.out.println("devType:"+devType);
         List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<>();
         try {
             pgAlarmRuleDtoList = pgAlarmRuleManager.getAlarmRuleDto(devType);
@@ -52,6 +52,7 @@
             e.printStackTrace();
             msg = "报警阈值信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmRuleDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
index 24ab894..abef1b1 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
@@ -39,16 +39,21 @@
                                                      @FormParam("endDate") String endDate)throws Exception{
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
+
         List<PgAlarmTjDto> pgAlarmTjDtoList=null;
         try{
             pgAlarmTjDtoList=pgAlarmTjManager.getAlarmTjResultByType(startDate,endDate);
             msg="获取成功";
+            code="200";
         }
         catch(Exception ex) {
             msg = "统计失败";
         }
-        resultMap.put("result",pgAlarmTjDtoList);
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
+        resultMap.put("result",pgAlarmTjDtoList);
+
         return resultMap;
     }
 
@@ -61,23 +66,27 @@
     public Map<String, Object> getAlarmByTime(@FormParam("startTime") String startTime,
                                               @FormParam("endTime") String endTime,
                                               @FormParam("statisticType") String statisticType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code = "0";
 
-        List<PgAlarmTjDto> pgAlarmTjDtoList = new ArrayList<PgAlarmTjDto>();
+        List<PgAlarmTjDto> pgAlarmTjDtoList = new ArrayList<>();
         try {
             pgAlarmTjDtoList = pgAlarmTjManager.getAlarmByTime(startTime, endTime, statisticType);
             if(pgAlarmTjDtoList==null)
                 msg="报警统计信息获取失败";
-            else
-                msg="报警统计信息获取成功";
+            else {
+                msg = "报警统计信息获取成功";
+                code="200";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警统计信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmTjDtoList);
         return resultMap;
     }
 
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
index 28bc811..b6278a9 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
@@ -30,7 +30,6 @@
     @Resource
     private PgAlarmTypeManager pgAlarmTypeManager;
 
-
     /**
      * 获取报警类型
      */
@@ -38,19 +37,24 @@
     @Path("getAlarmType")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getAlarmTypeList()throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
-        List<PgAlarmTypeDto> pgAlarmTypeDtoList=new ArrayList<PgAlarmTypeDto>();
+        String code="";
+
+        List<PgAlarmTypeDto> pgAlarmTypeDtoList=new ArrayList<>();
         try {
             pgAlarmTypeDtoList = pgAlarmTypeManager.getAllAlarmTypeDto();
             if(pgAlarmTypeDtoList.size()==0)
                 msg="没有报警类型信息";
-            else
-                msg="报警类型信息获取成功";
+            else {
+                code="200";
+                msg = "报警类型信息获取成功";
+            }
         }catch(Exception e){
             e.printStackTrace();
             msg="报警类型信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAlarmTypeDtoList);
         return resultMap;
@@ -66,6 +70,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
@@ -83,6 +88,7 @@
                 logger.info("成功保存");
                 result = "true";
                 msg = "保存成功";
+                code="200";
             }
         } catch (Exception e) {
             result = "false";
@@ -90,6 +96,7 @@
             e.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -106,6 +113,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try{
             if(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
@@ -119,6 +127,7 @@
                 pgAlarmTypeManager.save(pgAlarmType);
                 result = "true";
                 msg = "编辑成功";
+                code="200";
             }
         }
         catch(Exception e)
@@ -128,6 +137,7 @@
             e.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("result",result);
         resultMap.put("msg",msg);
 
@@ -146,6 +156,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
         String result="false";
+        String code="0";
 
         try {
             PgAlarmType pgAlarmType=pgAlarmTypeManager.get(Long.valueOf(id));
@@ -157,6 +168,7 @@
             {
                 pgAlarmType.setActive(0);
                 pgAlarmTypeManager.save(pgAlarmType);
+                code="200";
                 msg="报警类型删除成功";
                 result="true";
             }
@@ -165,6 +177,7 @@
             msg="报警类型删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
index 4533e1a..85940bb 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
@@ -33,12 +33,15 @@
                                                  @FormParam("inSpectionPlace") String inSpectionPlace){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
         List<PgAssetPlanDto> pgAssetPlanDtoList=new ArrayList<>();
         try{
             pgAssetPlanDtoList=pgAssetPlanManager.getPgAssetPlanDtoList(startDay,endDay,inSpectionPlace);
-            if(pgAssetPlanDtoList!=null&&pgAssetPlanDtoList.size()!=0)
-                msg="巡检信息获取成功";
+            if(pgAssetPlanDtoList!=null&&pgAssetPlanDtoList.size()!=0) {
+                code="200";
+                msg = "巡检信息获取成功";
+            }
             else
                 msg="不存在巡检信息";
         }
@@ -47,6 +50,7 @@
             msg="巡检信息获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAssetPlanDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
index 47ef9d1..5cbdfcb 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
@@ -30,12 +30,15 @@
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
         String result="";
+        String code="0";
 
         List<PgAssetPlanStatic> pgAssetPlanStaticList = null;
         try{
             pgAssetPlanStaticList=pgAssetPlanManager.getPgAssetPlanStaticLisByTime(startTime,endTime,staticType);
-            if(pgAssetPlanStaticList!=null&&pgAssetPlanStaticList.size()!=0)
-                msg="巡检统计信息获取成功";
+            if(pgAssetPlanStaticList!=null&&pgAssetPlanStaticList.size()!=0) {
+                code = "200";
+                msg = "巡检统计信息获取成功";
+            }
             else
                 msg="统计信息获取失败";
         }
@@ -44,6 +47,7 @@
             msg="统计失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAssetPlanStaticList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
index 26f5d6a..503bfe3 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
@@ -40,6 +40,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="";
 
         try{
             PgAuthority pgAuthority=new PgAuthority();
@@ -50,6 +51,7 @@
 
             pgAuthorityManager.save(pgAuthority);
             msg="用户权限保存成功";
+            code="200";
             result="true";
         }
         catch(Exception e) {
@@ -57,6 +59,7 @@
             msg = "新增权限失败";
             result = "false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -65,22 +68,25 @@
 
     /*
        *编辑角权限信息
-        */
+    */
     @POST
     @Path("editAuthority")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> editAuthority(@FormParam("id") String id,
                                        @FormParam("authority") String authority,
                                        @FormParam("concent") String concent) throws Exception{
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
+
         try {
             PgAuthority pgAuthority=pgAuthorityManager.get(Long.valueOf(id));
             pgAuthority.setAuthority(authority);
             pgAuthority.setConcent(concent);
 
             pgAuthorityManager.save(pgAuthority);
+            code="200";
             msg="权限保存成功";
             result="true";
         }
@@ -90,7 +96,7 @@
             msg="权限编辑失败";
             result="false";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -105,9 +111,10 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> deleteAuthority(@FormParam("id") String id)throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
-        String result="false";
+        String result="";
+        String code="0";
 
         try {
             PgAuthority pgAuthority= pgAuthorityManager.get(Long.valueOf(id));
@@ -119,6 +126,7 @@
             {
                 pgAuthority.setActive(0);
                 pgAuthorityManager.save(pgAuthority);
+                code="200";
                 msg="删除权限成功";
                 result="true";
             }
@@ -127,37 +135,40 @@
             msg="删除权限失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
     }
 
     /*
-* 获取权限信息
- */
+    * 获取权限信息
+    */
     @POST
     @Path("getAuthorityList")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> getAuthorityList() {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgAuthorityDto> pgAuthorityDtoList = new ArrayList<PgAuthorityDto>();
         try {
             pgAuthorityDtoList = pgAuthorityManager.getAuthorityList();
             if (pgAuthorityDtoList == null)
                 msg = "不存在权限信息";
-            else
+            else {
+                code = "200";
                 msg = "权限信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "权限信息获取是失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAuthorityDtoList);
         return resultMap;
     }
 
 
-
-
 }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
index a9ef521..a74ecc7 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
@@ -45,6 +45,7 @@
                                                @FormParam("endDate") String endDate)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgHistoryDataDto> pgHistoryDataDtoList=new ArrayList<>();
 
         try {
@@ -55,13 +56,16 @@
                 pgHistoryDataDtoList=pgCh4Manager.getAllCH4Data(pgDevice,startDate,endDate);
                 if(pgHistoryDataDtoList==null)
                     msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+                else {
+                    code = "200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgHistoryDataDtoList);
         return resultMap;
@@ -75,8 +79,9 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getNewestCh4InfoByDev(@FormParam("assetCode") String assetCode)throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
+        String code="0";
         PgCh4Dto pgCh4Dto=new PgCh4Dto(null);
 
         try {
@@ -87,13 +92,17 @@
                 pgCh4Dto=pgCh4Manager.getNewestCH4Data(pgDevice);
                 if(pgCh4Dto==null)
                     msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgCh4Dto);
         return resultMap;
@@ -111,6 +120,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
@@ -127,6 +137,7 @@
                 pgCh4.setPgDeviceId(pgDevice);
 
                 pgCh4Manager.save(pgCh4);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -135,7 +146,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
index a7eac39..dfc8ca5 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
@@ -43,23 +43,27 @@
                                                       @FormParam("endDate") String endDate)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgHistoryDataDto> pgHistoryDataDtoList=new ArrayList<>();
 
         try {
             PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
                 msg="设备不存在";
-            else{
-                pgHistoryDataDtoList=pgCoManager.getAllCoData(pgDevice, startDate, endDate);
-                if(pgHistoryDataDtoList==null)
-                    msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+            else {
+                pgHistoryDataDtoList = pgCoManager.getAllCoData(pgDevice, startDate, endDate);
+                if (pgHistoryDataDtoList == null)
+                    msg = "没有满足要求的数据";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgHistoryDataDtoList);
         return resultMap;
@@ -75,6 +79,7 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         PgCoDto pgCoDto=new PgCoDto(null);
 
         try {
@@ -85,13 +90,16 @@
                 pgCoDto=pgCoManager.getNewestCoData(pgDevice);
                 if(pgCoDto==null)
                     msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgCoDto);
         return resultMap;
@@ -110,6 +118,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         try {
@@ -126,6 +135,7 @@
 
                 pgCoManager.save(pgCo);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
         } catch (Exception e) {
@@ -133,7 +143,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
index b4b826e..9af98a3 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
@@ -60,6 +60,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         try {
 
@@ -80,8 +81,8 @@
                 pgConstruction.setPgConstructionTypeId(pgConstructionType.getId());
                 pgConstruction.setActive(1);
                 pgConstruction.setParName(parName);
-                logger.info("保存成功");
                 pgConstructionManager.save(pgConstruction);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -90,6 +91,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("success", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -116,6 +118,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
@@ -140,6 +143,7 @@
                 pgConstruction.setParName(parName);
 
                 pgConstructionManager.save(pgConstruction);
+                code="200";
                 result = "true";
                 msg = "编辑成功";
             }
@@ -150,7 +154,7 @@
             e.printStackTrace();
 
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -167,6 +171,8 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
+
         try {
             PgConstruction pgConstruction = pgConstructionManager.get(Long.valueOf(id));
             if (pgConstruction == null)
@@ -177,6 +183,7 @@
             {
                 pgConstruction.setActive(0);
                 pgConstructionManager.save(pgConstruction);
+                code="200";
                 result = "true";
                 msg = "成功删除信息";
             }
@@ -185,6 +192,7 @@
             result = "false";
             msg = "删除失败";
         }
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -204,9 +212,11 @@
                                                   @FormParam("rows") int rows)throws Exception{
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
         List<PgConstructionDto> pgConstructionDtoList=new ArrayList<>();
         try{
             pgConstructionDtoList=pgConstructionManager.getPgContructionDto(cs_name,cs_type,startTime,endTime,page,rows);
+            code="200";
             msg="信息获取成功";
         }
         catch(Exception e)
@@ -214,6 +224,7 @@
             e.printStackTrace();
             msg="查询失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
 
@@ -231,18 +242,22 @@
                                                               @FormParam("statisticType") String statisticType) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgConstructionStiatistic> pgConstructionStiatisticList=new ArrayList<>();
         try {
             pgConstructionStiatisticList = pgConstructionManager.getConstructionByTimeAndStatus(startTime, endTime, statisticType);
             if(pgConstructionStiatisticList==null)
                 msg="施工统计信息获取失败";
-            else
-                msg="施工统计信息获取成功";
+            else {
+                code="200";
+                msg = "施工统计信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "施工统计信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgConstructionStiatisticList);
         return resultMap;
@@ -257,6 +272,7 @@
     public Map<String, Object> getConstructionByType(@FormParam("statisticType") String statisticType){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
         List<PgConstructionStiatistic> pgConstructionStiatisticList=new ArrayList<>();
 
         try{
@@ -268,6 +284,7 @@
                 resultMap.put("result",null);
             }
             else {
+                code="200";
                 msg = "统计信息获取成功";
                 resultMap.put("result", pgConstructionStiatisticList);
             }
@@ -278,6 +295,7 @@
             msg="统计失败";
             resultMap.put("result",null);
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         return resultMap;
     }
@@ -291,9 +309,11 @@
     public Map<String, Object> getConstructionToday() throws Exception{
         Map<String,Object> resultMap=new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgConstructionDto> pgConstructionDtoList=new ArrayList<PgConstructionDto>();
         try {
             pgConstructionDtoList = pgConstructionManager.getConstructionToday();
+            code="200";
             msg = "当天施工信息获取成功";
         }
         catch(Exception e)
@@ -301,7 +321,7 @@
             e.printStackTrace();
             msg="获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
         return resultMap;
@@ -316,6 +336,7 @@
     public Map<String, Object> getConstructionDev(@FormParam("id") String id) throws Exception{
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
         List<PgDeviceDto> pgDeviceDtoList =new ArrayList<>();
         try{
@@ -325,14 +346,17 @@
 
             if(pgDeviceDtoList==null)
                 msg="信息获取失败";
-            else
-                msg="信息获取成功";
+            else {
+                code="200";
+                msg = "信息获取成功";
+            }
         }
         catch(Exception e)
         {
             e.printStackTrace();
-            msg="设备信息获取成功";
+            msg="信息获取是被";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgDeviceDtoList);
 
@@ -346,17 +370,21 @@
     @Path("getConstruction")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getConstruction() throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
-        List<PgConstructionDto> pgConstructionDtoList=new ArrayList<PgConstructionDto>();
+        String code="0";
+
+        List<PgConstructionDto> pgConstructionDtoList=new ArrayList<>();
 
         try{
             pgConstructionDtoList=pgConstructionManager.getPgConstructionList();
             if(pgConstructionDtoList==null||pgConstructionDtoList.size()==0)
                 msg="不存在施工记录";
-            else
-                msg="施工信息获取成功";
+            else {
+                code = "200";
+                msg = "施工信息获取成功";
+            }
         }
         catch(Exception e)
         {
@@ -364,6 +392,7 @@
             msg="施工信息获取失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java
index fd3d53e..2019502 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java
@@ -39,12 +39,12 @@
         try {
             pgConstructionTypeDtoList = pgConstructionTypeManager.getAllConstructionTypeDto();
             if (pgConstructionTypeDtoList.size() == 0)
-                msg = "没有项目类型信息";
+                msg = "获取失败";
             else
-                msg = "项目类型获取成功";
+                msg = "获取成功";
         } catch (Exception e) {
             e.printStackTrace();
-            msg = "项目类型信息获取失败";
+            msg = "获取失败";
         }
         resultMap.put("msg", msg);
         resultMap.put("result", pgConstructionTypeDtoList);
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
index 90d001c..037a399 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
@@ -51,6 +51,7 @@
 
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if (StringUtils.isBlank(construct_doc)||StringUtils.isBlank(doc_name))
@@ -65,6 +66,7 @@
             pgCsDocument.setActive(1);
             pgCsDocumentManager.save(pgCsDocument);
 
+            code="200";
             result = "true";
             msg = "保存成功";
 
@@ -74,6 +76,7 @@
             ex.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("success", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -90,6 +93,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             PgCsDocument pgCsDocument = pgCsDocumentManager.get(Long.valueOf(id));
@@ -103,6 +107,7 @@
 
                 pgCsDocumentManager.save(pgCsDocument);
 
+                code="200";
                 result = "true";
                 msg = "编辑成功";
             }
@@ -112,6 +117,7 @@
             msg = "编辑失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -125,9 +131,9 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
         String result="";
+        String code="0";
 
         try{
-
             PgCsDocument pgCsDocument = pgCsDocumentManager.get(Long.valueOf(id));
             if(pgCsDocument==null)
             {
@@ -137,6 +143,7 @@
             else{
                 pgCsDocument.setActive(0);
                 pgCsDocumentManager.save(pgCsDocument);
+                code="200";
                 result="true";
                 msg="删除成功";
             }
@@ -147,7 +154,7 @@
             msg="预案删除失败";
             result="false";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -168,18 +175,21 @@
 
         String msg="";
         String result="";
+        String code="0";
 
         try {
             pgCsDocumentDtoList = pgCsDocumentManager.getAllDocData(cs_name);
-            if (pgCsDocumentDtoList != null)
+            if (pgCsDocumentDtoList != null) {
+                code="200";
                 msg = "获取数据成功";
+            }
             else
                 msg = "没有满足条件的数据";
         }catch (Exception e){
             e.printStackTrace();
             msg = "获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgCsDocumentDtoList);
         return resultMap;
@@ -192,20 +202,22 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
 
         String msg = "";
+        String code="0";
         ResponseEntity<byte[]> path = null;
         try {
             PgCsDocument pgCsDocument = pgCsDocumentManager.get(Long.valueOf(id));
             path = pgCsDocumentManager.downloadFile(pgCsDocument);
             if (path == null)
                 msg = "不存在该文档";
-            else
+            else {
+                code = "200";
                 msg = "下载成功";
-
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "下载失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", path.getBody());
         resultMap.put("msg", msg);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
index 94c5c84..ffc8b95 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
@@ -41,22 +41,24 @@
     public Map<String, Object> getPgDeviceByDevType(@FormParam("devType") String devType) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
         try {
-            pgDeviceDtoList = pgDeviceManager.getDeviceByDevTypee(devType);
+            pgDeviceDtoList = pgDeviceManager.getDeviceByDevType(devType);
             if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0){
                 msg="不存在满足要求的数据";
-                resultMap.put("result",null);
             }
             else{
-                resultMap.put("result", pgDeviceDtoList);
+                code="200";
                 msg = "获取成功";
             }
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", pgDeviceDtoList);
         return resultMap;
     }
 
@@ -69,25 +71,26 @@
     public Map<String, Object> getPgDeviceByAssetCode(@FormParam("assetCode") String assetCode) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         PgDeviceDto pgDeviceDto=null;
         try {
             PgDevice pgDevice = pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
             {
                 msg="不存在设备信息";
-                resultMap.put("result",null);
             }
             else {
                 pgDeviceDto = new PgDeviceDto(pgDevice);
                 msg = "获取成功";
-                resultMap.put("result", pgDeviceDto);
+                code="200";
             }
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", pgDeviceDto);
         return resultMap;
     }
 
@@ -102,27 +105,61 @@
                                              @FormParam("devType") String devType)throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
         try {
             pgDeviceDtoList = pgDeviceManager.getAllDevice(road,partition,devType);
             if(pgDeviceDtoList.size()==0) {
                 msg = "没有找到设备信息";
-                resultMap.put("result",null);
             }
             else {
                 msg = "设备信息获取成功";
-                resultMap.put("result", pgDeviceDtoList);
+                code="200";
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result", pgDeviceDtoList);
         return resultMap;
     }
 
     /**
+     * 显示设备列表
+     */
+    @POST
+    @Path("getPgDev")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String, Object> getPgDev(@FormParam("road") String road,
+                                             @FormParam("partition") String partition,
+                                             @FormParam("devType") String devType)throws Exception {
+        Map<String, Object> resultMap = new HashMap<>();
+        String msg="";
+        String code="0";
+        List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
+        try {
+            pgDeviceDtoList = pgDeviceManager.getAllDev(road,partition,devType);
+            if(pgDeviceDtoList.size()==0) {
+                msg = "没有找到设备信息";
+            }
+            else {
+                code="200";
+                msg = "设备信息获取成功";
+            }
+        }catch(Exception e){
+            e.printStackTrace();
+            msg="设备信息获取失败";
+        }
+        resultMap.put("code",code);
+        resultMap.put("msg",msg);
+        resultMap.put("result", pgDeviceDtoList);
+        return resultMap;
+    }
+
+
+    /**
      * 新增设备
      */
     @POST
@@ -145,6 +182,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if (pgDeviceManager.getDeviceByAssetCode(assetCode)!=null) {
@@ -169,6 +207,7 @@
 
                 pgDeviceManager.save(pgDevice);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
 
@@ -177,10 +216,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -208,14 +246,9 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
-            /*
-            if (pgDeviceManager.getDeviceByAssetCode(assetCode)!=null) {
-                result = "false";
-                msg = "已存在同名设备";
-            } else {
-            */
             PgDevice pgDevice = pgDeviceManager.get(Long.valueOf(id));
             pgDevice.setPipeGallery(pipeGallery);
             pgDevice.setPartition(partition);
@@ -233,14 +266,14 @@
 
             pgDeviceManager.save(pgDevice);
             result = "true";
+            code="200";
             msg = "编辑成功";
-            //}
         } catch (Exception e) {
             result = "false";
             msg = "编辑失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("result",result);
         resultMap.put("msg",msg);
         return resultMap;
@@ -256,7 +289,8 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
-        String result="false";
+        String result="";
+        String code="0";
 
         try {
             PgDevice pgDevice=pgDeviceManager.get(Long.valueOf(id));
@@ -268,6 +302,7 @@
             {
                 pgDevice.setActive(0);
                 pgDeviceManager.save(pgDevice);
+                code="200";
                 msg="设备删除成功";
                 result="true";
             }
@@ -276,6 +311,7 @@
             msg="设备删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -291,18 +327,18 @@
     {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         PgDeviceDto pgDeviceDto=null;
 
         try{
             PgDevice pgDevice=pgDeviceManager.getDeviceBydevCode(devCode);
             if(pgDevice==null) {
                 msg = "设备信息获取失败";
-                resultMap.put("result",null);
             }
             else{
                 pgDeviceDto = new PgDeviceDto(pgDevice);
                 msg = "设备信息获取成功";
-                resultMap.put("result",pgDeviceDto);
+                code="200";
             }
         }
         catch(Exception ex)
@@ -310,8 +346,9 @@
             ex.printStackTrace();
             msg="设备状态获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgDeviceDto);
         return resultMap;
     }
 
@@ -324,17 +361,17 @@
     public Map<String,Object> getDeviceByPartition(@FormParam("partition") String partition) throws Exception{
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<PgDeviceDto>();
 
         try{
             pgDeviceDtoList=pgDeviceManager.getPgDeviceDtoListByPartition(partition);
             if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0) {
                 msg = "设备信息获取失败";
-                resultMap.put("result",null);
             }
             else {
+                code="200";
                 msg = "设备信息获取成功";
-                resultMap.put("result",pgDeviceDtoList);
             }
         }
         catch(Exception e)
@@ -342,8 +379,9 @@
             e.printStackTrace();
             msg="设备信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgDeviceDtoList);
         return resultMap;
     }
 
@@ -353,17 +391,16 @@
     public Map<String,Object> getDeviceByOldDAssetCodeCode(@FormParam("assetCode") String assetCode) throws Exception{
         Map<String, Object> resultMap = new HashMap<>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
 
         try{
             pgDeviceDtoList=pgDeviceManager.getDeviceByOldDAssetCodeCode(assetCode);
-            if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0) {
-                msg = "设备信息获取失败";;
-                resultMap.put("result",null);
-            }
+            if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0)
+                msg = "设备信息获取失败";
             else {
                 msg = "设备信息获取成功";
-                resultMap.put("result",pgDeviceDtoList);
+                code="200";
             }
         }
         catch(Exception e)
@@ -372,8 +409,9 @@
             msg="设备信息获取失败";
             resultMap.put("result",null);
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgDeviceDtoList);
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java
index 421d249..f6f167d 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java
@@ -38,17 +38,21 @@
     public Map<String, Object> getDeviceTpeyList()throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgDeviceTypeDto> pgDeviceTypeDtoList=new ArrayList<PgDeviceTypeDto>();
         try {
             pgDeviceTypeDtoList = pgDeviceTypeManager.getAllDeviceType();
             if(pgDeviceTypeDtoList.size()==0)
                 msg="没有找到设备类型信息";
-            else
-                msg="设备类型信息获取成功";
+            else {
+                code="200";
+                msg = "设备类型信息获取成功";
+            }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备类型信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgDeviceTypeDtoList);
         return resultMap;
@@ -66,6 +70,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if (pgDeviceTypeManager.getDeviceTypeByDeType(devType)!=null) {
@@ -79,6 +84,7 @@
 
                 pgDeviceTypeManager.save(pgDeviceType);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
 
@@ -87,10 +93,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
index c276fb3..c789960 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
@@ -44,6 +44,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 
         try {
@@ -62,6 +63,7 @@
                 pgEquipment.setActive(1);
 
                 pgEquipmentManager.save(pgEquipment);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -70,9 +72,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -89,9 +91,10 @@
                                             @FormParam("ownerUnit") String ownerUnit,
                                             @FormParam("enterDate") String enterDate,
                                             @FormParam("curUser") String curUser) {
-        HashMap<String, Object> resultMap = new HashMap<String, Object>();
+        HashMap<String, Object> resultMap = new HashMap<>();
         String msg = "";
         String result = "";
+        String code="0";
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 
         try {
@@ -111,6 +114,7 @@
                 pgEquipment.setEnterDate(sdf.parse(enterDate));
 
                 pgEquipmentManager.save(pgEquipment);
+                code="200";
                 msg="编辑成功";
                 result="true";
             }
@@ -119,9 +123,9 @@
             result = "false";
             msg = "编辑失败";
         }
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -134,16 +138,19 @@
     public Map<String, Object> getEquipment(@FormParam("eqName") String eqName,
                                             @FormParam("eqCode") String eqCode,
                                             @FormParam("eqType") String eqType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        List<PgEquipmentDto> pgEquipmentDtoList=new ArrayList<PgEquipmentDto>();
+        String code="0";
+        List<PgEquipmentDto> pgEquipmentDtoList=new ArrayList<>();
 
         try{
             pgEquipmentDtoList=pgEquipmentManager.getEquipmentDtiList(eqName,eqCode,eqType);
             if(pgEquipmentDtoList==null||pgEquipmentDtoList.size()==0)
                 msg="不存在工器具记录";
-            else
-                msg="维获取成功";
+            else {
+                code = "200";
+                msg = "维获取成功";
+            }
         }
         catch(Exception e)
         {
@@ -166,6 +173,7 @@
         HashMap<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
         String result = "";
+        String code="";
 
         try {
             PgEquipment pgEquipment=pgEquipmentManager.get(Long.valueOf(id));
@@ -178,6 +186,7 @@
             {
                 pgEquipment.setActive(0);
                 pgEquipmentManager.save(pgEquipment);
+                code="200";
                 msg="删除成功";
                 result="true";
             }
@@ -186,6 +195,7 @@
             msg="设备信息获取失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -201,16 +211,19 @@
             throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=new ArrayList<PgDeviceTypeStatisticDto>();
 
         try {
             pgDeviceTypeStatisticDtoList=pgEquipmentManager.getDeviceStatisticByDevType(eqType);
 
+            code="200";
             msg = "获取成功";
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceTypeStatisticDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
index 05a9709..a90fd6c 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
@@ -4,9 +4,9 @@
 import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
 import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
 import com.casic.PgInterface.intelPlan.manager.PgPileAcuManager;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import com.casic.PgInterface.test.PlanData;
 import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.ModelAttribute;
 
 import javax.annotation.Resource;
 import javax.ws.rs.FormParam;
@@ -32,23 +32,25 @@
     public Map<String,Object> getPlanResult(@FormParam("planParamStr") String planParamStr){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
-        //List<PgPlanTask> pgPlanTaskList=pgPlanParams.getPgPlanTaskList();
         List<PgPlanTask> pgPlanTaskList=new PgPlanParams().getPgPlanParamsByString(planParamStr);
         List<PgPlanResultRe> pgPlanResultReList=new ArrayList<>();
 
-        try{
-                pgPlanResultReList=pgPileAcuManager.getPgPlanResultList(pgPlanTaskList);
-                if(pgPlanResultReList==null)
-                    msg="管线智能规划出错";
-                else
-                    msg="管线智能规划完成";
+        try {
+            pgPlanResultReList = pgPileAcuManager.getPgPlanResultList(pgPlanTaskList);
+            if (pgPlanResultReList == null)
+                msg = "管线智能规划出错";
+            else {
+                code="200";
+                msg = "管线智能规划完成";
+            }
         }
         catch(Exception ex){
             msg="智能规划出错";
             ex.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgPlanResultReList);
 
@@ -80,4 +82,30 @@
         return resultMap;
     }
 
+    @POST
+    @Path("getPlanTask")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getACUTask(@FormParam("pileAcuList") String pileAcuList){
+
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        String code="0";
+        List<PgAcuTask> pgAcuTaskList=new ArrayList<>();
+
+        try{
+            pgAcuTaskList=pgPileAcuManager.getACUTask(pileAcuList);
+            code="200";
+            msg="任务获取成功";
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            msg="任务获取失败";
+        }
+        resultMap.put("code",code);
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgAcuTaskList);
+
+        return resultMap;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
index ff85c61..66eec76 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
@@ -55,13 +55,13 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         try {
             PgInPgPerson pgInPgPerson = null;//pgInPgPersonManager.getPersonByUserName(userName);
             int iHostName = pgTagMacManager.getCount("select count(1) from PGTagMac where hostname = ?",assetCode);
-//            int iTagMac = pgTagMacManager.getCount("select count(1) from PGTagMac where tagmac = ?",assetCode.toUpperCase());
             if (0==iHostName)
             {
                 result = "false";
@@ -92,9 +92,8 @@
 
                 pgInPgStatusManager.save(pgInPgStatus);
 
-//                String syResult=pgInPgPersonManager.synchorizedInPgInfo(assetCode,userCode,userName,personType);
+                code="200";
                 result = "true";
-//                msg = "人员注册保存成功"+syResult;
                 msg = "人员注册保存成功";
             }
             else {
@@ -106,6 +105,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -120,6 +120,7 @@
     public Map<String, Object> getInPgPerson() throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<>();
         try {
@@ -127,11 +128,15 @@
             if (pgInPgInfoDtoList == null || pgInPgInfoDtoList.size() == 0)
                 msg = "没有找到入廊人员信息";
             else
+            {
+                code="200";
                 msg = "入廊人员信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "入廊人员信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
         return resultMap;
@@ -146,18 +151,22 @@
     public Map<String, Object> getInPgPersonInPg() throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
 
-        List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<PgInPgInfoDto>();
+        List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<>();
         try {
             pgInPgInfoDtoList = pgInPgPersonManager.getPgInPersonList(1);
             if (pgInPgInfoDtoList == null || pgInPgInfoDtoList.size() == 0)
                 msg = "没有找到入廊人员信息";
-            else
+            else {
+                code="200";
                 msg = "入廊人员信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "入廊人员信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
         return resultMap;
@@ -172,6 +181,7 @@
     public Map<String, Object> getInPgPersonByName(@FormParam("userName") String userName) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
 
         PgInPgPerson pgInPgPerson = null;
         PgInPgPersonDto pgInPgPersonDto=null;
@@ -184,12 +194,13 @@
                 pgInPgPersonDto=new PgInPgPersonDto(pgInPgPerson);
                 pgInPgPersonDtoList.add(pgInPgPersonDto);
                 msg = "人员信息获取成功";
+                code="200";
             }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "人员信息获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgPersonDtoList);
         return resultMap;
@@ -206,6 +217,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             PgInPgPerson pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName);
@@ -221,6 +233,7 @@
                     pgInPgPersonManager.save(pgInPgPerson);
                     result = "true";
                     msg = "编辑成功";
+                    code="200";
                 }
             }
         } catch (Exception e) {
@@ -228,9 +241,9 @@
             msg = "编辑失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -244,10 +257,12 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         int inPgNum=0;
         String msg = "";
+        String code="0";
 
         try{
             inPgNum=pgInPgStatusManager.getInPgNum();
 
+            code="200";
             msg="人员入廊次数获取成功";
         }
         catch(Exception e)
@@ -255,6 +270,7 @@
             e.printStackTrace();
             msg="人员入廊次数获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",inPgNum);
 
@@ -272,18 +288,22 @@
                                                    @FormParam("statisticType") String statisticType) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
 
         List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<PgInPgInfoDto>();
         try {
             pgInPgInfoDtoList = pgInPgPersonManager.getPgInPersonListByTime(startTime, endTime, statisticType);
             if(pgInPgInfoDtoList==null)
                 msg="入廊人员统计信息获取失败";
-            else
-                msg="入廊人员统计信息获取成功";
+            else {
+                code="200";
+                msg = "入廊人员统计信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "入廊人员统计信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
         return resultMap;
@@ -296,6 +316,7 @@
 
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
 
         try {
@@ -304,8 +325,10 @@
                 pgDeviceDtoList=pgDeviceManager.getPgCameraListByPosition("",apCodeStr);
                 if(pgDeviceDtoList==null)
                     msg="不存在关联摄像机";
-                else
-                    msg="关联摄像机获取成功";
+                else {
+                    code="200";
+                    msg = "关联摄像机获取成功";
+                }
             } else {
                 msg="请输入Ap编号";
             }
@@ -315,6 +338,7 @@
             msg="关联摄像机获取成功";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgDeviceDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java
index 507b3fe..b43f077 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java
@@ -34,6 +34,7 @@
 
         String result="";
         String msg="";
+        String code="";
         try{
             PgInPgStatus pgInPgStatus=new PgInPgStatus();
 
@@ -44,6 +45,7 @@
             pgInPgStatusManager.save(pgInPgStatus);
             msg="入廊时间提交成功";
             result="true";
+            code="200";
         }
         catch (Exception e){
             e.printStackTrace();
@@ -51,6 +53,7 @@
             result="false";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -66,6 +69,7 @@
 
         String result="";
         String msg="";
+        String code="0";
         try{
             PgInPgPerson pgInPgPerson=pgInPgPersonManager.getPgInPgPersonByAssetCode(assetCode);
 
@@ -79,6 +83,7 @@
             pgInPgStatusManager.save(pgInPgStatus);
 
             msg="出廊时间提交成功";
+            code="200";
             result="true";
         }
         catch (Exception e){
@@ -87,6 +92,7 @@
             result="false";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
index 9def330..9c0ba1f 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
@@ -33,17 +33,20 @@
                                             @FormParam("existNum") String existNum) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         String result="";
 
         try {
             pgIntelPlanManager.savePgIntelPlan(parName,lineName,maxNum,existNum);
             msg="规划数据保存成功";
+            code="200";
             result="true";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "规划数据保存失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
@@ -55,15 +58,18 @@
     public Map<String, Object> getIntelLineType() throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgIntelPlanTypeDto> pgIntelPlanTypeDtoList=new ArrayList<>();
         try {
             pgIntelPlanTypeDtoList=pgIntelPlanManager.getIntelPlanType();
+            code="200";
             msg="获取排线类型成功";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "获取排线类型失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgIntelPlanTypeDtoList);
         return resultMap;
@@ -76,6 +82,7 @@
                                             @FormParam("partitionStr") String partitionStr) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgIntelPlanDto> pgIntelPlanDtoList = new ArrayList<>();
 
@@ -83,8 +90,10 @@
             pgIntelPlanDtoList = pgIntelPlanManager.getPgIntelPlanListByPartion(lineName, partitionStr);
             if(pgIntelPlanDtoList==null||pgIntelPlanDtoList.size()==0)
                 msg="请输入正确的规划参数";
-            else
-                msg="规划数据获取成功";
+            else {
+                code="200";
+                msg = "规划数据获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "规划数据获取失败";
@@ -103,10 +112,12 @@
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
         String result="";
+        String code="0";
 
         try {
             boolean bl=pgIntelPlanManager.addLineUse(lineName,partitionStr,num);
             if(bl){
+                code="200";
                 msg="排线入廊成功";
                 result="true";
             }
@@ -119,6 +130,7 @@
             msg = "排线入廊失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
@@ -132,6 +144,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
         String result="";
+        String code="0";
 
         try {
             PgIntelPlan pgIntelPlan=pgIntelPlanManager.getPgIntelPlanByParNameAndLine(lineName,parName);
@@ -140,11 +153,13 @@
             pgIntelPlanManager.save(pgIntelPlan);
             msg="规划数据删除成功";
             result="true";
+            code="200";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "规划数据删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java b/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java
index 378af00..9c39523 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java
@@ -1,5 +1,6 @@
 package com.casic.PgInterface.rs;
 
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
 import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
 import com.casic.PgInterface.intelPlan.dto.PgLineHoleDTO;
 import com.casic.PgInterface.intelPlan.manager.PgLineHoleManager;
@@ -27,6 +28,9 @@
     @Resource
     private PgPileAcuManager pgPileAcuManager;
 
+    @Resource
+    private PgRoadManager pgRoadManager;
+
     @POST
     @Path("getPgLineAcuHole")
     @Produces(MediaType.APPLICATION_JSON)
@@ -34,23 +38,32 @@
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
         String result="";
+        String code="0";
         List<PgLineHoleDTO> pgLineHoleDTOList=new ArrayList<>();
 
         try {
             PgPileAcu pgPileAcu=pgPileAcuManager.getPgPileAcuByCode(acuCode);
             if(pgPileAcu==null){
                 msg="不存在分区";
-            }else{
-                pgLineHoleDTOList=pgLineHoleManager.getCurrentHoleByAcu(pgPileAcu.getId());
-                if(pgLineHoleDTOList!=null&&pgLineHoleDTOList.size()!=0)
-                    msg="获取成功";
-                else
-                    msg="未找到入廊数据";
+            }else {
+                pgLineHoleDTOList = pgLineHoleManager.getCurrentHoleByAcu(pgPileAcu.getId());
+                if (pgLineHoleDTOList != null && pgLineHoleDTOList.size() != 0)
+                {
+                    code="200";
+                    msg = "获取成功";
+                }
+                else {
+                    PgLineHoleDTO pgLineHoleDTO=new PgLineHoleDTO();
+                    pgLineHoleDTO.setRoad(pgRoadManager.get(pgPileAcu.getRoadId()).getRoadName());
+                    pgLineHoleDTOList.add(pgLineHoleDTO);
+                    msg = "未找到入廊数据";
+                }
             }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgLineHoleDTOList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgLogRs.java b/src/main/java/com/casic/PgInterface/rs/PgLogRs.java
index 39cff52..30db63b 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgLogRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgLogRs.java
@@ -45,6 +45,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         PgLog pgLog=new PgLog();
         try {
             PgUser pgUser = new PgUser();
@@ -60,14 +61,15 @@
             pgLogManager.save(pgLog);
             result = "true";
             msg = "保存成功";
-
+            code="200";
         } catch (Exception e) {
             result = "false";
             msg = "保存失败";
             e.printStackTrace();
         }
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -83,17 +85,21 @@
             throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgLogDto> pgLogDtoList = new ArrayList<PgLogDto>();
         try {
             pgLogDtoList = pgLogManager.getAllLogs(userName, startTime, endTime);
             if (pgLogDtoList == null || pgLogDtoList.size() == 0)
                 msg = "没有找到日志信息";
-            else
+            else {
+                code="200";
                 msg = "日志信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "日志信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgLogDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java
index 9fd0a5f..37b72f6 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java
@@ -36,19 +36,23 @@
         Map<String,Object> resultMap=new HashMap<>();
 
         String msg = "";
+        String code="0";
         List<PgMaintainType> pgMaintainTypeList=new ArrayList<>();
         try{
             pgMaintainTypeList=pgMaintainTypeManager.getMaintainType();
             if(pgMaintainTypeList!=null&&pgMaintainTypeList.size()!=0)
                 msg="不存在运维类别";
-            else
-                msg="运维类别获取成功";
+            else {
+                code="200";
+                msg = "运维类别获取成功";
+            }
         }
         catch(Exception ex)
         {
             ex.printStackTrace();
             msg="运维类别获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgMaintainTypeList);
 
@@ -65,10 +69,11 @@
         Map<String,Object> resultMap=new HashMap<>();
 
         String msg = "";
+        String code="0";
         List<PgMaintainTypeDto> pgMaintainTypeDtoList=new ArrayList<PgMaintainTypeDto>();
         try{
             pgMaintainTypeDtoList=pgMaintainTypeManager.getMaintainTypeModel(type);
-
+            code="200";
             msg="维护类型获取成功";
         }
         catch(Exception ex)
@@ -77,9 +82,9 @@
             msg="维护类型获取失败";
         }
 
-        resultMap.put("result",pgMaintainTypeDtoList);
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgMaintainTypeDtoList);
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java
index d735cc9..82ffca4 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java
@@ -33,12 +33,16 @@
                                                  @FormParam("endTime") String endTime){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
         List<PgMaintanceRecordHeadDto> pgMaintanceRecordHeadDtoList=new ArrayList<>();
         try{
             pgMaintanceRecordHeadDtoList=pgMaintanceRecordHeadManager.getPgMaintanceRecordHeadLsit(repairMan,startTime,endTime);
             if(pgMaintanceRecordHeadDtoList!=null&&pgMaintanceRecordHeadDtoList.size()!=0)
+            {
+                code="200";
                 msg="维护信息获取成功";
+            }
             else
                 msg="不存在维护信息";
         }
@@ -47,6 +51,7 @@
             msg="巡检信息获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgMaintanceRecordHeadDtoList);
 

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 25ded8a..283d7ab 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,20 +7,56 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" 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/construction/manager/PgCsDocumentManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/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/manager/PgAlarmManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/~$说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/~$说明20191207.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.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$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/接口说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明20191207.docx" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
@@ -51,7 +87,7 @@
         <counts>
           <entry key="class" value="4" />
           <entry key="iml" value="2" />
-          <entry key="java" value="707" />
+          <entry key="java" value="820" />
           <entry key="properties" value="14" />
           <entry key="xml" value="7" />
         </counts>
@@ -60,7 +96,7 @@
         <counts>
           <entry key="CLASS" value="4" />
           <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="707" />
+          <entry key="JAVA" value="820" />
           <entry key="Properties" value="14" />
           <entry key="XML" value="7" />
         </counts>
@@ -68,32 +104,32 @@
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
           <entry key="dummy" value="38" />
-          <entry key="java" value="30161" />
+          <entry key="java" value="40859" />
           <entry key="properties" value="100" />
-          <entry key="txt" value="176" />
+          <entry key="txt" value="186" />
           <entry key="xml" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="30161" />
-          <entry key="PLAIN_TEXT" value="214" />
+          <entry key="JAVA" value="40859" />
+          <entry key="PLAIN_TEXT" value="224" />
           <entry key="Properties" value="100" />
           <entry key="XML" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="48" />
+          <entry key="project.closed" value="51" />
           <entry key="project.open.time.1" value="5" />
           <entry key="project.open.time.12" value="2" />
           <entry key="project.open.time.13" value="1" />
           <entry key="project.open.time.15" value="1" />
           <entry key="project.open.time.16" value="1" />
           <entry key="project.open.time.17" value="1" />
-          <entry key="project.open.time.2" value="1" />
+          <entry key="project.open.time.2" value="2" />
           <entry key="project.open.time.20" value="1" />
-          <entry key="project.open.time.23" value="1" />
+          <entry key="project.open.time.23" value="2" />
           <entry key="project.open.time.24" value="2" />
           <entry key="project.open.time.251" value="1" />
           <entry key="project.open.time.27" value="2" />
@@ -106,8 +142,8 @@
           <entry key="project.open.time.36" value="1" />
           <entry key="project.open.time.37" value="1" />
           <entry key="project.open.time.39" value="2" />
-          <entry key="project.open.time.4" value="2" />
-          <entry key="project.open.time.40" value="1" />
+          <entry key="project.open.time.4" value="3" />
+          <entry key="project.open.time.40" value="2" />
           <entry key="project.open.time.41" value="2" />
           <entry key="project.open.time.42" value="2" />
           <entry key="project.open.time.43" value="2" />
@@ -122,23 +158,25 @@
           <entry key="project.open.time.6" value="3" />
           <entry key="project.open.time.63" value="2" />
           <entry key="project.open.time.64" value="1" />
+          <entry key="project.open.time.66" value="1" />
           <entry key="project.open.time.71" value="2" />
+          <entry key="project.open.time.74" value="1" />
           <entry key="project.open.time.76" value="1" />
           <entry key="project.open.time.8" value="2" />
           <entry key="project.open.time.9" value="1" />
           <entry key="project.open.time.97" value="1" />
-          <entry key="project.opened" value="78" />
+          <entry key="project.opened" value="84" />
         </counts>
       </usages-collector>
     </session>
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+            <state relative-caret-position="396">
+              <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
               <folding>
                 <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
                 <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -147,73 +185,6 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <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="99">
-              <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-              <folding>
-                <element signature="imports" expanded="true" />
-                <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-1170">
-              <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state>
-              <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
-              <folding>
-                <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-                <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="true">
-        <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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-              <folding>
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-                <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>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <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="352">
-              <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -225,18 +196,9 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>inCriteria</find>
-      <find>getPgPlanResulList</find>
-      <find>getPileAcuListByPileAcuStr</find>
-      <find>distinct</find>
-      <find>order</find>
-      <find>canPlanLine</find>
-      <find>isExistLine</find>
-      <find>getPlanResult</find>
       <find>pgPipeLine</find>
       <find>getPipeLineBylineName</find>
       <find>StringU</find>
-      <find>getAllAlarm</find>
       <find>getAlarmList</find>
       <find>getPgInPersonListByDay</find>
       <find>getDayInPgStatistic</find>
@@ -254,7 +216,16 @@
       <find>getPgContructionByNameOrType</find>
       <find>&quot;&quot;,&quot;&quot;,</find>
       <find>getPgContructionDtoByNameOrType</find>
+      <find>addConstruction</find>
+      <find>getPgLineAcuHole</find>
+      <find>getPlanResult</find>
       <find>getConstruction</find>
+      <find>addPipeLine</find>
+      <find>未找到入廊数据</find>
+      <find>getCurrentHoleByAcu</find>
+      <find>getAllAlarm</find>
+      <find>getPgDeviceDtoListByPartition</find>
+      <find>getPgDeviceByDevType</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -263,57 +234,57 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlan.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileHoleManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/planData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/PlanData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
       </list>
     </option>
   </component>
@@ -359,7 +330,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -421,53 +391,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="dto" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="manager" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -479,29 +402,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="rs" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -516,6 +416,7 @@
         </subPane>
       </pane>
       <pane id="Scope" />
+      <pane id="PackagesPane" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -710,7 +611,13 @@
       <workItem from="1574902733573" duration="1829000" />
       <workItem from="1574998240004" duration="7016000" />
       <workItem from="1575247959683" duration="6997000" />
-      <workItem from="1575704345590" duration="40473000" />
+      <workItem from="1575704345590" duration="69381000" />
+      <workItem from="1575869479666" duration="721000" />
+      <workItem from="1575947104878" duration="6101000" />
+      <workItem from="1576128264436" duration="3347000" />
+      <workItem from="1576208571543" duration="22000" />
+      <workItem from="1576227513917" duration="862000" />
+      <workItem from="1576293721220" duration="18246000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -817,11 +724,18 @@
       <option name="project" value="LOCAL" />
       <updated>1575775489149</updated>
     </task>
-    <option name="localTasksCounter" value="16" />
+    <task id="LOCAL-00016" summary="整改施工信息">
+      <created>1575791780774</created>
+      <option name="number" value="00016" />
+      <option name="presentableId" value="LOCAL-00016" />
+      <option name="project" value="LOCAL" />
+      <updated>1575791780774</updated>
+    </task>
+    <option name="localTasksCounter" value="17" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="452131000" />
+    <option name="totallyTimeSpent" value="510338000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -834,9 +748,8 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
-    <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.24205749" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2647504" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -847,7 +760,7 @@
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.3295082" />
       <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.4819672" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.65737706" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.3295082" />
@@ -939,7 +852,8 @@
     <MESSAGE value="重新设计智能规划部分" />
     <MESSAGE value="完成智能规划对接" />
     <MESSAGE value="修改报警统计" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改报警统计" />
+    <MESSAGE value="整改施工信息" />
+    <option name="LAST_COMMIT_MESSAGE" value="整改施工信息" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -951,16 +865,10 @@
           <option name="timeStamp" value="3" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java</url>
-          <line>69</line>
+          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java</url>
+          <line>40</line>
           <properties />
-          <option name="timeStamp" value="21" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java</url>
-          <line>96</line>
-          <properties />
-          <option name="timeStamp" value="38" />
+          <option name="timeStamp" value="122" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
@@ -970,394 +878,452 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <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="2068">
-          <caret line="154" column="35" selection-start-line="154" selection-start-column="35" selection-end-line="154" selection-end-column="35" />
-        </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="3300">
-          <caret line="297" column="22" selection-start-line="297" selection-start-column="22" selection-end-line="297" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/StringUtils.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
-          <caret line="13" column="48" lean-forward="true" selection-start-line="13" selection-start-column="48" selection-end-line="13" selection-end-column="48" />
+          <caret line="11" column="5" selection-start-line="11" selection-start-column="5" selection-end-line="11" selection-end-column="5" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="78" lean-forward="true" selection-start-line="78" selection-end-line="78" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="616">
-          <caret line="41" column="1" selection-start-line="41" selection-start-column="1" selection-end-line="41" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="110">
-          <caret line="12" column="23" selection-start-line="12" selection-start-column="23" selection-end-line="12" selection-end-column="23" />
+        <state relative-caret-position="516">
+          <caret line="114" column="12" selection-start-line="114" selection-start-column="12" selection-end-line="114" selection-end-column="12" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="164">
-          <caret line="56" lean-forward="true" selection-start-line="56" selection-end-line="56" />
+        <state relative-caret-position="418">
+          <caret line="33" column="44" selection-start-line="33" selection-start-column="44" selection-end-line="33" selection-end-column="44" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="258">
-          <caret line="27" column="12" lean-forward="true" selection-start-line="27" selection-start-column="12" selection-end-line="27" selection-end-column="12" />
+        <state relative-caret-position="132">
+          <caret line="11" column="20" lean-forward="true" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="20" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.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="-12">
-          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        <state relative-caret-position="516">
+          <caret line="142" column="54" selection-start-line="142" selection-start-column="54" selection-end-line="142" selection-end-column="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="858">
-          <caret line="55" column="27" lean-forward="true" selection-start-line="55" selection-start-column="27" selection-end-line="55" selection-end-column="27" />
+        <state relative-caret-position="66">
+          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="58">
+          <caret line="18" column="28" selection-start-line="18" selection-start-column="19" selection-end-line="18" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="305">
+          <caret line="24" column="31" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="714">
+          <caret line="58" column="5" lean-forward="true" selection-start-line="58" selection-start-column="5" selection-end-line="58" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="924">
+          <caret line="134" column="92" selection-start-line="134" selection-start-column="92" selection-end-line="134" selection-end-column="92" />
+          <folding>
+            <element signature="method#linkDevice#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkPartitionCamera#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkReservePlan#0;class#PgAlarmLinkRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1066">
+          <caret line="90" lean-forward="true" selection-start-line="90" selection-end-line="90" />
+          <folding>
+            <element signature="method#getTjResultByAlarmType#0;class#PgAlarmTjRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="946">
+          <caret line="148" column="11" lean-forward="true" selection-start-line="148" selection-start-column="11" selection-end-line="148" selection-end-column="11" />
+          <folding>
+            <element signature="method#getAlarmTypeList#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#addAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#editAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#deleteAlarmType#0;class#PgAlarmTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="208">
+          <caret line="46" column="23" lean-forward="true" selection-start-line="46" selection-start-column="23" selection-end-line="46" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="113" column="9" lean-forward="true" selection-start-line="113" selection-start-column="9" selection-end-line="113" selection-end-column="9" />
+          <folding>
+            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
+            <element signature="method#getNewestCh4InfoByDev#0;class#PgCh4Rs#0" />
+            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="145" column="6" lean-forward="true" selection-start-line="145" selection-start-column="6" selection-end-line="145" selection-end-column="6" />
+          <folding>
+            <element signature="method#addAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#editAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#deleteAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#getAuthorityList#0;class#PgAuthorityRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="58" column="1" lean-forward="true" selection-start-line="58" selection-start-column="1" selection-end-line="58" selection-end-column="1" />
+          <folding>
+            <element signature="method#getPgAssetPlanList#0;class#PgAssetPlanRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="370">
+          <caret line="371" column="66" selection-start-line="371" selection-start-column="66" selection-end-line="371" selection-end-column="66" />
+          <folding>
+            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#searchConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionDev#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="139" column="13" lean-forward="true" selection-start-line="139" selection-start-column="13" selection-end-line="139" selection-end-column="13" />
+          <folding>
+            <element signature="method#getCoInfoByDevAndDate#0;class#PgCoRs#0" />
+            <element signature="method#getNewestCoInfoByDev#0;class#PgCoRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="540">
+          <caret line="223" column="5" lean-forward="true" selection-start-line="223" selection-start-column="5" selection-end-line="223" selection-end-column="5" />
+          <folding>
+            <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="682">
+          <caret line="100" lean-forward="true" selection-start-line="100" selection-end-line="100" />
+          <folding>
+            <element signature="method#getDeviceTpeyList#0;class#PgDeviceTypeRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="377">
+          <caret line="225" column="35" selection-start-line="225" selection-start-column="35" selection-end-line="225" selection-end-column="35" />
+          <folding>
+            <element signature="method#addEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#addEquipment#1;class#PgEquipmentRs#0" />
+            <element signature="method#getEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#deleteEquipment#0;class#PgEquipmentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="406">
+          <caret line="109" lean-forward="true" selection-start-line="109" selection-end-line="109" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="154">
+          <caret line="28" column="19" selection-start-line="28" selection-start-column="19" selection-end-line="28" selection-end-column="19" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="748">
-          <caret line="49" column="5" lean-forward="true" selection-start-line="49" selection-start-column="5" selection-end-line="49" selection-end-column="5" />
+        <state relative-caret-position="296">
+          <caret line="161" column="35" selection-start-line="161" selection-start-column="35" selection-end-line="161" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="384">
+          <caret line="99" column="5" lean-forward="true" selection-start-line="99" selection-start-column="5" selection-end-line="99" selection-end-column="5" />
+        </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="362">
+          <caret line="340" column="35" selection-start-line="340" selection-start-column="35" selection-end-line="340" selection-end-column="35" />
+          <folding>
+            <element signature="method#addInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPersonInPg#0;class#PgInPgPersonRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-606">
+          <caret line="76" column="20" lean-forward="true" selection-start-line="76" selection-start-column="20" selection-end-line="76" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="65" column="35" selection-start-line="65" selection-start-column="35" selection-end-line="65" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="101" column="35" selection-start-line="101" selection-start-column="35" selection-end-line="101" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="84" column="35" selection-start-line="84" selection-start-column="35" selection-end-line="84" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="59" lean-forward="true" selection-start-line="59" selection-end-line="59" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="60" column="1" lean-forward="true" selection-start-line="60" selection-start-column="1" selection-end-line="60" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="145" column="35" selection-start-line="145" selection-start-column="35" selection-end-line="145" selection-end-column="35" />
+        </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="274">
+          <caret line="350" column="35" selection-start-line="350" selection-start-column="35" selection-end-line="350" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="121" column="39" selection-start-line="121" selection-start-column="39" selection-end-line="121" selection-end-column="39" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="28" column="8" lean-forward="true" selection-start-line="28" selection-start-column="8" selection-end-line="28" selection-end-column="8" />
+        <state relative-caret-position="340">
+          <caret line="103" selection-start-line="103" selection-end-line="103" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="226" column="35" selection-start-line="226" selection-start-column="35" selection-end-line="226" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="203" column="35" selection-start-line="203" selection-start-column="35" selection-end-line="203" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="241" column="35" selection-start-line="241" selection-start-column="35" selection-end-line="241" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="225" column="1" lean-forward="true" selection-start-line="225" selection-start-column="1" selection-end-line="225" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="176" column="5" lean-forward="true" selection-start-line="176" selection-start-column="5" selection-end-line="176" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="178" column="35" lean-forward="true" selection-start-line="178" selection-start-column="35" selection-end-line="178" selection-end-column="35" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="516">
-          <caret line="94" column="53" selection-start-line="94" selection-start-column="53" selection-end-line="94" selection-end-column="53" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="814">
-          <caret line="52" column="9" lean-forward="true" selection-start-line="52" selection-start-column="9" selection-end-line="52" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="182">
-          <caret line="58" column="12" lean-forward="true" selection-start-line="58" selection-start-column="12" selection-end-line="58" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="34" lean-forward="true" selection-start-line="34" selection-end-line="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="32" lean-forward="true" selection-start-line="32" selection-end-line="32" />
-          <folding>
-            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
-            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="185">
-          <caret line="63" column="13" selection-start-line="63" selection-start-column="13" selection-end-line="63" selection-end-column="13" />
-          <folding>
-            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
-            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
-            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="e#6319#6324#0" />
-            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
-          </folding>
+          <caret line="240" lean-forward="true" selection-start-line="240" selection-end-line="240" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
-          <caret line="58" column="28" lean-forward="true" selection-start-line="58" selection-start-column="28" selection-end-line="58" selection-end-column="28" />
-          <folding>
-            <element signature="method#addTempHumData#0;class#PgTempHumRs#0" />
-          </folding>
+        <state relative-caret-position="340">
+          <caret line="148" column="34" selection-start-line="148" selection-start-column="34" selection-end-line="148" selection-end-column="34" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
+        <state relative-caret-position="458">
+          <caret line="99" column="35" selection-start-line="99" selection-start-column="35" selection-end-line="99" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+        <state relative-caret-position="384">
+          <caret line="145" column="32" lean-forward="true" selection-start-line="145" selection-start-column="32" selection-end-line="145" selection-end-column="32" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="414">
-          <caret line="22" column="46" lean-forward="true" selection-start-line="22" selection-start-column="46" selection-end-line="22" selection-end-column="46" />
-        </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="396">
-          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" column="83" selection-start-line="11" selection-start-column="83" selection-end-line="11" selection-end-column="83" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="26">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
-          <folding>
-            <element signature="method#getPgInPgStatusByPerson#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNumByName#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNum#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPersonListByDay#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPgStatusByPgInPgPerson#0;class#PgInPgStatusManager#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="44">
-          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-12">
-          <caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="87" lean-forward="true" selection-start-line="87" selection-end-line="87" />
-          <folding>
-            <element signature="method#getConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#addConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#deleteConstructionType#0;class#PgConstructionTypeRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
-          <folding>
-            <element signature="method#getConstructionTypeByType#0;class#PgConstructionTypeManager#0" />
-            <element signature="method#getAllConstructionTypeDto#0;class#PgConstructionTypeManager#0" />
-          </folding>
-        </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="145">
-          <caret line="258" column="9" lean-forward="true" selection-start-line="258" selection-start-column="9" selection-end-line="258" selection-end-column="9" />
-          <folding>
-            <element signature="method#getMonthInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayInPgStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgOverViewRs#0" />
-            <element signature="method#getAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getMonthAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayAlarmStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgOverViewRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="103">
-          <caret line="105" column="50" lean-forward="true" selection-start-line="105" selection-start-column="50" selection-end-line="105" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateBasicDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="99">
-          <caret line="125" selection-start-line="125" selection-end-line="125" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="190">
-          <caret line="24" column="35" lean-forward="true" selection-start-line="24" selection-start-column="35" selection-end-line="24" selection-end-column="35" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="436">
-          <caret line="24" lean-forward="true" selection-start-line="24" selection-end-line="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" lean-forward="true" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="300">
-          <caret line="34" column="31" lean-forward="true" selection-start-line="34" selection-start-column="31" selection-end-line="34" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="42" column="13" lean-forward="true" selection-start-line="42" selection-start-column="13" selection-end-line="42" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="120" column="72" lean-forward="true" selection-start-line="120" selection-start-column="72" selection-end-line="120" selection-end-column="72" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="293">
-          <caret line="58" column="73" lean-forward="true" selection-start-line="58" selection-start-column="73" selection-end-line="58" selection-end-column="73" />
-          <folding>
-            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
-            <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
-          </folding>
-        </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="307">
-          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
+        <state relative-caret-position="758">
+          <caret line="130" column="5" lean-forward="true" selection-start-line="130" selection-start-column="5" selection-end-line="130" selection-end-column="5" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1170">
-          <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
+        <state relative-caret-position="494">
+          <caret line="86" column="62" lean-forward="true" selection-start-line="86" selection-start-column="62" selection-end-line="86" selection-end-column="62" />
           <folding>
-            <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-            <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+            <element signature="method#getAllDevice#0;class#PgDeviceManager#0" />
+            <element signature="method#getAllDev#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="195" column="28" lean-forward="true" selection-start-line="195" selection-start-column="28" selection-end-line="195" selection-end-column="28" />
+        <state relative-caret-position="166">
+          <caret line="174" column="13" lean-forward="true" selection-start-line="174" selection-start-column="13" selection-end-line="174" selection-end-column="13" />
           <folding>
-            <element signature="method#getAlarmByTypeAndTime#0;class#PgAlarmManager#0" />
-            <element signature="method#getAlarmNum#0;class#PgAlarmManager#0" />
             <element signature="method#getDayAlarmStatistic#0;class#PgAlarmManager#0" />
+            <element signature="method#getAlarmList#0;class#PgAlarmManager#0" />
             <element signature="method#createDTO#0;class#PgAlarmManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="364">
+          <caret line="46" column="56" lean-forward="true" selection-start-line="46" selection-start-column="56" selection-end-line="46" selection-end-column="56" />
+          <folding>
+            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
+            <element signature="method#getPgDev#0;class#PgDeviceRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
+            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+        <state relative-caret-position="396">
+          <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
           <folding>
             <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
             <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -1365,52 +1331,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="239">
-          <caret line="21" column="33" lean-forward="true" selection-start-line="21" selection-start-column="33" selection-end-line="21" selection-end-column="33" />
-        </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="352">
-          <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-        </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="99">
-          <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-          </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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-          <folding>
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-            <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>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
index c436c93..e913155 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
@@ -132,7 +132,10 @@
             this.setAlarmType("");
         else
             this.setAlarmType(pgAlarm.getAlarmTypeId().getAlarmType());
-        this.setAlarmValue(pgAlarm.getAlarmValue());
+        if(pgAlarm.getAlarmValue()==null)
+            this.setAlarmValue("");
+        else
+            this.setAlarmValue(pgAlarm.getAlarmValue());
         if (pgAlarm.getAlarmDate() != null)
             this.setAlarmDate(sdf.format(pgAlarm.getAlarmDate()));
         else
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
index a43965c..565cb41 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -159,11 +159,21 @@
     }
 
     //获取历史报警消息列表
-    public List<PgAlarmDto> getAllAlarm(String alarmType,String startDay,String endDay,String isNew,int page,int rows) {
-        try {
+    public  Map<String, Object> getAllAlarm(String alarmType,String partition,String startDay,String endDay,String isNew,int page,int rows) {
 
+        Map<String, Object> resultMap = new HashMap<>();
+        String msg="";
+
+        try {
             Criteria criteria = createCriteria(PgAlarm.class);
 
+            if (StringUtils.isNotBlank(partition)) {
+                DetachedCriteria inCriteria = DetachedCriteria.forClass(PgDevice.class);
+                inCriteria.add(Restrictions.eq("partition", partition));
+                inCriteria.setProjection(Property.forName("id"));
+                criteria.add(Property.forName("alarmDevId").in(inCriteria));
+            }
+
             if (StringUtils.isNotBlank(alarmType)&&!alarmType.contains("全部")&&pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
                 criteria.add(Restrictions.eq("alarmTypeId", pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)));
 
@@ -190,8 +200,16 @@
             for (PgAlarm pgAlarm : pgAlarmList) {
                 pgAlarmDtoList.add(new PgAlarmDto(pgAlarm));
             }
-
-            return pgAlarmDtoList;
+            if(pgAlarmDtoList==null||pgAlarmDtoList.size()==0) {
+                resultMap.put("msg", "没有报警信息");
+                resultMap.put("code","0");
+            }else {
+                resultMap.put("code","200");
+                resultMap.put("msg", "报警信息获取成功");
+            }
+            resultMap.put("count",pg.getTotalCount());
+            resultMap.put("result",pgAlarmDtoList);
+            return resultMap;
         }
         catch(Exception ex){
             ex.printStackTrace();
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index 7547560..654f49e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -24,11 +24,11 @@
 
         Criteria criteria = createCriteria(PgDevice.class);
 
-        if(road!=null)
+        if(StringUtils.isNotBlank(road))
             criteria.add(Restrictions.eq("road",road));
-        if(partition!=null)
+        if(StringUtils.isNotBlank(partition))
             criteria.add(Restrictions.eq("partition",partition));
-        if(devType!=null)
+        if(StringUtils.isNotBlank(devType))
             criteria.add(Restrictions.eq("devType",devType));
 
         criteria.add(Restrictions.eq("active", 1));
@@ -43,6 +43,29 @@
         return pgDeviceDtoList;
     }
 
+    public List<PgDeviceDto> getAllDev(String road,String partition,String devType) {
+
+        Criteria criteria = createCriteria(PgDevice.class);
+
+        if(StringUtils.isNotBlank(road))
+            criteria.add(Restrictions.eq("road",road));
+        if(StringUtils.isNotBlank(partition))
+            criteria.add(Restrictions.eq("partition",partition));
+        if(StringUtils.isNotBlank(devType))
+            criteria.add(Restrictions.like("devType","%"+devType+"%"));
+
+        criteria.add(Restrictions.eq("active", 1));
+        criteria.addOrder(Order.desc("id"));
+        List<PgDevice> pgDeviceList = criteria.list();
+
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
+        for (PgDevice pgDevice : pgDeviceList) {
+            pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
+        }
+
+        return pgDeviceDtoList;
+    }
+
     //根据名字获取当前设备
     public PgDevice getDeviceByAssetCode(String assetCode) {
         Criteria criteria=createCriteria(PgDevice.class);
@@ -56,9 +79,9 @@
     }
 
     //根据类型获取设备列表
-    public List<PgDeviceDto> getDeviceByDevTypee(String devType) {
+    public List<PgDeviceDto> getDeviceByDevType(String devType) {
         Criteria criteria=createCriteria(PgDevice.class);
-        criteria.add(Restrictions.eq("devType",devType));
+        criteria.add(Restrictions.like("devType","%"+devType+"%"));
 
         List<PgDevice> pgDeviceList=criteria.list();
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
@@ -106,7 +129,7 @@
         criteria.add(Restrictions.eq("partition",partition));
 
         List<PgDevice> pgDeviceList=criteria.list();
-        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<PgDeviceDto>();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
 
         for (PgDevice pgDevice : pgDeviceList) {
             pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
index 3a3bccd..595730e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
@@ -1,10 +1,13 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.devTable.domain.PgAlarmType;
 import com.casic.PgInterface.devTable.domain.PgPartition;
 import com.casic.PgInterface.devTable.domain.PgRoad;
 import com.casic.PgInterface.devTable.domain.PipeGallery;
 import com.casic.PgInterface.devTable.dto.PgPartitionDto;
+import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
@@ -12,7 +15,9 @@
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Created by yxw on 2017/11/4.
@@ -21,7 +26,8 @@
 public class PgPartitionManager extends HibernateEntityDao<PgPartition> {
 
     @Resource
-    PgRoadManager pgRoadManager;
+    private PgRoadManager pgRoadManager;
+
 
     public PgPartition getPartitionByParName(String parName) {
         Criteria criteria = getSession().createCriteria(PgPartition.class);
@@ -99,4 +105,5 @@
         return pgPartitionDtoList;
     }
 
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
index f216360..a6928f1 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
@@ -5,6 +5,7 @@
 public class PgPlanResultRe {
 
     private String taskKey;
+    private List<String> pileAcuList;
     private List<PgPlanResult> pgPlanResultList;
 
     public String getTaskKey() {
@@ -15,6 +16,14 @@
         this.taskKey = taskKey;
     }
 
+    public List<String> getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(List<String> pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+
     public List<PgPlanResult> getPgPlanResultList() {
         return pgPlanResultList;
     }
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
index 71ea765..47eea07 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
@@ -54,9 +54,7 @@
 
         List<PgLineHole> pgLineHoleList=criteria.list();
         List<PgLineHoleDTO> pgLineHoleDTOList=new ArrayList<>();
-        if(pgLineHoleList==null||pgLineHoleList.size()==0)
-            return null;
-        else
+        if(pgLineHoleList!=null&&pgLineHoleList.size()!=0)
             pgLineHoleDTOList=PgLineHoleDTO.ConvertToDTOList(pgLineHoleList,pgPileAcuManager,pgRoadManager);
         return pgLineHoleDTOList;
     }
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
index 0fd9e1f..841a386 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
@@ -1,12 +1,15 @@
 package com.casic.PgInterface.intelPlan.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.devTable.domain.PgPartition;
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
 import com.casic.PgInterface.intelPlan.domain.PgLineHole;
 import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
 import com.casic.PgInterface.intelPlan.domain.PgSection;
 import com.casic.PgInterface.intelPlan.dto.PgPlanResult;
 import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
 import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -22,6 +25,9 @@
     @Resource
     private PgLineHoleManager pgLineHoleManager;
 
+    @Resource
+    private PgRoadManager pgRoadManager;
+
     public PgPileAcu getPgPileAcuByCode(String acuCode){
         List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
 
@@ -58,7 +64,9 @@
         for(PgPlanTask pgPlanTask:pgPlanTaskList){
             List<PgPlanResult> pgPlanResultList=getPgPlanResultByPlantask(pgPlanTask);
             PgPlanResultRe pgPlanResultRe=new PgPlanResultRe();
+
             pgPlanResultRe.setTaskKey(pgPlanTask.getTaskKey());
+            pgPlanResultRe.setPileAcuList(pgPlanTask.getPileAcuList());
             pgPlanResultRe.setPgPlanResultList(pgPlanResultList);
 
             pgPlanResultReList.add(pgPlanResultRe);
@@ -142,4 +150,57 @@
         return length;
     }
 
+    private PgPileAcu getPgPileAcuByAcuCode(String acuCode){
+        List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
+
+        if(pgPileAcuList==null||pgPileAcuList.size()==0)
+            return null;
+        else
+            return pgPileAcuList.get(0);
+    }
+
+    public List<PgAcuTask> getACUTask(String pileAcuList){
+        String[] acuArray=pileAcuList.split(",");
+        List<PgAcuTask> pgAcuTaskList=new ArrayList<>();
+
+        for(String acu:acuArray){
+            PgPileAcu pgPileAcu=this.getPgPileAcuByCode(acu);
+            String roadName=pgRoadManager.get(pgPileAcu.getRoadId()).getRoadName();
+
+            if(!containRoad(roadName,pgAcuTaskList))
+            {
+                PgAcuTask pgAcuTask=new PgAcuTask();
+                pgAcuTask.setRoadName(roadName);
+                pgAcuTask.setPileAcuList(acu);
+                pgAcuTaskList.add(pgAcuTask);
+            }
+            else{
+                PgAcuTask pgAcuTask=getIndexRoad(roadName,pgAcuTaskList);
+                if(pgAcuTask!=null)
+                    pgAcuTask.setPileAcuList(pgAcuTask.getPileAcuList()+","+acu);
+            }
+        }
+
+        return pgAcuTaskList;
+    }
+
+    private boolean containRoad(String roadName,List<PgAcuTask> pgAcuTaskList){
+        if(pgAcuTaskList==null||pgAcuTaskList.size()==0) return false;
+        for(PgAcuTask pgAcuTask:pgAcuTaskList){
+            if(pgAcuTask.getRoadName().equals(roadName))
+                return true;
+        }
+
+        return false;
+    }
+
+    private PgAcuTask getIndexRoad(String roadName, List<PgAcuTask> pgAcuTaskList){
+        for(PgAcuTask pgAcuTask:pgAcuTaskList){
+            if(pgAcuTask.getRoadName().equals(roadName))
+                return pgAcuTask;
+        }
+
+        return null;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java
new file mode 100644
index 0000000..323f7ef
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java
@@ -0,0 +1,25 @@
+package com.casic.PgInterface.reservePlan.dto;
+
+import java.util.List;
+
+public class PgAcuTask {
+
+    private String roadName;//道路
+    private String pileAcuList;//acu分区
+
+    public String getRoadName() {
+        return roadName;
+    }
+
+    public void setRoadName(String roadName) {
+        this.roadName = roadName;
+    }
+
+    public String getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(String pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
index c25e926..c7d7693 100644
--- a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
@@ -70,9 +70,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(Long.valueOf(inPgPersonId));
         PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("hostName",pgInPgPerson.getAssetCode());
-//        PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode());
-//        long maxId = pgTagPositionManager.getMaxId(pgTagMac.getTagMac());
-//        PGTagPosition pgTagPosition = pgTagPositionManager.get(maxId);
+
         PGTagPosition pgTagPosition = tagmacRun.GetTagStatus(pgTagMac);
         boolean bExist = false;
         bExist = pgTagPositionManager.findTagPosition(pgTagPosition.getPositionUpdatetime(),pgTagPosition.getHostId());
@@ -104,8 +102,7 @@
         PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(Long.valueOf(inPgPersonId));
         PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pgInPgPersonId",pgInPgPerson);
         System.out.println("time:"+pgInPgStatus.getInTime());
-//        PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pgInPgPersonId",inPgPersonId);
-//        PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode());
+
         PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("hostName",pgInPgPerson.getAssetCode());
 
         Map<Object,Object> mapPosition = new HashMap<>();
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
index 082ba5d..3eed00a 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
@@ -48,6 +48,7 @@
     public Map<String, Object> linkDevice(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         PgDeviceDto pgDeviceDto = null;
         try {
@@ -62,6 +63,7 @@
                     else {
                         pgDeviceDto = new PgDeviceDto(pgDevice);
                         msg = "报警关联设备获取成功";
+                        code="200";
                     }
                 }
             }
@@ -71,6 +73,7 @@
             e.printStackTrace();
             msg = "获取关联设备失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceDto);
 
@@ -86,6 +89,7 @@
     public Map<String, Object> linkPartitionCamera(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
         try {
@@ -106,6 +110,7 @@
 
                         pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(partition,position);
                         msg = "关联设备获取成功";
+                        code="200";
                     }
                 }
             }
@@ -115,6 +120,7 @@
             e.printStackTrace();
             msg = "分区设备关联失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceDtoList);
         return resultMap;
@@ -129,6 +135,7 @@
     public Map<String, Object> linkReservePlan(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgReservePlanDto> pgReservePlanDtoList=new ArrayList<>();
         try{
@@ -139,10 +146,12 @@
                 else {
                     pgReservePlanDtoList = pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
 
-                    if(pgReservePlanDtoList==null||pgReservePlanDtoList.size()==0)
-                        msg="不存在关联的报警预案";
-                    else
+                    if (pgReservePlanDtoList == null || pgReservePlanDtoList.size() == 0)
+                        msg = "不存在关联的报警预案";
+                    else {
                         msg = "关联预案获取成功";
+                        code="200";
+                    }
                 }
             }
             else
@@ -153,6 +162,7 @@
             e.printStackTrace();
             msg="预案关联失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgReservePlanDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
index 0ddbc4d..0ce886b 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
@@ -41,25 +41,19 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getAlarmList(@FormParam("alarmType") String alarmType,
                                             @FormParam("startDay") String startDay,
+                                            @FormParam("partition") String partition,
                                             @FormParam("endDay") String endDay,
                                             @FormParam("isNew") String isNew,
                                             @FormParam("page") int page,
                                             @FormParam("rows") int rows) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
         try {
-            pgAlarmDtoList = pgAlarmManager.getAllAlarm(alarmType,startDay,endDay,isNew,page,rows);
-            if (pgAlarmDtoList==null||pgAlarmDtoList.size() == 0)
-                msg = "没有报警信息";
-            else
-                msg = "报警信息获取成功";
+            resultMap = pgAlarmManager.getAllAlarm(alarmType,partition,startDay,endDay,isNew,page,rows);
+
         } catch (Exception e) {
             e.printStackTrace();
-            msg = "报警信息获取失败";
         }
-        resultMap.put("msg", msg);
-        resultMap.put("result", pgAlarmDtoList);
         return resultMap;
     }
 
@@ -71,9 +65,10 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> clearAlarmList(@FormParam("id") String id) throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        String result = "false";
+        String result = "";
+        String code="0";
 
         try {
             PgAlarm pgAlarm = new PgAlarm();
@@ -86,12 +81,14 @@
                 pgAlarmManager.save(pgAlarm);
                 msg = "报警信息清除成功";
                 result = "true";
+                code = "200";
             }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警信息清除失败";
             result = "false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
@@ -106,21 +103,26 @@
     public Map<String, Object> getAlarmByTypeOrTime(@FormParam("alarmType") String alarmType,
                                                     @FormParam("startTime") String startTime,
                                                     @FormParam("endTime") String endTime) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
-        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<PgAlarmDto>();
+        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
         try {
             pgAlarmDtoList = pgAlarmManager.getAlarmByTypeAndTime(alarmType, startTime, endTime);
             if (pgAlarmDtoList == null || pgAlarmDtoList.size() == 0)
                 msg = "报警信息不存在";
             else
+            {
                 msg = "报警信息获取成功";
+                code="200";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警信息获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
index 29ce8a4..ed0bf34 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
@@ -39,8 +39,8 @@
     public Map<String, Object> getAlarmRule(@FormParam("devType") String devType) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
-        System.out.println("devType:"+devType);
         List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<>();
         try {
             pgAlarmRuleDtoList = pgAlarmRuleManager.getAlarmRuleDto(devType);
@@ -52,6 +52,7 @@
             e.printStackTrace();
             msg = "报警阈值信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmRuleDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
index 24ab894..abef1b1 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
@@ -39,16 +39,21 @@
                                                      @FormParam("endDate") String endDate)throws Exception{
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
+
         List<PgAlarmTjDto> pgAlarmTjDtoList=null;
         try{
             pgAlarmTjDtoList=pgAlarmTjManager.getAlarmTjResultByType(startDate,endDate);
             msg="获取成功";
+            code="200";
         }
         catch(Exception ex) {
             msg = "统计失败";
         }
-        resultMap.put("result",pgAlarmTjDtoList);
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
+        resultMap.put("result",pgAlarmTjDtoList);
+
         return resultMap;
     }
 
@@ -61,23 +66,27 @@
     public Map<String, Object> getAlarmByTime(@FormParam("startTime") String startTime,
                                               @FormParam("endTime") String endTime,
                                               @FormParam("statisticType") String statisticType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code = "0";
 
-        List<PgAlarmTjDto> pgAlarmTjDtoList = new ArrayList<PgAlarmTjDto>();
+        List<PgAlarmTjDto> pgAlarmTjDtoList = new ArrayList<>();
         try {
             pgAlarmTjDtoList = pgAlarmTjManager.getAlarmByTime(startTime, endTime, statisticType);
             if(pgAlarmTjDtoList==null)
                 msg="报警统计信息获取失败";
-            else
-                msg="报警统计信息获取成功";
+            else {
+                msg = "报警统计信息获取成功";
+                code="200";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警统计信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmTjDtoList);
         return resultMap;
     }
 
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
index 28bc811..b6278a9 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
@@ -30,7 +30,6 @@
     @Resource
     private PgAlarmTypeManager pgAlarmTypeManager;
 
-
     /**
      * 获取报警类型
      */
@@ -38,19 +37,24 @@
     @Path("getAlarmType")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getAlarmTypeList()throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
-        List<PgAlarmTypeDto> pgAlarmTypeDtoList=new ArrayList<PgAlarmTypeDto>();
+        String code="";
+
+        List<PgAlarmTypeDto> pgAlarmTypeDtoList=new ArrayList<>();
         try {
             pgAlarmTypeDtoList = pgAlarmTypeManager.getAllAlarmTypeDto();
             if(pgAlarmTypeDtoList.size()==0)
                 msg="没有报警类型信息";
-            else
-                msg="报警类型信息获取成功";
+            else {
+                code="200";
+                msg = "报警类型信息获取成功";
+            }
         }catch(Exception e){
             e.printStackTrace();
             msg="报警类型信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAlarmTypeDtoList);
         return resultMap;
@@ -66,6 +70,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
@@ -83,6 +88,7 @@
                 logger.info("成功保存");
                 result = "true";
                 msg = "保存成功";
+                code="200";
             }
         } catch (Exception e) {
             result = "false";
@@ -90,6 +96,7 @@
             e.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -106,6 +113,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try{
             if(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
@@ -119,6 +127,7 @@
                 pgAlarmTypeManager.save(pgAlarmType);
                 result = "true";
                 msg = "编辑成功";
+                code="200";
             }
         }
         catch(Exception e)
@@ -128,6 +137,7 @@
             e.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("result",result);
         resultMap.put("msg",msg);
 
@@ -146,6 +156,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
         String result="false";
+        String code="0";
 
         try {
             PgAlarmType pgAlarmType=pgAlarmTypeManager.get(Long.valueOf(id));
@@ -157,6 +168,7 @@
             {
                 pgAlarmType.setActive(0);
                 pgAlarmTypeManager.save(pgAlarmType);
+                code="200";
                 msg="报警类型删除成功";
                 result="true";
             }
@@ -165,6 +177,7 @@
             msg="报警类型删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
index 4533e1a..85940bb 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
@@ -33,12 +33,15 @@
                                                  @FormParam("inSpectionPlace") String inSpectionPlace){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
         List<PgAssetPlanDto> pgAssetPlanDtoList=new ArrayList<>();
         try{
             pgAssetPlanDtoList=pgAssetPlanManager.getPgAssetPlanDtoList(startDay,endDay,inSpectionPlace);
-            if(pgAssetPlanDtoList!=null&&pgAssetPlanDtoList.size()!=0)
-                msg="巡检信息获取成功";
+            if(pgAssetPlanDtoList!=null&&pgAssetPlanDtoList.size()!=0) {
+                code="200";
+                msg = "巡检信息获取成功";
+            }
             else
                 msg="不存在巡检信息";
         }
@@ -47,6 +50,7 @@
             msg="巡检信息获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAssetPlanDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
index 47ef9d1..5cbdfcb 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
@@ -30,12 +30,15 @@
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
         String result="";
+        String code="0";
 
         List<PgAssetPlanStatic> pgAssetPlanStaticList = null;
         try{
             pgAssetPlanStaticList=pgAssetPlanManager.getPgAssetPlanStaticLisByTime(startTime,endTime,staticType);
-            if(pgAssetPlanStaticList!=null&&pgAssetPlanStaticList.size()!=0)
-                msg="巡检统计信息获取成功";
+            if(pgAssetPlanStaticList!=null&&pgAssetPlanStaticList.size()!=0) {
+                code = "200";
+                msg = "巡检统计信息获取成功";
+            }
             else
                 msg="统计信息获取失败";
         }
@@ -44,6 +47,7 @@
             msg="统计失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAssetPlanStaticList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
index 26f5d6a..503bfe3 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
@@ -40,6 +40,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="";
 
         try{
             PgAuthority pgAuthority=new PgAuthority();
@@ -50,6 +51,7 @@
 
             pgAuthorityManager.save(pgAuthority);
             msg="用户权限保存成功";
+            code="200";
             result="true";
         }
         catch(Exception e) {
@@ -57,6 +59,7 @@
             msg = "新增权限失败";
             result = "false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -65,22 +68,25 @@
 
     /*
        *编辑角权限信息
-        */
+    */
     @POST
     @Path("editAuthority")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> editAuthority(@FormParam("id") String id,
                                        @FormParam("authority") String authority,
                                        @FormParam("concent") String concent) throws Exception{
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
+
         try {
             PgAuthority pgAuthority=pgAuthorityManager.get(Long.valueOf(id));
             pgAuthority.setAuthority(authority);
             pgAuthority.setConcent(concent);
 
             pgAuthorityManager.save(pgAuthority);
+            code="200";
             msg="权限保存成功";
             result="true";
         }
@@ -90,7 +96,7 @@
             msg="权限编辑失败";
             result="false";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -105,9 +111,10 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> deleteAuthority(@FormParam("id") String id)throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
-        String result="false";
+        String result="";
+        String code="0";
 
         try {
             PgAuthority pgAuthority= pgAuthorityManager.get(Long.valueOf(id));
@@ -119,6 +126,7 @@
             {
                 pgAuthority.setActive(0);
                 pgAuthorityManager.save(pgAuthority);
+                code="200";
                 msg="删除权限成功";
                 result="true";
             }
@@ -127,37 +135,40 @@
             msg="删除权限失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
     }
 
     /*
-* 获取权限信息
- */
+    * 获取权限信息
+    */
     @POST
     @Path("getAuthorityList")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> getAuthorityList() {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgAuthorityDto> pgAuthorityDtoList = new ArrayList<PgAuthorityDto>();
         try {
             pgAuthorityDtoList = pgAuthorityManager.getAuthorityList();
             if (pgAuthorityDtoList == null)
                 msg = "不存在权限信息";
-            else
+            else {
+                code = "200";
                 msg = "权限信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "权限信息获取是失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAuthorityDtoList);
         return resultMap;
     }
 
 
-
-
 }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
index a9ef521..a74ecc7 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
@@ -45,6 +45,7 @@
                                                @FormParam("endDate") String endDate)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgHistoryDataDto> pgHistoryDataDtoList=new ArrayList<>();
 
         try {
@@ -55,13 +56,16 @@
                 pgHistoryDataDtoList=pgCh4Manager.getAllCH4Data(pgDevice,startDate,endDate);
                 if(pgHistoryDataDtoList==null)
                     msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+                else {
+                    code = "200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgHistoryDataDtoList);
         return resultMap;
@@ -75,8 +79,9 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getNewestCh4InfoByDev(@FormParam("assetCode") String assetCode)throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
+        String code="0";
         PgCh4Dto pgCh4Dto=new PgCh4Dto(null);
 
         try {
@@ -87,13 +92,17 @@
                 pgCh4Dto=pgCh4Manager.getNewestCH4Data(pgDevice);
                 if(pgCh4Dto==null)
                     msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgCh4Dto);
         return resultMap;
@@ -111,6 +120,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
@@ -127,6 +137,7 @@
                 pgCh4.setPgDeviceId(pgDevice);
 
                 pgCh4Manager.save(pgCh4);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -135,7 +146,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
index a7eac39..dfc8ca5 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
@@ -43,23 +43,27 @@
                                                       @FormParam("endDate") String endDate)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgHistoryDataDto> pgHistoryDataDtoList=new ArrayList<>();
 
         try {
             PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
                 msg="设备不存在";
-            else{
-                pgHistoryDataDtoList=pgCoManager.getAllCoData(pgDevice, startDate, endDate);
-                if(pgHistoryDataDtoList==null)
-                    msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+            else {
+                pgHistoryDataDtoList = pgCoManager.getAllCoData(pgDevice, startDate, endDate);
+                if (pgHistoryDataDtoList == null)
+                    msg = "没有满足要求的数据";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgHistoryDataDtoList);
         return resultMap;
@@ -75,6 +79,7 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         PgCoDto pgCoDto=new PgCoDto(null);
 
         try {
@@ -85,13 +90,16 @@
                 pgCoDto=pgCoManager.getNewestCoData(pgDevice);
                 if(pgCoDto==null)
                     msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgCoDto);
         return resultMap;
@@ -110,6 +118,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         try {
@@ -126,6 +135,7 @@
 
                 pgCoManager.save(pgCo);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
         } catch (Exception e) {
@@ -133,7 +143,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
index b4b826e..9af98a3 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
@@ -60,6 +60,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         try {
 
@@ -80,8 +81,8 @@
                 pgConstruction.setPgConstructionTypeId(pgConstructionType.getId());
                 pgConstruction.setActive(1);
                 pgConstruction.setParName(parName);
-                logger.info("保存成功");
                 pgConstructionManager.save(pgConstruction);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -90,6 +91,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("success", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -116,6 +118,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
@@ -140,6 +143,7 @@
                 pgConstruction.setParName(parName);
 
                 pgConstructionManager.save(pgConstruction);
+                code="200";
                 result = "true";
                 msg = "编辑成功";
             }
@@ -150,7 +154,7 @@
             e.printStackTrace();
 
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -167,6 +171,8 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
+
         try {
             PgConstruction pgConstruction = pgConstructionManager.get(Long.valueOf(id));
             if (pgConstruction == null)
@@ -177,6 +183,7 @@
             {
                 pgConstruction.setActive(0);
                 pgConstructionManager.save(pgConstruction);
+                code="200";
                 result = "true";
                 msg = "成功删除信息";
             }
@@ -185,6 +192,7 @@
             result = "false";
             msg = "删除失败";
         }
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -204,9 +212,11 @@
                                                   @FormParam("rows") int rows)throws Exception{
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
         List<PgConstructionDto> pgConstructionDtoList=new ArrayList<>();
         try{
             pgConstructionDtoList=pgConstructionManager.getPgContructionDto(cs_name,cs_type,startTime,endTime,page,rows);
+            code="200";
             msg="信息获取成功";
         }
         catch(Exception e)
@@ -214,6 +224,7 @@
             e.printStackTrace();
             msg="查询失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
 
@@ -231,18 +242,22 @@
                                                               @FormParam("statisticType") String statisticType) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgConstructionStiatistic> pgConstructionStiatisticList=new ArrayList<>();
         try {
             pgConstructionStiatisticList = pgConstructionManager.getConstructionByTimeAndStatus(startTime, endTime, statisticType);
             if(pgConstructionStiatisticList==null)
                 msg="施工统计信息获取失败";
-            else
-                msg="施工统计信息获取成功";
+            else {
+                code="200";
+                msg = "施工统计信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "施工统计信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgConstructionStiatisticList);
         return resultMap;
@@ -257,6 +272,7 @@
     public Map<String, Object> getConstructionByType(@FormParam("statisticType") String statisticType){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
         List<PgConstructionStiatistic> pgConstructionStiatisticList=new ArrayList<>();
 
         try{
@@ -268,6 +284,7 @@
                 resultMap.put("result",null);
             }
             else {
+                code="200";
                 msg = "统计信息获取成功";
                 resultMap.put("result", pgConstructionStiatisticList);
             }
@@ -278,6 +295,7 @@
             msg="统计失败";
             resultMap.put("result",null);
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         return resultMap;
     }
@@ -291,9 +309,11 @@
     public Map<String, Object> getConstructionToday() throws Exception{
         Map<String,Object> resultMap=new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgConstructionDto> pgConstructionDtoList=new ArrayList<PgConstructionDto>();
         try {
             pgConstructionDtoList = pgConstructionManager.getConstructionToday();
+            code="200";
             msg = "当天施工信息获取成功";
         }
         catch(Exception e)
@@ -301,7 +321,7 @@
             e.printStackTrace();
             msg="获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
         return resultMap;
@@ -316,6 +336,7 @@
     public Map<String, Object> getConstructionDev(@FormParam("id") String id) throws Exception{
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
         List<PgDeviceDto> pgDeviceDtoList =new ArrayList<>();
         try{
@@ -325,14 +346,17 @@
 
             if(pgDeviceDtoList==null)
                 msg="信息获取失败";
-            else
-                msg="信息获取成功";
+            else {
+                code="200";
+                msg = "信息获取成功";
+            }
         }
         catch(Exception e)
         {
             e.printStackTrace();
-            msg="设备信息获取成功";
+            msg="信息获取是被";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgDeviceDtoList);
 
@@ -346,17 +370,21 @@
     @Path("getConstruction")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getConstruction() throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
-        List<PgConstructionDto> pgConstructionDtoList=new ArrayList<PgConstructionDto>();
+        String code="0";
+
+        List<PgConstructionDto> pgConstructionDtoList=new ArrayList<>();
 
         try{
             pgConstructionDtoList=pgConstructionManager.getPgConstructionList();
             if(pgConstructionDtoList==null||pgConstructionDtoList.size()==0)
                 msg="不存在施工记录";
-            else
-                msg="施工信息获取成功";
+            else {
+                code = "200";
+                msg = "施工信息获取成功";
+            }
         }
         catch(Exception e)
         {
@@ -364,6 +392,7 @@
             msg="施工信息获取失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java
index fd3d53e..2019502 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java
@@ -39,12 +39,12 @@
         try {
             pgConstructionTypeDtoList = pgConstructionTypeManager.getAllConstructionTypeDto();
             if (pgConstructionTypeDtoList.size() == 0)
-                msg = "没有项目类型信息";
+                msg = "获取失败";
             else
-                msg = "项目类型获取成功";
+                msg = "获取成功";
         } catch (Exception e) {
             e.printStackTrace();
-            msg = "项目类型信息获取失败";
+            msg = "获取失败";
         }
         resultMap.put("msg", msg);
         resultMap.put("result", pgConstructionTypeDtoList);
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
index 90d001c..037a399 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
@@ -51,6 +51,7 @@
 
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if (StringUtils.isBlank(construct_doc)||StringUtils.isBlank(doc_name))
@@ -65,6 +66,7 @@
             pgCsDocument.setActive(1);
             pgCsDocumentManager.save(pgCsDocument);
 
+            code="200";
             result = "true";
             msg = "保存成功";
 
@@ -74,6 +76,7 @@
             ex.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("success", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -90,6 +93,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             PgCsDocument pgCsDocument = pgCsDocumentManager.get(Long.valueOf(id));
@@ -103,6 +107,7 @@
 
                 pgCsDocumentManager.save(pgCsDocument);
 
+                code="200";
                 result = "true";
                 msg = "编辑成功";
             }
@@ -112,6 +117,7 @@
             msg = "编辑失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -125,9 +131,9 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
         String result="";
+        String code="0";
 
         try{
-
             PgCsDocument pgCsDocument = pgCsDocumentManager.get(Long.valueOf(id));
             if(pgCsDocument==null)
             {
@@ -137,6 +143,7 @@
             else{
                 pgCsDocument.setActive(0);
                 pgCsDocumentManager.save(pgCsDocument);
+                code="200";
                 result="true";
                 msg="删除成功";
             }
@@ -147,7 +154,7 @@
             msg="预案删除失败";
             result="false";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -168,18 +175,21 @@
 
         String msg="";
         String result="";
+        String code="0";
 
         try {
             pgCsDocumentDtoList = pgCsDocumentManager.getAllDocData(cs_name);
-            if (pgCsDocumentDtoList != null)
+            if (pgCsDocumentDtoList != null) {
+                code="200";
                 msg = "获取数据成功";
+            }
             else
                 msg = "没有满足条件的数据";
         }catch (Exception e){
             e.printStackTrace();
             msg = "获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgCsDocumentDtoList);
         return resultMap;
@@ -192,20 +202,22 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
 
         String msg = "";
+        String code="0";
         ResponseEntity<byte[]> path = null;
         try {
             PgCsDocument pgCsDocument = pgCsDocumentManager.get(Long.valueOf(id));
             path = pgCsDocumentManager.downloadFile(pgCsDocument);
             if (path == null)
                 msg = "不存在该文档";
-            else
+            else {
+                code = "200";
                 msg = "下载成功";
-
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "下载失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", path.getBody());
         resultMap.put("msg", msg);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
index 94c5c84..ffc8b95 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
@@ -41,22 +41,24 @@
     public Map<String, Object> getPgDeviceByDevType(@FormParam("devType") String devType) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
         try {
-            pgDeviceDtoList = pgDeviceManager.getDeviceByDevTypee(devType);
+            pgDeviceDtoList = pgDeviceManager.getDeviceByDevType(devType);
             if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0){
                 msg="不存在满足要求的数据";
-                resultMap.put("result",null);
             }
             else{
-                resultMap.put("result", pgDeviceDtoList);
+                code="200";
                 msg = "获取成功";
             }
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", pgDeviceDtoList);
         return resultMap;
     }
 
@@ -69,25 +71,26 @@
     public Map<String, Object> getPgDeviceByAssetCode(@FormParam("assetCode") String assetCode) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         PgDeviceDto pgDeviceDto=null;
         try {
             PgDevice pgDevice = pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
             {
                 msg="不存在设备信息";
-                resultMap.put("result",null);
             }
             else {
                 pgDeviceDto = new PgDeviceDto(pgDevice);
                 msg = "获取成功";
-                resultMap.put("result", pgDeviceDto);
+                code="200";
             }
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", pgDeviceDto);
         return resultMap;
     }
 
@@ -102,27 +105,61 @@
                                              @FormParam("devType") String devType)throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
         try {
             pgDeviceDtoList = pgDeviceManager.getAllDevice(road,partition,devType);
             if(pgDeviceDtoList.size()==0) {
                 msg = "没有找到设备信息";
-                resultMap.put("result",null);
             }
             else {
                 msg = "设备信息获取成功";
-                resultMap.put("result", pgDeviceDtoList);
+                code="200";
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result", pgDeviceDtoList);
         return resultMap;
     }
 
     /**
+     * 显示设备列表
+     */
+    @POST
+    @Path("getPgDev")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String, Object> getPgDev(@FormParam("road") String road,
+                                             @FormParam("partition") String partition,
+                                             @FormParam("devType") String devType)throws Exception {
+        Map<String, Object> resultMap = new HashMap<>();
+        String msg="";
+        String code="0";
+        List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
+        try {
+            pgDeviceDtoList = pgDeviceManager.getAllDev(road,partition,devType);
+            if(pgDeviceDtoList.size()==0) {
+                msg = "没有找到设备信息";
+            }
+            else {
+                code="200";
+                msg = "设备信息获取成功";
+            }
+        }catch(Exception e){
+            e.printStackTrace();
+            msg="设备信息获取失败";
+        }
+        resultMap.put("code",code);
+        resultMap.put("msg",msg);
+        resultMap.put("result", pgDeviceDtoList);
+        return resultMap;
+    }
+
+
+    /**
      * 新增设备
      */
     @POST
@@ -145,6 +182,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if (pgDeviceManager.getDeviceByAssetCode(assetCode)!=null) {
@@ -169,6 +207,7 @@
 
                 pgDeviceManager.save(pgDevice);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
 
@@ -177,10 +216,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -208,14 +246,9 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
-            /*
-            if (pgDeviceManager.getDeviceByAssetCode(assetCode)!=null) {
-                result = "false";
-                msg = "已存在同名设备";
-            } else {
-            */
             PgDevice pgDevice = pgDeviceManager.get(Long.valueOf(id));
             pgDevice.setPipeGallery(pipeGallery);
             pgDevice.setPartition(partition);
@@ -233,14 +266,14 @@
 
             pgDeviceManager.save(pgDevice);
             result = "true";
+            code="200";
             msg = "编辑成功";
-            //}
         } catch (Exception e) {
             result = "false";
             msg = "编辑失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("result",result);
         resultMap.put("msg",msg);
         return resultMap;
@@ -256,7 +289,8 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
-        String result="false";
+        String result="";
+        String code="0";
 
         try {
             PgDevice pgDevice=pgDeviceManager.get(Long.valueOf(id));
@@ -268,6 +302,7 @@
             {
                 pgDevice.setActive(0);
                 pgDeviceManager.save(pgDevice);
+                code="200";
                 msg="设备删除成功";
                 result="true";
             }
@@ -276,6 +311,7 @@
             msg="设备删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -291,18 +327,18 @@
     {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         PgDeviceDto pgDeviceDto=null;
 
         try{
             PgDevice pgDevice=pgDeviceManager.getDeviceBydevCode(devCode);
             if(pgDevice==null) {
                 msg = "设备信息获取失败";
-                resultMap.put("result",null);
             }
             else{
                 pgDeviceDto = new PgDeviceDto(pgDevice);
                 msg = "设备信息获取成功";
-                resultMap.put("result",pgDeviceDto);
+                code="200";
             }
         }
         catch(Exception ex)
@@ -310,8 +346,9 @@
             ex.printStackTrace();
             msg="设备状态获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgDeviceDto);
         return resultMap;
     }
 
@@ -324,17 +361,17 @@
     public Map<String,Object> getDeviceByPartition(@FormParam("partition") String partition) throws Exception{
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<PgDeviceDto>();
 
         try{
             pgDeviceDtoList=pgDeviceManager.getPgDeviceDtoListByPartition(partition);
             if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0) {
                 msg = "设备信息获取失败";
-                resultMap.put("result",null);
             }
             else {
+                code="200";
                 msg = "设备信息获取成功";
-                resultMap.put("result",pgDeviceDtoList);
             }
         }
         catch(Exception e)
@@ -342,8 +379,9 @@
             e.printStackTrace();
             msg="设备信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgDeviceDtoList);
         return resultMap;
     }
 
@@ -353,17 +391,16 @@
     public Map<String,Object> getDeviceByOldDAssetCodeCode(@FormParam("assetCode") String assetCode) throws Exception{
         Map<String, Object> resultMap = new HashMap<>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
 
         try{
             pgDeviceDtoList=pgDeviceManager.getDeviceByOldDAssetCodeCode(assetCode);
-            if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0) {
-                msg = "设备信息获取失败";;
-                resultMap.put("result",null);
-            }
+            if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0)
+                msg = "设备信息获取失败";
             else {
                 msg = "设备信息获取成功";
-                resultMap.put("result",pgDeviceDtoList);
+                code="200";
             }
         }
         catch(Exception e)
@@ -372,8 +409,9 @@
             msg="设备信息获取失败";
             resultMap.put("result",null);
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgDeviceDtoList);
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java
index 421d249..f6f167d 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java
@@ -38,17 +38,21 @@
     public Map<String, Object> getDeviceTpeyList()throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgDeviceTypeDto> pgDeviceTypeDtoList=new ArrayList<PgDeviceTypeDto>();
         try {
             pgDeviceTypeDtoList = pgDeviceTypeManager.getAllDeviceType();
             if(pgDeviceTypeDtoList.size()==0)
                 msg="没有找到设备类型信息";
-            else
-                msg="设备类型信息获取成功";
+            else {
+                code="200";
+                msg = "设备类型信息获取成功";
+            }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备类型信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgDeviceTypeDtoList);
         return resultMap;
@@ -66,6 +70,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if (pgDeviceTypeManager.getDeviceTypeByDeType(devType)!=null) {
@@ -79,6 +84,7 @@
 
                 pgDeviceTypeManager.save(pgDeviceType);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
 
@@ -87,10 +93,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
index c276fb3..c789960 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
@@ -44,6 +44,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 
         try {
@@ -62,6 +63,7 @@
                 pgEquipment.setActive(1);
 
                 pgEquipmentManager.save(pgEquipment);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -70,9 +72,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -89,9 +91,10 @@
                                             @FormParam("ownerUnit") String ownerUnit,
                                             @FormParam("enterDate") String enterDate,
                                             @FormParam("curUser") String curUser) {
-        HashMap<String, Object> resultMap = new HashMap<String, Object>();
+        HashMap<String, Object> resultMap = new HashMap<>();
         String msg = "";
         String result = "";
+        String code="0";
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 
         try {
@@ -111,6 +114,7 @@
                 pgEquipment.setEnterDate(sdf.parse(enterDate));
 
                 pgEquipmentManager.save(pgEquipment);
+                code="200";
                 msg="编辑成功";
                 result="true";
             }
@@ -119,9 +123,9 @@
             result = "false";
             msg = "编辑失败";
         }
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -134,16 +138,19 @@
     public Map<String, Object> getEquipment(@FormParam("eqName") String eqName,
                                             @FormParam("eqCode") String eqCode,
                                             @FormParam("eqType") String eqType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        List<PgEquipmentDto> pgEquipmentDtoList=new ArrayList<PgEquipmentDto>();
+        String code="0";
+        List<PgEquipmentDto> pgEquipmentDtoList=new ArrayList<>();
 
         try{
             pgEquipmentDtoList=pgEquipmentManager.getEquipmentDtiList(eqName,eqCode,eqType);
             if(pgEquipmentDtoList==null||pgEquipmentDtoList.size()==0)
                 msg="不存在工器具记录";
-            else
-                msg="维获取成功";
+            else {
+                code = "200";
+                msg = "维获取成功";
+            }
         }
         catch(Exception e)
         {
@@ -166,6 +173,7 @@
         HashMap<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
         String result = "";
+        String code="";
 
         try {
             PgEquipment pgEquipment=pgEquipmentManager.get(Long.valueOf(id));
@@ -178,6 +186,7 @@
             {
                 pgEquipment.setActive(0);
                 pgEquipmentManager.save(pgEquipment);
+                code="200";
                 msg="删除成功";
                 result="true";
             }
@@ -186,6 +195,7 @@
             msg="设备信息获取失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -201,16 +211,19 @@
             throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=new ArrayList<PgDeviceTypeStatisticDto>();
 
         try {
             pgDeviceTypeStatisticDtoList=pgEquipmentManager.getDeviceStatisticByDevType(eqType);
 
+            code="200";
             msg = "获取成功";
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceTypeStatisticDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
index 05a9709..a90fd6c 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
@@ -4,9 +4,9 @@
 import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
 import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
 import com.casic.PgInterface.intelPlan.manager.PgPileAcuManager;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import com.casic.PgInterface.test.PlanData;
 import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.ModelAttribute;
 
 import javax.annotation.Resource;
 import javax.ws.rs.FormParam;
@@ -32,23 +32,25 @@
     public Map<String,Object> getPlanResult(@FormParam("planParamStr") String planParamStr){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
-        //List<PgPlanTask> pgPlanTaskList=pgPlanParams.getPgPlanTaskList();
         List<PgPlanTask> pgPlanTaskList=new PgPlanParams().getPgPlanParamsByString(planParamStr);
         List<PgPlanResultRe> pgPlanResultReList=new ArrayList<>();
 
-        try{
-                pgPlanResultReList=pgPileAcuManager.getPgPlanResultList(pgPlanTaskList);
-                if(pgPlanResultReList==null)
-                    msg="管线智能规划出错";
-                else
-                    msg="管线智能规划完成";
+        try {
+            pgPlanResultReList = pgPileAcuManager.getPgPlanResultList(pgPlanTaskList);
+            if (pgPlanResultReList == null)
+                msg = "管线智能规划出错";
+            else {
+                code="200";
+                msg = "管线智能规划完成";
+            }
         }
         catch(Exception ex){
             msg="智能规划出错";
             ex.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgPlanResultReList);
 
@@ -80,4 +82,30 @@
         return resultMap;
     }
 
+    @POST
+    @Path("getPlanTask")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getACUTask(@FormParam("pileAcuList") String pileAcuList){
+
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        String code="0";
+        List<PgAcuTask> pgAcuTaskList=new ArrayList<>();
+
+        try{
+            pgAcuTaskList=pgPileAcuManager.getACUTask(pileAcuList);
+            code="200";
+            msg="任务获取成功";
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            msg="任务获取失败";
+        }
+        resultMap.put("code",code);
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgAcuTaskList);
+
+        return resultMap;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
index ff85c61..66eec76 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
@@ -55,13 +55,13 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         try {
             PgInPgPerson pgInPgPerson = null;//pgInPgPersonManager.getPersonByUserName(userName);
             int iHostName = pgTagMacManager.getCount("select count(1) from PGTagMac where hostname = ?",assetCode);
-//            int iTagMac = pgTagMacManager.getCount("select count(1) from PGTagMac where tagmac = ?",assetCode.toUpperCase());
             if (0==iHostName)
             {
                 result = "false";
@@ -92,9 +92,8 @@
 
                 pgInPgStatusManager.save(pgInPgStatus);
 
-//                String syResult=pgInPgPersonManager.synchorizedInPgInfo(assetCode,userCode,userName,personType);
+                code="200";
                 result = "true";
-//                msg = "人员注册保存成功"+syResult;
                 msg = "人员注册保存成功";
             }
             else {
@@ -106,6 +105,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -120,6 +120,7 @@
     public Map<String, Object> getInPgPerson() throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<>();
         try {
@@ -127,11 +128,15 @@
             if (pgInPgInfoDtoList == null || pgInPgInfoDtoList.size() == 0)
                 msg = "没有找到入廊人员信息";
             else
+            {
+                code="200";
                 msg = "入廊人员信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "入廊人员信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
         return resultMap;
@@ -146,18 +151,22 @@
     public Map<String, Object> getInPgPersonInPg() throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
 
-        List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<PgInPgInfoDto>();
+        List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<>();
         try {
             pgInPgInfoDtoList = pgInPgPersonManager.getPgInPersonList(1);
             if (pgInPgInfoDtoList == null || pgInPgInfoDtoList.size() == 0)
                 msg = "没有找到入廊人员信息";
-            else
+            else {
+                code="200";
                 msg = "入廊人员信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "入廊人员信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
         return resultMap;
@@ -172,6 +181,7 @@
     public Map<String, Object> getInPgPersonByName(@FormParam("userName") String userName) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
 
         PgInPgPerson pgInPgPerson = null;
         PgInPgPersonDto pgInPgPersonDto=null;
@@ -184,12 +194,13 @@
                 pgInPgPersonDto=new PgInPgPersonDto(pgInPgPerson);
                 pgInPgPersonDtoList.add(pgInPgPersonDto);
                 msg = "人员信息获取成功";
+                code="200";
             }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "人员信息获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgPersonDtoList);
         return resultMap;
@@ -206,6 +217,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             PgInPgPerson pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName);
@@ -221,6 +233,7 @@
                     pgInPgPersonManager.save(pgInPgPerson);
                     result = "true";
                     msg = "编辑成功";
+                    code="200";
                 }
             }
         } catch (Exception e) {
@@ -228,9 +241,9 @@
             msg = "编辑失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -244,10 +257,12 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         int inPgNum=0;
         String msg = "";
+        String code="0";
 
         try{
             inPgNum=pgInPgStatusManager.getInPgNum();
 
+            code="200";
             msg="人员入廊次数获取成功";
         }
         catch(Exception e)
@@ -255,6 +270,7 @@
             e.printStackTrace();
             msg="人员入廊次数获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",inPgNum);
 
@@ -272,18 +288,22 @@
                                                    @FormParam("statisticType") String statisticType) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
 
         List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<PgInPgInfoDto>();
         try {
             pgInPgInfoDtoList = pgInPgPersonManager.getPgInPersonListByTime(startTime, endTime, statisticType);
             if(pgInPgInfoDtoList==null)
                 msg="入廊人员统计信息获取失败";
-            else
-                msg="入廊人员统计信息获取成功";
+            else {
+                code="200";
+                msg = "入廊人员统计信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "入廊人员统计信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
         return resultMap;
@@ -296,6 +316,7 @@
 
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
 
         try {
@@ -304,8 +325,10 @@
                 pgDeviceDtoList=pgDeviceManager.getPgCameraListByPosition("",apCodeStr);
                 if(pgDeviceDtoList==null)
                     msg="不存在关联摄像机";
-                else
-                    msg="关联摄像机获取成功";
+                else {
+                    code="200";
+                    msg = "关联摄像机获取成功";
+                }
             } else {
                 msg="请输入Ap编号";
             }
@@ -315,6 +338,7 @@
             msg="关联摄像机获取成功";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgDeviceDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java
index 507b3fe..b43f077 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java
@@ -34,6 +34,7 @@
 
         String result="";
         String msg="";
+        String code="";
         try{
             PgInPgStatus pgInPgStatus=new PgInPgStatus();
 
@@ -44,6 +45,7 @@
             pgInPgStatusManager.save(pgInPgStatus);
             msg="入廊时间提交成功";
             result="true";
+            code="200";
         }
         catch (Exception e){
             e.printStackTrace();
@@ -51,6 +53,7 @@
             result="false";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -66,6 +69,7 @@
 
         String result="";
         String msg="";
+        String code="0";
         try{
             PgInPgPerson pgInPgPerson=pgInPgPersonManager.getPgInPgPersonByAssetCode(assetCode);
 
@@ -79,6 +83,7 @@
             pgInPgStatusManager.save(pgInPgStatus);
 
             msg="出廊时间提交成功";
+            code="200";
             result="true";
         }
         catch (Exception e){
@@ -87,6 +92,7 @@
             result="false";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
index 9def330..9c0ba1f 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
@@ -33,17 +33,20 @@
                                             @FormParam("existNum") String existNum) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         String result="";
 
         try {
             pgIntelPlanManager.savePgIntelPlan(parName,lineName,maxNum,existNum);
             msg="规划数据保存成功";
+            code="200";
             result="true";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "规划数据保存失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
@@ -55,15 +58,18 @@
     public Map<String, Object> getIntelLineType() throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgIntelPlanTypeDto> pgIntelPlanTypeDtoList=new ArrayList<>();
         try {
             pgIntelPlanTypeDtoList=pgIntelPlanManager.getIntelPlanType();
+            code="200";
             msg="获取排线类型成功";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "获取排线类型失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgIntelPlanTypeDtoList);
         return resultMap;
@@ -76,6 +82,7 @@
                                             @FormParam("partitionStr") String partitionStr) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgIntelPlanDto> pgIntelPlanDtoList = new ArrayList<>();
 
@@ -83,8 +90,10 @@
             pgIntelPlanDtoList = pgIntelPlanManager.getPgIntelPlanListByPartion(lineName, partitionStr);
             if(pgIntelPlanDtoList==null||pgIntelPlanDtoList.size()==0)
                 msg="请输入正确的规划参数";
-            else
-                msg="规划数据获取成功";
+            else {
+                code="200";
+                msg = "规划数据获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "规划数据获取失败";
@@ -103,10 +112,12 @@
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
         String result="";
+        String code="0";
 
         try {
             boolean bl=pgIntelPlanManager.addLineUse(lineName,partitionStr,num);
             if(bl){
+                code="200";
                 msg="排线入廊成功";
                 result="true";
             }
@@ -119,6 +130,7 @@
             msg = "排线入廊失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
@@ -132,6 +144,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
         String result="";
+        String code="0";
 
         try {
             PgIntelPlan pgIntelPlan=pgIntelPlanManager.getPgIntelPlanByParNameAndLine(lineName,parName);
@@ -140,11 +153,13 @@
             pgIntelPlanManager.save(pgIntelPlan);
             msg="规划数据删除成功";
             result="true";
+            code="200";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "规划数据删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java b/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java
index 378af00..9c39523 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java
@@ -1,5 +1,6 @@
 package com.casic.PgInterface.rs;
 
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
 import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
 import com.casic.PgInterface.intelPlan.dto.PgLineHoleDTO;
 import com.casic.PgInterface.intelPlan.manager.PgLineHoleManager;
@@ -27,6 +28,9 @@
     @Resource
     private PgPileAcuManager pgPileAcuManager;
 
+    @Resource
+    private PgRoadManager pgRoadManager;
+
     @POST
     @Path("getPgLineAcuHole")
     @Produces(MediaType.APPLICATION_JSON)
@@ -34,23 +38,32 @@
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
         String result="";
+        String code="0";
         List<PgLineHoleDTO> pgLineHoleDTOList=new ArrayList<>();
 
         try {
             PgPileAcu pgPileAcu=pgPileAcuManager.getPgPileAcuByCode(acuCode);
             if(pgPileAcu==null){
                 msg="不存在分区";
-            }else{
-                pgLineHoleDTOList=pgLineHoleManager.getCurrentHoleByAcu(pgPileAcu.getId());
-                if(pgLineHoleDTOList!=null&&pgLineHoleDTOList.size()!=0)
-                    msg="获取成功";
-                else
-                    msg="未找到入廊数据";
+            }else {
+                pgLineHoleDTOList = pgLineHoleManager.getCurrentHoleByAcu(pgPileAcu.getId());
+                if (pgLineHoleDTOList != null && pgLineHoleDTOList.size() != 0)
+                {
+                    code="200";
+                    msg = "获取成功";
+                }
+                else {
+                    PgLineHoleDTO pgLineHoleDTO=new PgLineHoleDTO();
+                    pgLineHoleDTO.setRoad(pgRoadManager.get(pgPileAcu.getRoadId()).getRoadName());
+                    pgLineHoleDTOList.add(pgLineHoleDTO);
+                    msg = "未找到入廊数据";
+                }
             }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgLineHoleDTOList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgLogRs.java b/src/main/java/com/casic/PgInterface/rs/PgLogRs.java
index 39cff52..30db63b 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgLogRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgLogRs.java
@@ -45,6 +45,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         PgLog pgLog=new PgLog();
         try {
             PgUser pgUser = new PgUser();
@@ -60,14 +61,15 @@
             pgLogManager.save(pgLog);
             result = "true";
             msg = "保存成功";
-
+            code="200";
         } catch (Exception e) {
             result = "false";
             msg = "保存失败";
             e.printStackTrace();
         }
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -83,17 +85,21 @@
             throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgLogDto> pgLogDtoList = new ArrayList<PgLogDto>();
         try {
             pgLogDtoList = pgLogManager.getAllLogs(userName, startTime, endTime);
             if (pgLogDtoList == null || pgLogDtoList.size() == 0)
                 msg = "没有找到日志信息";
-            else
+            else {
+                code="200";
                 msg = "日志信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "日志信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgLogDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java
index 9fd0a5f..37b72f6 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java
@@ -36,19 +36,23 @@
         Map<String,Object> resultMap=new HashMap<>();
 
         String msg = "";
+        String code="0";
         List<PgMaintainType> pgMaintainTypeList=new ArrayList<>();
         try{
             pgMaintainTypeList=pgMaintainTypeManager.getMaintainType();
             if(pgMaintainTypeList!=null&&pgMaintainTypeList.size()!=0)
                 msg="不存在运维类别";
-            else
-                msg="运维类别获取成功";
+            else {
+                code="200";
+                msg = "运维类别获取成功";
+            }
         }
         catch(Exception ex)
         {
             ex.printStackTrace();
             msg="运维类别获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgMaintainTypeList);
 
@@ -65,10 +69,11 @@
         Map<String,Object> resultMap=new HashMap<>();
 
         String msg = "";
+        String code="0";
         List<PgMaintainTypeDto> pgMaintainTypeDtoList=new ArrayList<PgMaintainTypeDto>();
         try{
             pgMaintainTypeDtoList=pgMaintainTypeManager.getMaintainTypeModel(type);
-
+            code="200";
             msg="维护类型获取成功";
         }
         catch(Exception ex)
@@ -77,9 +82,9 @@
             msg="维护类型获取失败";
         }
 
-        resultMap.put("result",pgMaintainTypeDtoList);
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgMaintainTypeDtoList);
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java
index d735cc9..82ffca4 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java
@@ -33,12 +33,16 @@
                                                  @FormParam("endTime") String endTime){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
         List<PgMaintanceRecordHeadDto> pgMaintanceRecordHeadDtoList=new ArrayList<>();
         try{
             pgMaintanceRecordHeadDtoList=pgMaintanceRecordHeadManager.getPgMaintanceRecordHeadLsit(repairMan,startTime,endTime);
             if(pgMaintanceRecordHeadDtoList!=null&&pgMaintanceRecordHeadDtoList.size()!=0)
+            {
+                code="200";
                 msg="维护信息获取成功";
+            }
             else
                 msg="不存在维护信息";
         }
@@ -47,6 +51,7 @@
             msg="巡检信息获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgMaintanceRecordHeadDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java
index effc9df..9f46fc8 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java
@@ -32,12 +32,16 @@
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
         String result="";
+        String code="0";
 
         List<PgMaintanceRecordHeadStatic> pgMaintanceRecordHeadStaticList=new ArrayList<>();
         try{
             pgMaintanceRecordHeadStaticList=pgMaintanceRecordHeadManager.getPgMaintanceRecordHeadStaticLisByTime(startTime,endTime,staticType);
             if(pgMaintanceRecordHeadStaticList!=null&&pgMaintanceRecordHeadStaticList.size()!=0)
+            {
+                code="200";
                 msg="维护统计信息获取成功";
+            }
             else
                 msg="维护统计失败";
         }
@@ -46,7 +50,7 @@
             ex.printStackTrace();
             msg="统计失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgMaintanceRecordHeadStaticList);
 

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 25ded8a..283d7ab 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,20 +7,56 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" 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/construction/manager/PgCsDocumentManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/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/manager/PgAlarmManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/~$说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/~$说明20191207.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.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$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/接口说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明20191207.docx" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
@@ -51,7 +87,7 @@
         <counts>
           <entry key="class" value="4" />
           <entry key="iml" value="2" />
-          <entry key="java" value="707" />
+          <entry key="java" value="820" />
           <entry key="properties" value="14" />
           <entry key="xml" value="7" />
         </counts>
@@ -60,7 +96,7 @@
         <counts>
           <entry key="CLASS" value="4" />
           <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="707" />
+          <entry key="JAVA" value="820" />
           <entry key="Properties" value="14" />
           <entry key="XML" value="7" />
         </counts>
@@ -68,32 +104,32 @@
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
           <entry key="dummy" value="38" />
-          <entry key="java" value="30161" />
+          <entry key="java" value="40859" />
           <entry key="properties" value="100" />
-          <entry key="txt" value="176" />
+          <entry key="txt" value="186" />
           <entry key="xml" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="30161" />
-          <entry key="PLAIN_TEXT" value="214" />
+          <entry key="JAVA" value="40859" />
+          <entry key="PLAIN_TEXT" value="224" />
           <entry key="Properties" value="100" />
           <entry key="XML" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="48" />
+          <entry key="project.closed" value="51" />
           <entry key="project.open.time.1" value="5" />
           <entry key="project.open.time.12" value="2" />
           <entry key="project.open.time.13" value="1" />
           <entry key="project.open.time.15" value="1" />
           <entry key="project.open.time.16" value="1" />
           <entry key="project.open.time.17" value="1" />
-          <entry key="project.open.time.2" value="1" />
+          <entry key="project.open.time.2" value="2" />
           <entry key="project.open.time.20" value="1" />
-          <entry key="project.open.time.23" value="1" />
+          <entry key="project.open.time.23" value="2" />
           <entry key="project.open.time.24" value="2" />
           <entry key="project.open.time.251" value="1" />
           <entry key="project.open.time.27" value="2" />
@@ -106,8 +142,8 @@
           <entry key="project.open.time.36" value="1" />
           <entry key="project.open.time.37" value="1" />
           <entry key="project.open.time.39" value="2" />
-          <entry key="project.open.time.4" value="2" />
-          <entry key="project.open.time.40" value="1" />
+          <entry key="project.open.time.4" value="3" />
+          <entry key="project.open.time.40" value="2" />
           <entry key="project.open.time.41" value="2" />
           <entry key="project.open.time.42" value="2" />
           <entry key="project.open.time.43" value="2" />
@@ -122,23 +158,25 @@
           <entry key="project.open.time.6" value="3" />
           <entry key="project.open.time.63" value="2" />
           <entry key="project.open.time.64" value="1" />
+          <entry key="project.open.time.66" value="1" />
           <entry key="project.open.time.71" value="2" />
+          <entry key="project.open.time.74" value="1" />
           <entry key="project.open.time.76" value="1" />
           <entry key="project.open.time.8" value="2" />
           <entry key="project.open.time.9" value="1" />
           <entry key="project.open.time.97" value="1" />
-          <entry key="project.opened" value="78" />
+          <entry key="project.opened" value="84" />
         </counts>
       </usages-collector>
     </session>
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+            <state relative-caret-position="396">
+              <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
               <folding>
                 <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
                 <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -147,73 +185,6 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <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="99">
-              <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-              <folding>
-                <element signature="imports" expanded="true" />
-                <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-1170">
-              <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state>
-              <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
-              <folding>
-                <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-                <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="true">
-        <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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-              <folding>
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-                <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>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <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="352">
-              <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -225,18 +196,9 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>inCriteria</find>
-      <find>getPgPlanResulList</find>
-      <find>getPileAcuListByPileAcuStr</find>
-      <find>distinct</find>
-      <find>order</find>
-      <find>canPlanLine</find>
-      <find>isExistLine</find>
-      <find>getPlanResult</find>
       <find>pgPipeLine</find>
       <find>getPipeLineBylineName</find>
       <find>StringU</find>
-      <find>getAllAlarm</find>
       <find>getAlarmList</find>
       <find>getPgInPersonListByDay</find>
       <find>getDayInPgStatistic</find>
@@ -254,7 +216,16 @@
       <find>getPgContructionByNameOrType</find>
       <find>&quot;&quot;,&quot;&quot;,</find>
       <find>getPgContructionDtoByNameOrType</find>
+      <find>addConstruction</find>
+      <find>getPgLineAcuHole</find>
+      <find>getPlanResult</find>
       <find>getConstruction</find>
+      <find>addPipeLine</find>
+      <find>未找到入廊数据</find>
+      <find>getCurrentHoleByAcu</find>
+      <find>getAllAlarm</find>
+      <find>getPgDeviceDtoListByPartition</find>
+      <find>getPgDeviceByDevType</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -263,57 +234,57 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlan.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileHoleManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/planData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/PlanData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
       </list>
     </option>
   </component>
@@ -359,7 +330,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -421,53 +391,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="dto" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="manager" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -479,29 +402,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="rs" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -516,6 +416,7 @@
         </subPane>
       </pane>
       <pane id="Scope" />
+      <pane id="PackagesPane" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -710,7 +611,13 @@
       <workItem from="1574902733573" duration="1829000" />
       <workItem from="1574998240004" duration="7016000" />
       <workItem from="1575247959683" duration="6997000" />
-      <workItem from="1575704345590" duration="40473000" />
+      <workItem from="1575704345590" duration="69381000" />
+      <workItem from="1575869479666" duration="721000" />
+      <workItem from="1575947104878" duration="6101000" />
+      <workItem from="1576128264436" duration="3347000" />
+      <workItem from="1576208571543" duration="22000" />
+      <workItem from="1576227513917" duration="862000" />
+      <workItem from="1576293721220" duration="18246000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -817,11 +724,18 @@
       <option name="project" value="LOCAL" />
       <updated>1575775489149</updated>
     </task>
-    <option name="localTasksCounter" value="16" />
+    <task id="LOCAL-00016" summary="整改施工信息">
+      <created>1575791780774</created>
+      <option name="number" value="00016" />
+      <option name="presentableId" value="LOCAL-00016" />
+      <option name="project" value="LOCAL" />
+      <updated>1575791780774</updated>
+    </task>
+    <option name="localTasksCounter" value="17" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="452131000" />
+    <option name="totallyTimeSpent" value="510338000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -834,9 +748,8 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
-    <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.24205749" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2647504" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -847,7 +760,7 @@
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.3295082" />
       <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.4819672" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.65737706" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.3295082" />
@@ -939,7 +852,8 @@
     <MESSAGE value="重新设计智能规划部分" />
     <MESSAGE value="完成智能规划对接" />
     <MESSAGE value="修改报警统计" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改报警统计" />
+    <MESSAGE value="整改施工信息" />
+    <option name="LAST_COMMIT_MESSAGE" value="整改施工信息" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -951,16 +865,10 @@
           <option name="timeStamp" value="3" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java</url>
-          <line>69</line>
+          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java</url>
+          <line>40</line>
           <properties />
-          <option name="timeStamp" value="21" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java</url>
-          <line>96</line>
-          <properties />
-          <option name="timeStamp" value="38" />
+          <option name="timeStamp" value="122" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
@@ -970,394 +878,452 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <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="2068">
-          <caret line="154" column="35" selection-start-line="154" selection-start-column="35" selection-end-line="154" selection-end-column="35" />
-        </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="3300">
-          <caret line="297" column="22" selection-start-line="297" selection-start-column="22" selection-end-line="297" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/StringUtils.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
-          <caret line="13" column="48" lean-forward="true" selection-start-line="13" selection-start-column="48" selection-end-line="13" selection-end-column="48" />
+          <caret line="11" column="5" selection-start-line="11" selection-start-column="5" selection-end-line="11" selection-end-column="5" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="78" lean-forward="true" selection-start-line="78" selection-end-line="78" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="616">
-          <caret line="41" column="1" selection-start-line="41" selection-start-column="1" selection-end-line="41" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="110">
-          <caret line="12" column="23" selection-start-line="12" selection-start-column="23" selection-end-line="12" selection-end-column="23" />
+        <state relative-caret-position="516">
+          <caret line="114" column="12" selection-start-line="114" selection-start-column="12" selection-end-line="114" selection-end-column="12" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="164">
-          <caret line="56" lean-forward="true" selection-start-line="56" selection-end-line="56" />
+        <state relative-caret-position="418">
+          <caret line="33" column="44" selection-start-line="33" selection-start-column="44" selection-end-line="33" selection-end-column="44" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="258">
-          <caret line="27" column="12" lean-forward="true" selection-start-line="27" selection-start-column="12" selection-end-line="27" selection-end-column="12" />
+        <state relative-caret-position="132">
+          <caret line="11" column="20" lean-forward="true" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="20" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.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="-12">
-          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        <state relative-caret-position="516">
+          <caret line="142" column="54" selection-start-line="142" selection-start-column="54" selection-end-line="142" selection-end-column="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="858">
-          <caret line="55" column="27" lean-forward="true" selection-start-line="55" selection-start-column="27" selection-end-line="55" selection-end-column="27" />
+        <state relative-caret-position="66">
+          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="58">
+          <caret line="18" column="28" selection-start-line="18" selection-start-column="19" selection-end-line="18" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="305">
+          <caret line="24" column="31" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="714">
+          <caret line="58" column="5" lean-forward="true" selection-start-line="58" selection-start-column="5" selection-end-line="58" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="924">
+          <caret line="134" column="92" selection-start-line="134" selection-start-column="92" selection-end-line="134" selection-end-column="92" />
+          <folding>
+            <element signature="method#linkDevice#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkPartitionCamera#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkReservePlan#0;class#PgAlarmLinkRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1066">
+          <caret line="90" lean-forward="true" selection-start-line="90" selection-end-line="90" />
+          <folding>
+            <element signature="method#getTjResultByAlarmType#0;class#PgAlarmTjRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="946">
+          <caret line="148" column="11" lean-forward="true" selection-start-line="148" selection-start-column="11" selection-end-line="148" selection-end-column="11" />
+          <folding>
+            <element signature="method#getAlarmTypeList#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#addAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#editAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#deleteAlarmType#0;class#PgAlarmTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="208">
+          <caret line="46" column="23" lean-forward="true" selection-start-line="46" selection-start-column="23" selection-end-line="46" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="113" column="9" lean-forward="true" selection-start-line="113" selection-start-column="9" selection-end-line="113" selection-end-column="9" />
+          <folding>
+            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
+            <element signature="method#getNewestCh4InfoByDev#0;class#PgCh4Rs#0" />
+            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="145" column="6" lean-forward="true" selection-start-line="145" selection-start-column="6" selection-end-line="145" selection-end-column="6" />
+          <folding>
+            <element signature="method#addAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#editAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#deleteAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#getAuthorityList#0;class#PgAuthorityRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="58" column="1" lean-forward="true" selection-start-line="58" selection-start-column="1" selection-end-line="58" selection-end-column="1" />
+          <folding>
+            <element signature="method#getPgAssetPlanList#0;class#PgAssetPlanRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="370">
+          <caret line="371" column="66" selection-start-line="371" selection-start-column="66" selection-end-line="371" selection-end-column="66" />
+          <folding>
+            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#searchConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionDev#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="139" column="13" lean-forward="true" selection-start-line="139" selection-start-column="13" selection-end-line="139" selection-end-column="13" />
+          <folding>
+            <element signature="method#getCoInfoByDevAndDate#0;class#PgCoRs#0" />
+            <element signature="method#getNewestCoInfoByDev#0;class#PgCoRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="540">
+          <caret line="223" column="5" lean-forward="true" selection-start-line="223" selection-start-column="5" selection-end-line="223" selection-end-column="5" />
+          <folding>
+            <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="682">
+          <caret line="100" lean-forward="true" selection-start-line="100" selection-end-line="100" />
+          <folding>
+            <element signature="method#getDeviceTpeyList#0;class#PgDeviceTypeRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="377">
+          <caret line="225" column="35" selection-start-line="225" selection-start-column="35" selection-end-line="225" selection-end-column="35" />
+          <folding>
+            <element signature="method#addEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#addEquipment#1;class#PgEquipmentRs#0" />
+            <element signature="method#getEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#deleteEquipment#0;class#PgEquipmentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="406">
+          <caret line="109" lean-forward="true" selection-start-line="109" selection-end-line="109" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="154">
+          <caret line="28" column="19" selection-start-line="28" selection-start-column="19" selection-end-line="28" selection-end-column="19" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="748">
-          <caret line="49" column="5" lean-forward="true" selection-start-line="49" selection-start-column="5" selection-end-line="49" selection-end-column="5" />
+        <state relative-caret-position="296">
+          <caret line="161" column="35" selection-start-line="161" selection-start-column="35" selection-end-line="161" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="384">
+          <caret line="99" column="5" lean-forward="true" selection-start-line="99" selection-start-column="5" selection-end-line="99" selection-end-column="5" />
+        </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="362">
+          <caret line="340" column="35" selection-start-line="340" selection-start-column="35" selection-end-line="340" selection-end-column="35" />
+          <folding>
+            <element signature="method#addInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPersonInPg#0;class#PgInPgPersonRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-606">
+          <caret line="76" column="20" lean-forward="true" selection-start-line="76" selection-start-column="20" selection-end-line="76" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="65" column="35" selection-start-line="65" selection-start-column="35" selection-end-line="65" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="101" column="35" selection-start-line="101" selection-start-column="35" selection-end-line="101" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="84" column="35" selection-start-line="84" selection-start-column="35" selection-end-line="84" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="59" lean-forward="true" selection-start-line="59" selection-end-line="59" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="60" column="1" lean-forward="true" selection-start-line="60" selection-start-column="1" selection-end-line="60" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="145" column="35" selection-start-line="145" selection-start-column="35" selection-end-line="145" selection-end-column="35" />
+        </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="274">
+          <caret line="350" column="35" selection-start-line="350" selection-start-column="35" selection-end-line="350" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="121" column="39" selection-start-line="121" selection-start-column="39" selection-end-line="121" selection-end-column="39" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="28" column="8" lean-forward="true" selection-start-line="28" selection-start-column="8" selection-end-line="28" selection-end-column="8" />
+        <state relative-caret-position="340">
+          <caret line="103" selection-start-line="103" selection-end-line="103" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="226" column="35" selection-start-line="226" selection-start-column="35" selection-end-line="226" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="203" column="35" selection-start-line="203" selection-start-column="35" selection-end-line="203" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="241" column="35" selection-start-line="241" selection-start-column="35" selection-end-line="241" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="225" column="1" lean-forward="true" selection-start-line="225" selection-start-column="1" selection-end-line="225" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="176" column="5" lean-forward="true" selection-start-line="176" selection-start-column="5" selection-end-line="176" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="178" column="35" lean-forward="true" selection-start-line="178" selection-start-column="35" selection-end-line="178" selection-end-column="35" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="516">
-          <caret line="94" column="53" selection-start-line="94" selection-start-column="53" selection-end-line="94" selection-end-column="53" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="814">
-          <caret line="52" column="9" lean-forward="true" selection-start-line="52" selection-start-column="9" selection-end-line="52" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="182">
-          <caret line="58" column="12" lean-forward="true" selection-start-line="58" selection-start-column="12" selection-end-line="58" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="34" lean-forward="true" selection-start-line="34" selection-end-line="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="32" lean-forward="true" selection-start-line="32" selection-end-line="32" />
-          <folding>
-            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
-            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="185">
-          <caret line="63" column="13" selection-start-line="63" selection-start-column="13" selection-end-line="63" selection-end-column="13" />
-          <folding>
-            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
-            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
-            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="e#6319#6324#0" />
-            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
-          </folding>
+          <caret line="240" lean-forward="true" selection-start-line="240" selection-end-line="240" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
-          <caret line="58" column="28" lean-forward="true" selection-start-line="58" selection-start-column="28" selection-end-line="58" selection-end-column="28" />
-          <folding>
-            <element signature="method#addTempHumData#0;class#PgTempHumRs#0" />
-          </folding>
+        <state relative-caret-position="340">
+          <caret line="148" column="34" selection-start-line="148" selection-start-column="34" selection-end-line="148" selection-end-column="34" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
+        <state relative-caret-position="458">
+          <caret line="99" column="35" selection-start-line="99" selection-start-column="35" selection-end-line="99" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+        <state relative-caret-position="384">
+          <caret line="145" column="32" lean-forward="true" selection-start-line="145" selection-start-column="32" selection-end-line="145" selection-end-column="32" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="414">
-          <caret line="22" column="46" lean-forward="true" selection-start-line="22" selection-start-column="46" selection-end-line="22" selection-end-column="46" />
-        </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="396">
-          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" column="83" selection-start-line="11" selection-start-column="83" selection-end-line="11" selection-end-column="83" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="26">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
-          <folding>
-            <element signature="method#getPgInPgStatusByPerson#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNumByName#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNum#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPersonListByDay#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPgStatusByPgInPgPerson#0;class#PgInPgStatusManager#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="44">
-          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-12">
-          <caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="87" lean-forward="true" selection-start-line="87" selection-end-line="87" />
-          <folding>
-            <element signature="method#getConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#addConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#deleteConstructionType#0;class#PgConstructionTypeRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
-          <folding>
-            <element signature="method#getConstructionTypeByType#0;class#PgConstructionTypeManager#0" />
-            <element signature="method#getAllConstructionTypeDto#0;class#PgConstructionTypeManager#0" />
-          </folding>
-        </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="145">
-          <caret line="258" column="9" lean-forward="true" selection-start-line="258" selection-start-column="9" selection-end-line="258" selection-end-column="9" />
-          <folding>
-            <element signature="method#getMonthInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayInPgStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgOverViewRs#0" />
-            <element signature="method#getAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getMonthAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayAlarmStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgOverViewRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="103">
-          <caret line="105" column="50" lean-forward="true" selection-start-line="105" selection-start-column="50" selection-end-line="105" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateBasicDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="99">
-          <caret line="125" selection-start-line="125" selection-end-line="125" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="190">
-          <caret line="24" column="35" lean-forward="true" selection-start-line="24" selection-start-column="35" selection-end-line="24" selection-end-column="35" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="436">
-          <caret line="24" lean-forward="true" selection-start-line="24" selection-end-line="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" lean-forward="true" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="300">
-          <caret line="34" column="31" lean-forward="true" selection-start-line="34" selection-start-column="31" selection-end-line="34" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="42" column="13" lean-forward="true" selection-start-line="42" selection-start-column="13" selection-end-line="42" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="120" column="72" lean-forward="true" selection-start-line="120" selection-start-column="72" selection-end-line="120" selection-end-column="72" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="293">
-          <caret line="58" column="73" lean-forward="true" selection-start-line="58" selection-start-column="73" selection-end-line="58" selection-end-column="73" />
-          <folding>
-            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
-            <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
-          </folding>
-        </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="307">
-          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
+        <state relative-caret-position="758">
+          <caret line="130" column="5" lean-forward="true" selection-start-line="130" selection-start-column="5" selection-end-line="130" selection-end-column="5" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1170">
-          <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
+        <state relative-caret-position="494">
+          <caret line="86" column="62" lean-forward="true" selection-start-line="86" selection-start-column="62" selection-end-line="86" selection-end-column="62" />
           <folding>
-            <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-            <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+            <element signature="method#getAllDevice#0;class#PgDeviceManager#0" />
+            <element signature="method#getAllDev#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="195" column="28" lean-forward="true" selection-start-line="195" selection-start-column="28" selection-end-line="195" selection-end-column="28" />
+        <state relative-caret-position="166">
+          <caret line="174" column="13" lean-forward="true" selection-start-line="174" selection-start-column="13" selection-end-line="174" selection-end-column="13" />
           <folding>
-            <element signature="method#getAlarmByTypeAndTime#0;class#PgAlarmManager#0" />
-            <element signature="method#getAlarmNum#0;class#PgAlarmManager#0" />
             <element signature="method#getDayAlarmStatistic#0;class#PgAlarmManager#0" />
+            <element signature="method#getAlarmList#0;class#PgAlarmManager#0" />
             <element signature="method#createDTO#0;class#PgAlarmManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="364">
+          <caret line="46" column="56" lean-forward="true" selection-start-line="46" selection-start-column="56" selection-end-line="46" selection-end-column="56" />
+          <folding>
+            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
+            <element signature="method#getPgDev#0;class#PgDeviceRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
+            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+        <state relative-caret-position="396">
+          <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
           <folding>
             <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
             <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -1365,52 +1331,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="239">
-          <caret line="21" column="33" lean-forward="true" selection-start-line="21" selection-start-column="33" selection-end-line="21" selection-end-column="33" />
-        </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="352">
-          <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-        </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="99">
-          <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-          </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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-          <folding>
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-            <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>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
index c436c93..e913155 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
@@ -132,7 +132,10 @@
             this.setAlarmType("");
         else
             this.setAlarmType(pgAlarm.getAlarmTypeId().getAlarmType());
-        this.setAlarmValue(pgAlarm.getAlarmValue());
+        if(pgAlarm.getAlarmValue()==null)
+            this.setAlarmValue("");
+        else
+            this.setAlarmValue(pgAlarm.getAlarmValue());
         if (pgAlarm.getAlarmDate() != null)
             this.setAlarmDate(sdf.format(pgAlarm.getAlarmDate()));
         else
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
index a43965c..565cb41 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -159,11 +159,21 @@
     }
 
     //获取历史报警消息列表
-    public List<PgAlarmDto> getAllAlarm(String alarmType,String startDay,String endDay,String isNew,int page,int rows) {
-        try {
+    public  Map<String, Object> getAllAlarm(String alarmType,String partition,String startDay,String endDay,String isNew,int page,int rows) {
 
+        Map<String, Object> resultMap = new HashMap<>();
+        String msg="";
+
+        try {
             Criteria criteria = createCriteria(PgAlarm.class);
 
+            if (StringUtils.isNotBlank(partition)) {
+                DetachedCriteria inCriteria = DetachedCriteria.forClass(PgDevice.class);
+                inCriteria.add(Restrictions.eq("partition", partition));
+                inCriteria.setProjection(Property.forName("id"));
+                criteria.add(Property.forName("alarmDevId").in(inCriteria));
+            }
+
             if (StringUtils.isNotBlank(alarmType)&&!alarmType.contains("全部")&&pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
                 criteria.add(Restrictions.eq("alarmTypeId", pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)));
 
@@ -190,8 +200,16 @@
             for (PgAlarm pgAlarm : pgAlarmList) {
                 pgAlarmDtoList.add(new PgAlarmDto(pgAlarm));
             }
-
-            return pgAlarmDtoList;
+            if(pgAlarmDtoList==null||pgAlarmDtoList.size()==0) {
+                resultMap.put("msg", "没有报警信息");
+                resultMap.put("code","0");
+            }else {
+                resultMap.put("code","200");
+                resultMap.put("msg", "报警信息获取成功");
+            }
+            resultMap.put("count",pg.getTotalCount());
+            resultMap.put("result",pgAlarmDtoList);
+            return resultMap;
         }
         catch(Exception ex){
             ex.printStackTrace();
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index 7547560..654f49e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -24,11 +24,11 @@
 
         Criteria criteria = createCriteria(PgDevice.class);
 
-        if(road!=null)
+        if(StringUtils.isNotBlank(road))
             criteria.add(Restrictions.eq("road",road));
-        if(partition!=null)
+        if(StringUtils.isNotBlank(partition))
             criteria.add(Restrictions.eq("partition",partition));
-        if(devType!=null)
+        if(StringUtils.isNotBlank(devType))
             criteria.add(Restrictions.eq("devType",devType));
 
         criteria.add(Restrictions.eq("active", 1));
@@ -43,6 +43,29 @@
         return pgDeviceDtoList;
     }
 
+    public List<PgDeviceDto> getAllDev(String road,String partition,String devType) {
+
+        Criteria criteria = createCriteria(PgDevice.class);
+
+        if(StringUtils.isNotBlank(road))
+            criteria.add(Restrictions.eq("road",road));
+        if(StringUtils.isNotBlank(partition))
+            criteria.add(Restrictions.eq("partition",partition));
+        if(StringUtils.isNotBlank(devType))
+            criteria.add(Restrictions.like("devType","%"+devType+"%"));
+
+        criteria.add(Restrictions.eq("active", 1));
+        criteria.addOrder(Order.desc("id"));
+        List<PgDevice> pgDeviceList = criteria.list();
+
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
+        for (PgDevice pgDevice : pgDeviceList) {
+            pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
+        }
+
+        return pgDeviceDtoList;
+    }
+
     //根据名字获取当前设备
     public PgDevice getDeviceByAssetCode(String assetCode) {
         Criteria criteria=createCriteria(PgDevice.class);
@@ -56,9 +79,9 @@
     }
 
     //根据类型获取设备列表
-    public List<PgDeviceDto> getDeviceByDevTypee(String devType) {
+    public List<PgDeviceDto> getDeviceByDevType(String devType) {
         Criteria criteria=createCriteria(PgDevice.class);
-        criteria.add(Restrictions.eq("devType",devType));
+        criteria.add(Restrictions.like("devType","%"+devType+"%"));
 
         List<PgDevice> pgDeviceList=criteria.list();
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
@@ -106,7 +129,7 @@
         criteria.add(Restrictions.eq("partition",partition));
 
         List<PgDevice> pgDeviceList=criteria.list();
-        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<PgDeviceDto>();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
 
         for (PgDevice pgDevice : pgDeviceList) {
             pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
index 3a3bccd..595730e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
@@ -1,10 +1,13 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.devTable.domain.PgAlarmType;
 import com.casic.PgInterface.devTable.domain.PgPartition;
 import com.casic.PgInterface.devTable.domain.PgRoad;
 import com.casic.PgInterface.devTable.domain.PipeGallery;
 import com.casic.PgInterface.devTable.dto.PgPartitionDto;
+import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
@@ -12,7 +15,9 @@
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Created by yxw on 2017/11/4.
@@ -21,7 +26,8 @@
 public class PgPartitionManager extends HibernateEntityDao<PgPartition> {
 
     @Resource
-    PgRoadManager pgRoadManager;
+    private PgRoadManager pgRoadManager;
+
 
     public PgPartition getPartitionByParName(String parName) {
         Criteria criteria = getSession().createCriteria(PgPartition.class);
@@ -99,4 +105,5 @@
         return pgPartitionDtoList;
     }
 
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
index f216360..a6928f1 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
@@ -5,6 +5,7 @@
 public class PgPlanResultRe {
 
     private String taskKey;
+    private List<String> pileAcuList;
     private List<PgPlanResult> pgPlanResultList;
 
     public String getTaskKey() {
@@ -15,6 +16,14 @@
         this.taskKey = taskKey;
     }
 
+    public List<String> getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(List<String> pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+
     public List<PgPlanResult> getPgPlanResultList() {
         return pgPlanResultList;
     }
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
index 71ea765..47eea07 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
@@ -54,9 +54,7 @@
 
         List<PgLineHole> pgLineHoleList=criteria.list();
         List<PgLineHoleDTO> pgLineHoleDTOList=new ArrayList<>();
-        if(pgLineHoleList==null||pgLineHoleList.size()==0)
-            return null;
-        else
+        if(pgLineHoleList!=null&&pgLineHoleList.size()!=0)
             pgLineHoleDTOList=PgLineHoleDTO.ConvertToDTOList(pgLineHoleList,pgPileAcuManager,pgRoadManager);
         return pgLineHoleDTOList;
     }
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
index 0fd9e1f..841a386 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
@@ -1,12 +1,15 @@
 package com.casic.PgInterface.intelPlan.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.devTable.domain.PgPartition;
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
 import com.casic.PgInterface.intelPlan.domain.PgLineHole;
 import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
 import com.casic.PgInterface.intelPlan.domain.PgSection;
 import com.casic.PgInterface.intelPlan.dto.PgPlanResult;
 import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
 import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -22,6 +25,9 @@
     @Resource
     private PgLineHoleManager pgLineHoleManager;
 
+    @Resource
+    private PgRoadManager pgRoadManager;
+
     public PgPileAcu getPgPileAcuByCode(String acuCode){
         List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
 
@@ -58,7 +64,9 @@
         for(PgPlanTask pgPlanTask:pgPlanTaskList){
             List<PgPlanResult> pgPlanResultList=getPgPlanResultByPlantask(pgPlanTask);
             PgPlanResultRe pgPlanResultRe=new PgPlanResultRe();
+
             pgPlanResultRe.setTaskKey(pgPlanTask.getTaskKey());
+            pgPlanResultRe.setPileAcuList(pgPlanTask.getPileAcuList());
             pgPlanResultRe.setPgPlanResultList(pgPlanResultList);
 
             pgPlanResultReList.add(pgPlanResultRe);
@@ -142,4 +150,57 @@
         return length;
     }
 
+    private PgPileAcu getPgPileAcuByAcuCode(String acuCode){
+        List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
+
+        if(pgPileAcuList==null||pgPileAcuList.size()==0)
+            return null;
+        else
+            return pgPileAcuList.get(0);
+    }
+
+    public List<PgAcuTask> getACUTask(String pileAcuList){
+        String[] acuArray=pileAcuList.split(",");
+        List<PgAcuTask> pgAcuTaskList=new ArrayList<>();
+
+        for(String acu:acuArray){
+            PgPileAcu pgPileAcu=this.getPgPileAcuByCode(acu);
+            String roadName=pgRoadManager.get(pgPileAcu.getRoadId()).getRoadName();
+
+            if(!containRoad(roadName,pgAcuTaskList))
+            {
+                PgAcuTask pgAcuTask=new PgAcuTask();
+                pgAcuTask.setRoadName(roadName);
+                pgAcuTask.setPileAcuList(acu);
+                pgAcuTaskList.add(pgAcuTask);
+            }
+            else{
+                PgAcuTask pgAcuTask=getIndexRoad(roadName,pgAcuTaskList);
+                if(pgAcuTask!=null)
+                    pgAcuTask.setPileAcuList(pgAcuTask.getPileAcuList()+","+acu);
+            }
+        }
+
+        return pgAcuTaskList;
+    }
+
+    private boolean containRoad(String roadName,List<PgAcuTask> pgAcuTaskList){
+        if(pgAcuTaskList==null||pgAcuTaskList.size()==0) return false;
+        for(PgAcuTask pgAcuTask:pgAcuTaskList){
+            if(pgAcuTask.getRoadName().equals(roadName))
+                return true;
+        }
+
+        return false;
+    }
+
+    private PgAcuTask getIndexRoad(String roadName, List<PgAcuTask> pgAcuTaskList){
+        for(PgAcuTask pgAcuTask:pgAcuTaskList){
+            if(pgAcuTask.getRoadName().equals(roadName))
+                return pgAcuTask;
+        }
+
+        return null;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java
new file mode 100644
index 0000000..323f7ef
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java
@@ -0,0 +1,25 @@
+package com.casic.PgInterface.reservePlan.dto;
+
+import java.util.List;
+
+public class PgAcuTask {
+
+    private String roadName;//道路
+    private String pileAcuList;//acu分区
+
+    public String getRoadName() {
+        return roadName;
+    }
+
+    public void setRoadName(String roadName) {
+        this.roadName = roadName;
+    }
+
+    public String getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(String pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
index c25e926..c7d7693 100644
--- a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
@@ -70,9 +70,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(Long.valueOf(inPgPersonId));
         PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("hostName",pgInPgPerson.getAssetCode());
-//        PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode());
-//        long maxId = pgTagPositionManager.getMaxId(pgTagMac.getTagMac());
-//        PGTagPosition pgTagPosition = pgTagPositionManager.get(maxId);
+
         PGTagPosition pgTagPosition = tagmacRun.GetTagStatus(pgTagMac);
         boolean bExist = false;
         bExist = pgTagPositionManager.findTagPosition(pgTagPosition.getPositionUpdatetime(),pgTagPosition.getHostId());
@@ -104,8 +102,7 @@
         PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(Long.valueOf(inPgPersonId));
         PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pgInPgPersonId",pgInPgPerson);
         System.out.println("time:"+pgInPgStatus.getInTime());
-//        PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pgInPgPersonId",inPgPersonId);
-//        PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode());
+
         PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("hostName",pgInPgPerson.getAssetCode());
 
         Map<Object,Object> mapPosition = new HashMap<>();
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
index 082ba5d..3eed00a 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
@@ -48,6 +48,7 @@
     public Map<String, Object> linkDevice(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         PgDeviceDto pgDeviceDto = null;
         try {
@@ -62,6 +63,7 @@
                     else {
                         pgDeviceDto = new PgDeviceDto(pgDevice);
                         msg = "报警关联设备获取成功";
+                        code="200";
                     }
                 }
             }
@@ -71,6 +73,7 @@
             e.printStackTrace();
             msg = "获取关联设备失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceDto);
 
@@ -86,6 +89,7 @@
     public Map<String, Object> linkPartitionCamera(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
         try {
@@ -106,6 +110,7 @@
 
                         pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(partition,position);
                         msg = "关联设备获取成功";
+                        code="200";
                     }
                 }
             }
@@ -115,6 +120,7 @@
             e.printStackTrace();
             msg = "分区设备关联失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceDtoList);
         return resultMap;
@@ -129,6 +135,7 @@
     public Map<String, Object> linkReservePlan(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgReservePlanDto> pgReservePlanDtoList=new ArrayList<>();
         try{
@@ -139,10 +146,12 @@
                 else {
                     pgReservePlanDtoList = pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
 
-                    if(pgReservePlanDtoList==null||pgReservePlanDtoList.size()==0)
-                        msg="不存在关联的报警预案";
-                    else
+                    if (pgReservePlanDtoList == null || pgReservePlanDtoList.size() == 0)
+                        msg = "不存在关联的报警预案";
+                    else {
                         msg = "关联预案获取成功";
+                        code="200";
+                    }
                 }
             }
             else
@@ -153,6 +162,7 @@
             e.printStackTrace();
             msg="预案关联失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgReservePlanDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
index 0ddbc4d..0ce886b 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
@@ -41,25 +41,19 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getAlarmList(@FormParam("alarmType") String alarmType,
                                             @FormParam("startDay") String startDay,
+                                            @FormParam("partition") String partition,
                                             @FormParam("endDay") String endDay,
                                             @FormParam("isNew") String isNew,
                                             @FormParam("page") int page,
                                             @FormParam("rows") int rows) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
         try {
-            pgAlarmDtoList = pgAlarmManager.getAllAlarm(alarmType,startDay,endDay,isNew,page,rows);
-            if (pgAlarmDtoList==null||pgAlarmDtoList.size() == 0)
-                msg = "没有报警信息";
-            else
-                msg = "报警信息获取成功";
+            resultMap = pgAlarmManager.getAllAlarm(alarmType,partition,startDay,endDay,isNew,page,rows);
+
         } catch (Exception e) {
             e.printStackTrace();
-            msg = "报警信息获取失败";
         }
-        resultMap.put("msg", msg);
-        resultMap.put("result", pgAlarmDtoList);
         return resultMap;
     }
 
@@ -71,9 +65,10 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> clearAlarmList(@FormParam("id") String id) throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        String result = "false";
+        String result = "";
+        String code="0";
 
         try {
             PgAlarm pgAlarm = new PgAlarm();
@@ -86,12 +81,14 @@
                 pgAlarmManager.save(pgAlarm);
                 msg = "报警信息清除成功";
                 result = "true";
+                code = "200";
             }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警信息清除失败";
             result = "false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
@@ -106,21 +103,26 @@
     public Map<String, Object> getAlarmByTypeOrTime(@FormParam("alarmType") String alarmType,
                                                     @FormParam("startTime") String startTime,
                                                     @FormParam("endTime") String endTime) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
-        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<PgAlarmDto>();
+        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
         try {
             pgAlarmDtoList = pgAlarmManager.getAlarmByTypeAndTime(alarmType, startTime, endTime);
             if (pgAlarmDtoList == null || pgAlarmDtoList.size() == 0)
                 msg = "报警信息不存在";
             else
+            {
                 msg = "报警信息获取成功";
+                code="200";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警信息获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
index 29ce8a4..ed0bf34 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
@@ -39,8 +39,8 @@
     public Map<String, Object> getAlarmRule(@FormParam("devType") String devType) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
-        System.out.println("devType:"+devType);
         List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<>();
         try {
             pgAlarmRuleDtoList = pgAlarmRuleManager.getAlarmRuleDto(devType);
@@ -52,6 +52,7 @@
             e.printStackTrace();
             msg = "报警阈值信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmRuleDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
index 24ab894..abef1b1 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
@@ -39,16 +39,21 @@
                                                      @FormParam("endDate") String endDate)throws Exception{
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
+
         List<PgAlarmTjDto> pgAlarmTjDtoList=null;
         try{
             pgAlarmTjDtoList=pgAlarmTjManager.getAlarmTjResultByType(startDate,endDate);
             msg="获取成功";
+            code="200";
         }
         catch(Exception ex) {
             msg = "统计失败";
         }
-        resultMap.put("result",pgAlarmTjDtoList);
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
+        resultMap.put("result",pgAlarmTjDtoList);
+
         return resultMap;
     }
 
@@ -61,23 +66,27 @@
     public Map<String, Object> getAlarmByTime(@FormParam("startTime") String startTime,
                                               @FormParam("endTime") String endTime,
                                               @FormParam("statisticType") String statisticType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code = "0";
 
-        List<PgAlarmTjDto> pgAlarmTjDtoList = new ArrayList<PgAlarmTjDto>();
+        List<PgAlarmTjDto> pgAlarmTjDtoList = new ArrayList<>();
         try {
             pgAlarmTjDtoList = pgAlarmTjManager.getAlarmByTime(startTime, endTime, statisticType);
             if(pgAlarmTjDtoList==null)
                 msg="报警统计信息获取失败";
-            else
-                msg="报警统计信息获取成功";
+            else {
+                msg = "报警统计信息获取成功";
+                code="200";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警统计信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmTjDtoList);
         return resultMap;
     }
 
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
index 28bc811..b6278a9 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
@@ -30,7 +30,6 @@
     @Resource
     private PgAlarmTypeManager pgAlarmTypeManager;
 
-
     /**
      * 获取报警类型
      */
@@ -38,19 +37,24 @@
     @Path("getAlarmType")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getAlarmTypeList()throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
-        List<PgAlarmTypeDto> pgAlarmTypeDtoList=new ArrayList<PgAlarmTypeDto>();
+        String code="";
+
+        List<PgAlarmTypeDto> pgAlarmTypeDtoList=new ArrayList<>();
         try {
             pgAlarmTypeDtoList = pgAlarmTypeManager.getAllAlarmTypeDto();
             if(pgAlarmTypeDtoList.size()==0)
                 msg="没有报警类型信息";
-            else
-                msg="报警类型信息获取成功";
+            else {
+                code="200";
+                msg = "报警类型信息获取成功";
+            }
         }catch(Exception e){
             e.printStackTrace();
             msg="报警类型信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAlarmTypeDtoList);
         return resultMap;
@@ -66,6 +70,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
@@ -83,6 +88,7 @@
                 logger.info("成功保存");
                 result = "true";
                 msg = "保存成功";
+                code="200";
             }
         } catch (Exception e) {
             result = "false";
@@ -90,6 +96,7 @@
             e.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -106,6 +113,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try{
             if(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
@@ -119,6 +127,7 @@
                 pgAlarmTypeManager.save(pgAlarmType);
                 result = "true";
                 msg = "编辑成功";
+                code="200";
             }
         }
         catch(Exception e)
@@ -128,6 +137,7 @@
             e.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("result",result);
         resultMap.put("msg",msg);
 
@@ -146,6 +156,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
         String result="false";
+        String code="0";
 
         try {
             PgAlarmType pgAlarmType=pgAlarmTypeManager.get(Long.valueOf(id));
@@ -157,6 +168,7 @@
             {
                 pgAlarmType.setActive(0);
                 pgAlarmTypeManager.save(pgAlarmType);
+                code="200";
                 msg="报警类型删除成功";
                 result="true";
             }
@@ -165,6 +177,7 @@
             msg="报警类型删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
index 4533e1a..85940bb 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
@@ -33,12 +33,15 @@
                                                  @FormParam("inSpectionPlace") String inSpectionPlace){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
         List<PgAssetPlanDto> pgAssetPlanDtoList=new ArrayList<>();
         try{
             pgAssetPlanDtoList=pgAssetPlanManager.getPgAssetPlanDtoList(startDay,endDay,inSpectionPlace);
-            if(pgAssetPlanDtoList!=null&&pgAssetPlanDtoList.size()!=0)
-                msg="巡检信息获取成功";
+            if(pgAssetPlanDtoList!=null&&pgAssetPlanDtoList.size()!=0) {
+                code="200";
+                msg = "巡检信息获取成功";
+            }
             else
                 msg="不存在巡检信息";
         }
@@ -47,6 +50,7 @@
             msg="巡检信息获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAssetPlanDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
index 47ef9d1..5cbdfcb 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
@@ -30,12 +30,15 @@
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
         String result="";
+        String code="0";
 
         List<PgAssetPlanStatic> pgAssetPlanStaticList = null;
         try{
             pgAssetPlanStaticList=pgAssetPlanManager.getPgAssetPlanStaticLisByTime(startTime,endTime,staticType);
-            if(pgAssetPlanStaticList!=null&&pgAssetPlanStaticList.size()!=0)
-                msg="巡检统计信息获取成功";
+            if(pgAssetPlanStaticList!=null&&pgAssetPlanStaticList.size()!=0) {
+                code = "200";
+                msg = "巡检统计信息获取成功";
+            }
             else
                 msg="统计信息获取失败";
         }
@@ -44,6 +47,7 @@
             msg="统计失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAssetPlanStaticList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
index 26f5d6a..503bfe3 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
@@ -40,6 +40,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="";
 
         try{
             PgAuthority pgAuthority=new PgAuthority();
@@ -50,6 +51,7 @@
 
             pgAuthorityManager.save(pgAuthority);
             msg="用户权限保存成功";
+            code="200";
             result="true";
         }
         catch(Exception e) {
@@ -57,6 +59,7 @@
             msg = "新增权限失败";
             result = "false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -65,22 +68,25 @@
 
     /*
        *编辑角权限信息
-        */
+    */
     @POST
     @Path("editAuthority")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> editAuthority(@FormParam("id") String id,
                                        @FormParam("authority") String authority,
                                        @FormParam("concent") String concent) throws Exception{
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
+
         try {
             PgAuthority pgAuthority=pgAuthorityManager.get(Long.valueOf(id));
             pgAuthority.setAuthority(authority);
             pgAuthority.setConcent(concent);
 
             pgAuthorityManager.save(pgAuthority);
+            code="200";
             msg="权限保存成功";
             result="true";
         }
@@ -90,7 +96,7 @@
             msg="权限编辑失败";
             result="false";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -105,9 +111,10 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> deleteAuthority(@FormParam("id") String id)throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
-        String result="false";
+        String result="";
+        String code="0";
 
         try {
             PgAuthority pgAuthority= pgAuthorityManager.get(Long.valueOf(id));
@@ -119,6 +126,7 @@
             {
                 pgAuthority.setActive(0);
                 pgAuthorityManager.save(pgAuthority);
+                code="200";
                 msg="删除权限成功";
                 result="true";
             }
@@ -127,37 +135,40 @@
             msg="删除权限失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
     }
 
     /*
-* 获取权限信息
- */
+    * 获取权限信息
+    */
     @POST
     @Path("getAuthorityList")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> getAuthorityList() {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgAuthorityDto> pgAuthorityDtoList = new ArrayList<PgAuthorityDto>();
         try {
             pgAuthorityDtoList = pgAuthorityManager.getAuthorityList();
             if (pgAuthorityDtoList == null)
                 msg = "不存在权限信息";
-            else
+            else {
+                code = "200";
                 msg = "权限信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "权限信息获取是失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAuthorityDtoList);
         return resultMap;
     }
 
 
-
-
 }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
index a9ef521..a74ecc7 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
@@ -45,6 +45,7 @@
                                                @FormParam("endDate") String endDate)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgHistoryDataDto> pgHistoryDataDtoList=new ArrayList<>();
 
         try {
@@ -55,13 +56,16 @@
                 pgHistoryDataDtoList=pgCh4Manager.getAllCH4Data(pgDevice,startDate,endDate);
                 if(pgHistoryDataDtoList==null)
                     msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+                else {
+                    code = "200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgHistoryDataDtoList);
         return resultMap;
@@ -75,8 +79,9 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getNewestCh4InfoByDev(@FormParam("assetCode") String assetCode)throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
+        String code="0";
         PgCh4Dto pgCh4Dto=new PgCh4Dto(null);
 
         try {
@@ -87,13 +92,17 @@
                 pgCh4Dto=pgCh4Manager.getNewestCH4Data(pgDevice);
                 if(pgCh4Dto==null)
                     msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgCh4Dto);
         return resultMap;
@@ -111,6 +120,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
@@ -127,6 +137,7 @@
                 pgCh4.setPgDeviceId(pgDevice);
 
                 pgCh4Manager.save(pgCh4);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -135,7 +146,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
index a7eac39..dfc8ca5 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
@@ -43,23 +43,27 @@
                                                       @FormParam("endDate") String endDate)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgHistoryDataDto> pgHistoryDataDtoList=new ArrayList<>();
 
         try {
             PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
                 msg="设备不存在";
-            else{
-                pgHistoryDataDtoList=pgCoManager.getAllCoData(pgDevice, startDate, endDate);
-                if(pgHistoryDataDtoList==null)
-                    msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+            else {
+                pgHistoryDataDtoList = pgCoManager.getAllCoData(pgDevice, startDate, endDate);
+                if (pgHistoryDataDtoList == null)
+                    msg = "没有满足要求的数据";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgHistoryDataDtoList);
         return resultMap;
@@ -75,6 +79,7 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         PgCoDto pgCoDto=new PgCoDto(null);
 
         try {
@@ -85,13 +90,16 @@
                 pgCoDto=pgCoManager.getNewestCoData(pgDevice);
                 if(pgCoDto==null)
                     msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgCoDto);
         return resultMap;
@@ -110,6 +118,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         try {
@@ -126,6 +135,7 @@
 
                 pgCoManager.save(pgCo);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
         } catch (Exception e) {
@@ -133,7 +143,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
index b4b826e..9af98a3 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
@@ -60,6 +60,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         try {
 
@@ -80,8 +81,8 @@
                 pgConstruction.setPgConstructionTypeId(pgConstructionType.getId());
                 pgConstruction.setActive(1);
                 pgConstruction.setParName(parName);
-                logger.info("保存成功");
                 pgConstructionManager.save(pgConstruction);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -90,6 +91,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("success", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -116,6 +118,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
@@ -140,6 +143,7 @@
                 pgConstruction.setParName(parName);
 
                 pgConstructionManager.save(pgConstruction);
+                code="200";
                 result = "true";
                 msg = "编辑成功";
             }
@@ -150,7 +154,7 @@
             e.printStackTrace();
 
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -167,6 +171,8 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
+
         try {
             PgConstruction pgConstruction = pgConstructionManager.get(Long.valueOf(id));
             if (pgConstruction == null)
@@ -177,6 +183,7 @@
             {
                 pgConstruction.setActive(0);
                 pgConstructionManager.save(pgConstruction);
+                code="200";
                 result = "true";
                 msg = "成功删除信息";
             }
@@ -185,6 +192,7 @@
             result = "false";
             msg = "删除失败";
         }
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -204,9 +212,11 @@
                                                   @FormParam("rows") int rows)throws Exception{
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
         List<PgConstructionDto> pgConstructionDtoList=new ArrayList<>();
         try{
             pgConstructionDtoList=pgConstructionManager.getPgContructionDto(cs_name,cs_type,startTime,endTime,page,rows);
+            code="200";
             msg="信息获取成功";
         }
         catch(Exception e)
@@ -214,6 +224,7 @@
             e.printStackTrace();
             msg="查询失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
 
@@ -231,18 +242,22 @@
                                                               @FormParam("statisticType") String statisticType) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgConstructionStiatistic> pgConstructionStiatisticList=new ArrayList<>();
         try {
             pgConstructionStiatisticList = pgConstructionManager.getConstructionByTimeAndStatus(startTime, endTime, statisticType);
             if(pgConstructionStiatisticList==null)
                 msg="施工统计信息获取失败";
-            else
-                msg="施工统计信息获取成功";
+            else {
+                code="200";
+                msg = "施工统计信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "施工统计信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgConstructionStiatisticList);
         return resultMap;
@@ -257,6 +272,7 @@
     public Map<String, Object> getConstructionByType(@FormParam("statisticType") String statisticType){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
         List<PgConstructionStiatistic> pgConstructionStiatisticList=new ArrayList<>();
 
         try{
@@ -268,6 +284,7 @@
                 resultMap.put("result",null);
             }
             else {
+                code="200";
                 msg = "统计信息获取成功";
                 resultMap.put("result", pgConstructionStiatisticList);
             }
@@ -278,6 +295,7 @@
             msg="统计失败";
             resultMap.put("result",null);
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         return resultMap;
     }
@@ -291,9 +309,11 @@
     public Map<String, Object> getConstructionToday() throws Exception{
         Map<String,Object> resultMap=new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgConstructionDto> pgConstructionDtoList=new ArrayList<PgConstructionDto>();
         try {
             pgConstructionDtoList = pgConstructionManager.getConstructionToday();
+            code="200";
             msg = "当天施工信息获取成功";
         }
         catch(Exception e)
@@ -301,7 +321,7 @@
             e.printStackTrace();
             msg="获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
         return resultMap;
@@ -316,6 +336,7 @@
     public Map<String, Object> getConstructionDev(@FormParam("id") String id) throws Exception{
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
         List<PgDeviceDto> pgDeviceDtoList =new ArrayList<>();
         try{
@@ -325,14 +346,17 @@
 
             if(pgDeviceDtoList==null)
                 msg="信息获取失败";
-            else
-                msg="信息获取成功";
+            else {
+                code="200";
+                msg = "信息获取成功";
+            }
         }
         catch(Exception e)
         {
             e.printStackTrace();
-            msg="设备信息获取成功";
+            msg="信息获取是被";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgDeviceDtoList);
 
@@ -346,17 +370,21 @@
     @Path("getConstruction")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getConstruction() throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
-        List<PgConstructionDto> pgConstructionDtoList=new ArrayList<PgConstructionDto>();
+        String code="0";
+
+        List<PgConstructionDto> pgConstructionDtoList=new ArrayList<>();
 
         try{
             pgConstructionDtoList=pgConstructionManager.getPgConstructionList();
             if(pgConstructionDtoList==null||pgConstructionDtoList.size()==0)
                 msg="不存在施工记录";
-            else
-                msg="施工信息获取成功";
+            else {
+                code = "200";
+                msg = "施工信息获取成功";
+            }
         }
         catch(Exception e)
         {
@@ -364,6 +392,7 @@
             msg="施工信息获取失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java
index fd3d53e..2019502 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java
@@ -39,12 +39,12 @@
         try {
             pgConstructionTypeDtoList = pgConstructionTypeManager.getAllConstructionTypeDto();
             if (pgConstructionTypeDtoList.size() == 0)
-                msg = "没有项目类型信息";
+                msg = "获取失败";
             else
-                msg = "项目类型获取成功";
+                msg = "获取成功";
         } catch (Exception e) {
             e.printStackTrace();
-            msg = "项目类型信息获取失败";
+            msg = "获取失败";
         }
         resultMap.put("msg", msg);
         resultMap.put("result", pgConstructionTypeDtoList);
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
index 90d001c..037a399 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
@@ -51,6 +51,7 @@
 
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if (StringUtils.isBlank(construct_doc)||StringUtils.isBlank(doc_name))
@@ -65,6 +66,7 @@
             pgCsDocument.setActive(1);
             pgCsDocumentManager.save(pgCsDocument);
 
+            code="200";
             result = "true";
             msg = "保存成功";
 
@@ -74,6 +76,7 @@
             ex.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("success", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -90,6 +93,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             PgCsDocument pgCsDocument = pgCsDocumentManager.get(Long.valueOf(id));
@@ -103,6 +107,7 @@
 
                 pgCsDocumentManager.save(pgCsDocument);
 
+                code="200";
                 result = "true";
                 msg = "编辑成功";
             }
@@ -112,6 +117,7 @@
             msg = "编辑失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -125,9 +131,9 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
         String result="";
+        String code="0";
 
         try{
-
             PgCsDocument pgCsDocument = pgCsDocumentManager.get(Long.valueOf(id));
             if(pgCsDocument==null)
             {
@@ -137,6 +143,7 @@
             else{
                 pgCsDocument.setActive(0);
                 pgCsDocumentManager.save(pgCsDocument);
+                code="200";
                 result="true";
                 msg="删除成功";
             }
@@ -147,7 +154,7 @@
             msg="预案删除失败";
             result="false";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -168,18 +175,21 @@
 
         String msg="";
         String result="";
+        String code="0";
 
         try {
             pgCsDocumentDtoList = pgCsDocumentManager.getAllDocData(cs_name);
-            if (pgCsDocumentDtoList != null)
+            if (pgCsDocumentDtoList != null) {
+                code="200";
                 msg = "获取数据成功";
+            }
             else
                 msg = "没有满足条件的数据";
         }catch (Exception e){
             e.printStackTrace();
             msg = "获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgCsDocumentDtoList);
         return resultMap;
@@ -192,20 +202,22 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
 
         String msg = "";
+        String code="0";
         ResponseEntity<byte[]> path = null;
         try {
             PgCsDocument pgCsDocument = pgCsDocumentManager.get(Long.valueOf(id));
             path = pgCsDocumentManager.downloadFile(pgCsDocument);
             if (path == null)
                 msg = "不存在该文档";
-            else
+            else {
+                code = "200";
                 msg = "下载成功";
-
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "下载失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", path.getBody());
         resultMap.put("msg", msg);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
index 94c5c84..ffc8b95 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
@@ -41,22 +41,24 @@
     public Map<String, Object> getPgDeviceByDevType(@FormParam("devType") String devType) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
         try {
-            pgDeviceDtoList = pgDeviceManager.getDeviceByDevTypee(devType);
+            pgDeviceDtoList = pgDeviceManager.getDeviceByDevType(devType);
             if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0){
                 msg="不存在满足要求的数据";
-                resultMap.put("result",null);
             }
             else{
-                resultMap.put("result", pgDeviceDtoList);
+                code="200";
                 msg = "获取成功";
             }
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", pgDeviceDtoList);
         return resultMap;
     }
 
@@ -69,25 +71,26 @@
     public Map<String, Object> getPgDeviceByAssetCode(@FormParam("assetCode") String assetCode) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         PgDeviceDto pgDeviceDto=null;
         try {
             PgDevice pgDevice = pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
             {
                 msg="不存在设备信息";
-                resultMap.put("result",null);
             }
             else {
                 pgDeviceDto = new PgDeviceDto(pgDevice);
                 msg = "获取成功";
-                resultMap.put("result", pgDeviceDto);
+                code="200";
             }
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", pgDeviceDto);
         return resultMap;
     }
 
@@ -102,27 +105,61 @@
                                              @FormParam("devType") String devType)throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
         try {
             pgDeviceDtoList = pgDeviceManager.getAllDevice(road,partition,devType);
             if(pgDeviceDtoList.size()==0) {
                 msg = "没有找到设备信息";
-                resultMap.put("result",null);
             }
             else {
                 msg = "设备信息获取成功";
-                resultMap.put("result", pgDeviceDtoList);
+                code="200";
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result", pgDeviceDtoList);
         return resultMap;
     }
 
     /**
+     * 显示设备列表
+     */
+    @POST
+    @Path("getPgDev")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String, Object> getPgDev(@FormParam("road") String road,
+                                             @FormParam("partition") String partition,
+                                             @FormParam("devType") String devType)throws Exception {
+        Map<String, Object> resultMap = new HashMap<>();
+        String msg="";
+        String code="0";
+        List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
+        try {
+            pgDeviceDtoList = pgDeviceManager.getAllDev(road,partition,devType);
+            if(pgDeviceDtoList.size()==0) {
+                msg = "没有找到设备信息";
+            }
+            else {
+                code="200";
+                msg = "设备信息获取成功";
+            }
+        }catch(Exception e){
+            e.printStackTrace();
+            msg="设备信息获取失败";
+        }
+        resultMap.put("code",code);
+        resultMap.put("msg",msg);
+        resultMap.put("result", pgDeviceDtoList);
+        return resultMap;
+    }
+
+
+    /**
      * 新增设备
      */
     @POST
@@ -145,6 +182,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if (pgDeviceManager.getDeviceByAssetCode(assetCode)!=null) {
@@ -169,6 +207,7 @@
 
                 pgDeviceManager.save(pgDevice);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
 
@@ -177,10 +216,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -208,14 +246,9 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
-            /*
-            if (pgDeviceManager.getDeviceByAssetCode(assetCode)!=null) {
-                result = "false";
-                msg = "已存在同名设备";
-            } else {
-            */
             PgDevice pgDevice = pgDeviceManager.get(Long.valueOf(id));
             pgDevice.setPipeGallery(pipeGallery);
             pgDevice.setPartition(partition);
@@ -233,14 +266,14 @@
 
             pgDeviceManager.save(pgDevice);
             result = "true";
+            code="200";
             msg = "编辑成功";
-            //}
         } catch (Exception e) {
             result = "false";
             msg = "编辑失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("result",result);
         resultMap.put("msg",msg);
         return resultMap;
@@ -256,7 +289,8 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
-        String result="false";
+        String result="";
+        String code="0";
 
         try {
             PgDevice pgDevice=pgDeviceManager.get(Long.valueOf(id));
@@ -268,6 +302,7 @@
             {
                 pgDevice.setActive(0);
                 pgDeviceManager.save(pgDevice);
+                code="200";
                 msg="设备删除成功";
                 result="true";
             }
@@ -276,6 +311,7 @@
             msg="设备删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -291,18 +327,18 @@
     {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         PgDeviceDto pgDeviceDto=null;
 
         try{
             PgDevice pgDevice=pgDeviceManager.getDeviceBydevCode(devCode);
             if(pgDevice==null) {
                 msg = "设备信息获取失败";
-                resultMap.put("result",null);
             }
             else{
                 pgDeviceDto = new PgDeviceDto(pgDevice);
                 msg = "设备信息获取成功";
-                resultMap.put("result",pgDeviceDto);
+                code="200";
             }
         }
         catch(Exception ex)
@@ -310,8 +346,9 @@
             ex.printStackTrace();
             msg="设备状态获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgDeviceDto);
         return resultMap;
     }
 
@@ -324,17 +361,17 @@
     public Map<String,Object> getDeviceByPartition(@FormParam("partition") String partition) throws Exception{
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<PgDeviceDto>();
 
         try{
             pgDeviceDtoList=pgDeviceManager.getPgDeviceDtoListByPartition(partition);
             if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0) {
                 msg = "设备信息获取失败";
-                resultMap.put("result",null);
             }
             else {
+                code="200";
                 msg = "设备信息获取成功";
-                resultMap.put("result",pgDeviceDtoList);
             }
         }
         catch(Exception e)
@@ -342,8 +379,9 @@
             e.printStackTrace();
             msg="设备信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgDeviceDtoList);
         return resultMap;
     }
 
@@ -353,17 +391,16 @@
     public Map<String,Object> getDeviceByOldDAssetCodeCode(@FormParam("assetCode") String assetCode) throws Exception{
         Map<String, Object> resultMap = new HashMap<>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
 
         try{
             pgDeviceDtoList=pgDeviceManager.getDeviceByOldDAssetCodeCode(assetCode);
-            if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0) {
-                msg = "设备信息获取失败";;
-                resultMap.put("result",null);
-            }
+            if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0)
+                msg = "设备信息获取失败";
             else {
                 msg = "设备信息获取成功";
-                resultMap.put("result",pgDeviceDtoList);
+                code="200";
             }
         }
         catch(Exception e)
@@ -372,8 +409,9 @@
             msg="设备信息获取失败";
             resultMap.put("result",null);
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgDeviceDtoList);
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java
index 421d249..f6f167d 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java
@@ -38,17 +38,21 @@
     public Map<String, Object> getDeviceTpeyList()throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgDeviceTypeDto> pgDeviceTypeDtoList=new ArrayList<PgDeviceTypeDto>();
         try {
             pgDeviceTypeDtoList = pgDeviceTypeManager.getAllDeviceType();
             if(pgDeviceTypeDtoList.size()==0)
                 msg="没有找到设备类型信息";
-            else
-                msg="设备类型信息获取成功";
+            else {
+                code="200";
+                msg = "设备类型信息获取成功";
+            }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备类型信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgDeviceTypeDtoList);
         return resultMap;
@@ -66,6 +70,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if (pgDeviceTypeManager.getDeviceTypeByDeType(devType)!=null) {
@@ -79,6 +84,7 @@
 
                 pgDeviceTypeManager.save(pgDeviceType);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
 
@@ -87,10 +93,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
index c276fb3..c789960 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
@@ -44,6 +44,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 
         try {
@@ -62,6 +63,7 @@
                 pgEquipment.setActive(1);
 
                 pgEquipmentManager.save(pgEquipment);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -70,9 +72,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -89,9 +91,10 @@
                                             @FormParam("ownerUnit") String ownerUnit,
                                             @FormParam("enterDate") String enterDate,
                                             @FormParam("curUser") String curUser) {
-        HashMap<String, Object> resultMap = new HashMap<String, Object>();
+        HashMap<String, Object> resultMap = new HashMap<>();
         String msg = "";
         String result = "";
+        String code="0";
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 
         try {
@@ -111,6 +114,7 @@
                 pgEquipment.setEnterDate(sdf.parse(enterDate));
 
                 pgEquipmentManager.save(pgEquipment);
+                code="200";
                 msg="编辑成功";
                 result="true";
             }
@@ -119,9 +123,9 @@
             result = "false";
             msg = "编辑失败";
         }
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -134,16 +138,19 @@
     public Map<String, Object> getEquipment(@FormParam("eqName") String eqName,
                                             @FormParam("eqCode") String eqCode,
                                             @FormParam("eqType") String eqType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        List<PgEquipmentDto> pgEquipmentDtoList=new ArrayList<PgEquipmentDto>();
+        String code="0";
+        List<PgEquipmentDto> pgEquipmentDtoList=new ArrayList<>();
 
         try{
             pgEquipmentDtoList=pgEquipmentManager.getEquipmentDtiList(eqName,eqCode,eqType);
             if(pgEquipmentDtoList==null||pgEquipmentDtoList.size()==0)
                 msg="不存在工器具记录";
-            else
-                msg="维获取成功";
+            else {
+                code = "200";
+                msg = "维获取成功";
+            }
         }
         catch(Exception e)
         {
@@ -166,6 +173,7 @@
         HashMap<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
         String result = "";
+        String code="";
 
         try {
             PgEquipment pgEquipment=pgEquipmentManager.get(Long.valueOf(id));
@@ -178,6 +186,7 @@
             {
                 pgEquipment.setActive(0);
                 pgEquipmentManager.save(pgEquipment);
+                code="200";
                 msg="删除成功";
                 result="true";
             }
@@ -186,6 +195,7 @@
             msg="设备信息获取失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -201,16 +211,19 @@
             throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=new ArrayList<PgDeviceTypeStatisticDto>();
 
         try {
             pgDeviceTypeStatisticDtoList=pgEquipmentManager.getDeviceStatisticByDevType(eqType);
 
+            code="200";
             msg = "获取成功";
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceTypeStatisticDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
index 05a9709..a90fd6c 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
@@ -4,9 +4,9 @@
 import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
 import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
 import com.casic.PgInterface.intelPlan.manager.PgPileAcuManager;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import com.casic.PgInterface.test.PlanData;
 import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.ModelAttribute;
 
 import javax.annotation.Resource;
 import javax.ws.rs.FormParam;
@@ -32,23 +32,25 @@
     public Map<String,Object> getPlanResult(@FormParam("planParamStr") String planParamStr){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
-        //List<PgPlanTask> pgPlanTaskList=pgPlanParams.getPgPlanTaskList();
         List<PgPlanTask> pgPlanTaskList=new PgPlanParams().getPgPlanParamsByString(planParamStr);
         List<PgPlanResultRe> pgPlanResultReList=new ArrayList<>();
 
-        try{
-                pgPlanResultReList=pgPileAcuManager.getPgPlanResultList(pgPlanTaskList);
-                if(pgPlanResultReList==null)
-                    msg="管线智能规划出错";
-                else
-                    msg="管线智能规划完成";
+        try {
+            pgPlanResultReList = pgPileAcuManager.getPgPlanResultList(pgPlanTaskList);
+            if (pgPlanResultReList == null)
+                msg = "管线智能规划出错";
+            else {
+                code="200";
+                msg = "管线智能规划完成";
+            }
         }
         catch(Exception ex){
             msg="智能规划出错";
             ex.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgPlanResultReList);
 
@@ -80,4 +82,30 @@
         return resultMap;
     }
 
+    @POST
+    @Path("getPlanTask")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getACUTask(@FormParam("pileAcuList") String pileAcuList){
+
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        String code="0";
+        List<PgAcuTask> pgAcuTaskList=new ArrayList<>();
+
+        try{
+            pgAcuTaskList=pgPileAcuManager.getACUTask(pileAcuList);
+            code="200";
+            msg="任务获取成功";
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            msg="任务获取失败";
+        }
+        resultMap.put("code",code);
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgAcuTaskList);
+
+        return resultMap;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
index ff85c61..66eec76 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
@@ -55,13 +55,13 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         try {
             PgInPgPerson pgInPgPerson = null;//pgInPgPersonManager.getPersonByUserName(userName);
             int iHostName = pgTagMacManager.getCount("select count(1) from PGTagMac where hostname = ?",assetCode);
-//            int iTagMac = pgTagMacManager.getCount("select count(1) from PGTagMac where tagmac = ?",assetCode.toUpperCase());
             if (0==iHostName)
             {
                 result = "false";
@@ -92,9 +92,8 @@
 
                 pgInPgStatusManager.save(pgInPgStatus);
 
-//                String syResult=pgInPgPersonManager.synchorizedInPgInfo(assetCode,userCode,userName,personType);
+                code="200";
                 result = "true";
-//                msg = "人员注册保存成功"+syResult;
                 msg = "人员注册保存成功";
             }
             else {
@@ -106,6 +105,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -120,6 +120,7 @@
     public Map<String, Object> getInPgPerson() throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<>();
         try {
@@ -127,11 +128,15 @@
             if (pgInPgInfoDtoList == null || pgInPgInfoDtoList.size() == 0)
                 msg = "没有找到入廊人员信息";
             else
+            {
+                code="200";
                 msg = "入廊人员信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "入廊人员信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
         return resultMap;
@@ -146,18 +151,22 @@
     public Map<String, Object> getInPgPersonInPg() throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
 
-        List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<PgInPgInfoDto>();
+        List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<>();
         try {
             pgInPgInfoDtoList = pgInPgPersonManager.getPgInPersonList(1);
             if (pgInPgInfoDtoList == null || pgInPgInfoDtoList.size() == 0)
                 msg = "没有找到入廊人员信息";
-            else
+            else {
+                code="200";
                 msg = "入廊人员信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "入廊人员信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
         return resultMap;
@@ -172,6 +181,7 @@
     public Map<String, Object> getInPgPersonByName(@FormParam("userName") String userName) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
 
         PgInPgPerson pgInPgPerson = null;
         PgInPgPersonDto pgInPgPersonDto=null;
@@ -184,12 +194,13 @@
                 pgInPgPersonDto=new PgInPgPersonDto(pgInPgPerson);
                 pgInPgPersonDtoList.add(pgInPgPersonDto);
                 msg = "人员信息获取成功";
+                code="200";
             }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "人员信息获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgPersonDtoList);
         return resultMap;
@@ -206,6 +217,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             PgInPgPerson pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName);
@@ -221,6 +233,7 @@
                     pgInPgPersonManager.save(pgInPgPerson);
                     result = "true";
                     msg = "编辑成功";
+                    code="200";
                 }
             }
         } catch (Exception e) {
@@ -228,9 +241,9 @@
             msg = "编辑失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -244,10 +257,12 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         int inPgNum=0;
         String msg = "";
+        String code="0";
 
         try{
             inPgNum=pgInPgStatusManager.getInPgNum();
 
+            code="200";
             msg="人员入廊次数获取成功";
         }
         catch(Exception e)
@@ -255,6 +270,7 @@
             e.printStackTrace();
             msg="人员入廊次数获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",inPgNum);
 
@@ -272,18 +288,22 @@
                                                    @FormParam("statisticType") String statisticType) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
 
         List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<PgInPgInfoDto>();
         try {
             pgInPgInfoDtoList = pgInPgPersonManager.getPgInPersonListByTime(startTime, endTime, statisticType);
             if(pgInPgInfoDtoList==null)
                 msg="入廊人员统计信息获取失败";
-            else
-                msg="入廊人员统计信息获取成功";
+            else {
+                code="200";
+                msg = "入廊人员统计信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "入廊人员统计信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
         return resultMap;
@@ -296,6 +316,7 @@
 
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
 
         try {
@@ -304,8 +325,10 @@
                 pgDeviceDtoList=pgDeviceManager.getPgCameraListByPosition("",apCodeStr);
                 if(pgDeviceDtoList==null)
                     msg="不存在关联摄像机";
-                else
-                    msg="关联摄像机获取成功";
+                else {
+                    code="200";
+                    msg = "关联摄像机获取成功";
+                }
             } else {
                 msg="请输入Ap编号";
             }
@@ -315,6 +338,7 @@
             msg="关联摄像机获取成功";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgDeviceDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java
index 507b3fe..b43f077 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java
@@ -34,6 +34,7 @@
 
         String result="";
         String msg="";
+        String code="";
         try{
             PgInPgStatus pgInPgStatus=new PgInPgStatus();
 
@@ -44,6 +45,7 @@
             pgInPgStatusManager.save(pgInPgStatus);
             msg="入廊时间提交成功";
             result="true";
+            code="200";
         }
         catch (Exception e){
             e.printStackTrace();
@@ -51,6 +53,7 @@
             result="false";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -66,6 +69,7 @@
 
         String result="";
         String msg="";
+        String code="0";
         try{
             PgInPgPerson pgInPgPerson=pgInPgPersonManager.getPgInPgPersonByAssetCode(assetCode);
 
@@ -79,6 +83,7 @@
             pgInPgStatusManager.save(pgInPgStatus);
 
             msg="出廊时间提交成功";
+            code="200";
             result="true";
         }
         catch (Exception e){
@@ -87,6 +92,7 @@
             result="false";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
index 9def330..9c0ba1f 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
@@ -33,17 +33,20 @@
                                             @FormParam("existNum") String existNum) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         String result="";
 
         try {
             pgIntelPlanManager.savePgIntelPlan(parName,lineName,maxNum,existNum);
             msg="规划数据保存成功";
+            code="200";
             result="true";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "规划数据保存失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
@@ -55,15 +58,18 @@
     public Map<String, Object> getIntelLineType() throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgIntelPlanTypeDto> pgIntelPlanTypeDtoList=new ArrayList<>();
         try {
             pgIntelPlanTypeDtoList=pgIntelPlanManager.getIntelPlanType();
+            code="200";
             msg="获取排线类型成功";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "获取排线类型失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgIntelPlanTypeDtoList);
         return resultMap;
@@ -76,6 +82,7 @@
                                             @FormParam("partitionStr") String partitionStr) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgIntelPlanDto> pgIntelPlanDtoList = new ArrayList<>();
 
@@ -83,8 +90,10 @@
             pgIntelPlanDtoList = pgIntelPlanManager.getPgIntelPlanListByPartion(lineName, partitionStr);
             if(pgIntelPlanDtoList==null||pgIntelPlanDtoList.size()==0)
                 msg="请输入正确的规划参数";
-            else
-                msg="规划数据获取成功";
+            else {
+                code="200";
+                msg = "规划数据获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "规划数据获取失败";
@@ -103,10 +112,12 @@
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
         String result="";
+        String code="0";
 
         try {
             boolean bl=pgIntelPlanManager.addLineUse(lineName,partitionStr,num);
             if(bl){
+                code="200";
                 msg="排线入廊成功";
                 result="true";
             }
@@ -119,6 +130,7 @@
             msg = "排线入廊失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
@@ -132,6 +144,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
         String result="";
+        String code="0";
 
         try {
             PgIntelPlan pgIntelPlan=pgIntelPlanManager.getPgIntelPlanByParNameAndLine(lineName,parName);
@@ -140,11 +153,13 @@
             pgIntelPlanManager.save(pgIntelPlan);
             msg="规划数据删除成功";
             result="true";
+            code="200";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "规划数据删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java b/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java
index 378af00..9c39523 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java
@@ -1,5 +1,6 @@
 package com.casic.PgInterface.rs;
 
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
 import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
 import com.casic.PgInterface.intelPlan.dto.PgLineHoleDTO;
 import com.casic.PgInterface.intelPlan.manager.PgLineHoleManager;
@@ -27,6 +28,9 @@
     @Resource
     private PgPileAcuManager pgPileAcuManager;
 
+    @Resource
+    private PgRoadManager pgRoadManager;
+
     @POST
     @Path("getPgLineAcuHole")
     @Produces(MediaType.APPLICATION_JSON)
@@ -34,23 +38,32 @@
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
         String result="";
+        String code="0";
         List<PgLineHoleDTO> pgLineHoleDTOList=new ArrayList<>();
 
         try {
             PgPileAcu pgPileAcu=pgPileAcuManager.getPgPileAcuByCode(acuCode);
             if(pgPileAcu==null){
                 msg="不存在分区";
-            }else{
-                pgLineHoleDTOList=pgLineHoleManager.getCurrentHoleByAcu(pgPileAcu.getId());
-                if(pgLineHoleDTOList!=null&&pgLineHoleDTOList.size()!=0)
-                    msg="获取成功";
-                else
-                    msg="未找到入廊数据";
+            }else {
+                pgLineHoleDTOList = pgLineHoleManager.getCurrentHoleByAcu(pgPileAcu.getId());
+                if (pgLineHoleDTOList != null && pgLineHoleDTOList.size() != 0)
+                {
+                    code="200";
+                    msg = "获取成功";
+                }
+                else {
+                    PgLineHoleDTO pgLineHoleDTO=new PgLineHoleDTO();
+                    pgLineHoleDTO.setRoad(pgRoadManager.get(pgPileAcu.getRoadId()).getRoadName());
+                    pgLineHoleDTOList.add(pgLineHoleDTO);
+                    msg = "未找到入廊数据";
+                }
             }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgLineHoleDTOList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgLogRs.java b/src/main/java/com/casic/PgInterface/rs/PgLogRs.java
index 39cff52..30db63b 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgLogRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgLogRs.java
@@ -45,6 +45,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         PgLog pgLog=new PgLog();
         try {
             PgUser pgUser = new PgUser();
@@ -60,14 +61,15 @@
             pgLogManager.save(pgLog);
             result = "true";
             msg = "保存成功";
-
+            code="200";
         } catch (Exception e) {
             result = "false";
             msg = "保存失败";
             e.printStackTrace();
         }
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -83,17 +85,21 @@
             throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgLogDto> pgLogDtoList = new ArrayList<PgLogDto>();
         try {
             pgLogDtoList = pgLogManager.getAllLogs(userName, startTime, endTime);
             if (pgLogDtoList == null || pgLogDtoList.size() == 0)
                 msg = "没有找到日志信息";
-            else
+            else {
+                code="200";
                 msg = "日志信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "日志信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgLogDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java
index 9fd0a5f..37b72f6 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java
@@ -36,19 +36,23 @@
         Map<String,Object> resultMap=new HashMap<>();
 
         String msg = "";
+        String code="0";
         List<PgMaintainType> pgMaintainTypeList=new ArrayList<>();
         try{
             pgMaintainTypeList=pgMaintainTypeManager.getMaintainType();
             if(pgMaintainTypeList!=null&&pgMaintainTypeList.size()!=0)
                 msg="不存在运维类别";
-            else
-                msg="运维类别获取成功";
+            else {
+                code="200";
+                msg = "运维类别获取成功";
+            }
         }
         catch(Exception ex)
         {
             ex.printStackTrace();
             msg="运维类别获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgMaintainTypeList);
 
@@ -65,10 +69,11 @@
         Map<String,Object> resultMap=new HashMap<>();
 
         String msg = "";
+        String code="0";
         List<PgMaintainTypeDto> pgMaintainTypeDtoList=new ArrayList<PgMaintainTypeDto>();
         try{
             pgMaintainTypeDtoList=pgMaintainTypeManager.getMaintainTypeModel(type);
-
+            code="200";
             msg="维护类型获取成功";
         }
         catch(Exception ex)
@@ -77,9 +82,9 @@
             msg="维护类型获取失败";
         }
 
-        resultMap.put("result",pgMaintainTypeDtoList);
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgMaintainTypeDtoList);
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java
index d735cc9..82ffca4 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java
@@ -33,12 +33,16 @@
                                                  @FormParam("endTime") String endTime){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
         List<PgMaintanceRecordHeadDto> pgMaintanceRecordHeadDtoList=new ArrayList<>();
         try{
             pgMaintanceRecordHeadDtoList=pgMaintanceRecordHeadManager.getPgMaintanceRecordHeadLsit(repairMan,startTime,endTime);
             if(pgMaintanceRecordHeadDtoList!=null&&pgMaintanceRecordHeadDtoList.size()!=0)
+            {
+                code="200";
                 msg="维护信息获取成功";
+            }
             else
                 msg="不存在维护信息";
         }
@@ -47,6 +51,7 @@
             msg="巡检信息获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgMaintanceRecordHeadDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java
index effc9df..9f46fc8 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java
@@ -32,12 +32,16 @@
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
         String result="";
+        String code="0";
 
         List<PgMaintanceRecordHeadStatic> pgMaintanceRecordHeadStaticList=new ArrayList<>();
         try{
             pgMaintanceRecordHeadStaticList=pgMaintanceRecordHeadManager.getPgMaintanceRecordHeadStaticLisByTime(startTime,endTime,staticType);
             if(pgMaintanceRecordHeadStaticList!=null&&pgMaintanceRecordHeadStaticList.size()!=0)
+            {
+                code="200";
                 msg="维护统计信息获取成功";
+            }
             else
                 msg="维护统计失败";
         }
@@ -46,7 +50,7 @@
             ex.printStackTrace();
             msg="统计失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgMaintanceRecordHeadStaticList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java b/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java
index 3a67bf3..6a5f4dc 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java
@@ -39,27 +39,31 @@
     @Path("getO2InfoByDevAndDate")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getO2InfoByDevAndDate(@FormParam("assetCode") String assetCode,
-                                                      @FormParam("startDate") String startDate,
-                                                      @FormParam("endDate") String endDate)throws Exception {
+                                                     @FormParam("startDate") String startDate,
+                                                     @FormParam("endDate") String endDate)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgHistoryDataDto> pgHistoryDataDtoList=new ArrayList<>();
 
         try {
             PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
                 msg="设备不存在";
-            else{
-                pgHistoryDataDtoList=pgO2Manager.getAllO2Data(pgDevice, startDate, endDate);
-                if(pgHistoryDataDtoList==null)
-                    msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+            else {
+                pgHistoryDataDtoList = pgO2Manager.getAllO2Data(pgDevice, startDate, endDate);
+                if (pgHistoryDataDtoList == null)
+                    msg = "没有满足要求的数据";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgHistoryDataDtoList);
         return resultMap;
@@ -75,23 +79,27 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         PgO2Dto pgO2Dto=new PgO2Dto(null);
 
         try {
             PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
                 msg="设备不存在";
-            else{
-                pgO2Dto=pgO2Manager.getNewestO2Data(pgDevice);
-                if(pgO2Dto==null)
-                    msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+            else {
+                pgO2Dto = pgO2Manager.getNewestO2Data(pgDevice);
+                if (pgO2Dto == null)
+                    msg = "没有满足要求的数据";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgO2Dto);
         return resultMap;
@@ -104,11 +112,12 @@
     @Path("addO2Data")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> addO2Data(@FormParam("devCode") String devCode,
-                                          @FormParam("upTime") String upTime,
-                                          @FormParam("o2") String o2)throws Exception {
+                                         @FormParam("upTime") String upTime,
+                                         @FormParam("o2") String o2)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
@@ -125,6 +134,7 @@
                 pgO2.setPgDeviceId(pgDevice);
 
                 pgO2Manager.save(pgO2);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -133,9 +143,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
         return resultMap;
     }
 

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 25ded8a..283d7ab 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,20 +7,56 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" 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/construction/manager/PgCsDocumentManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/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/manager/PgAlarmManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/~$说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/~$说明20191207.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.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$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/接口说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明20191207.docx" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
@@ -51,7 +87,7 @@
         <counts>
           <entry key="class" value="4" />
           <entry key="iml" value="2" />
-          <entry key="java" value="707" />
+          <entry key="java" value="820" />
           <entry key="properties" value="14" />
           <entry key="xml" value="7" />
         </counts>
@@ -60,7 +96,7 @@
         <counts>
           <entry key="CLASS" value="4" />
           <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="707" />
+          <entry key="JAVA" value="820" />
           <entry key="Properties" value="14" />
           <entry key="XML" value="7" />
         </counts>
@@ -68,32 +104,32 @@
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
           <entry key="dummy" value="38" />
-          <entry key="java" value="30161" />
+          <entry key="java" value="40859" />
           <entry key="properties" value="100" />
-          <entry key="txt" value="176" />
+          <entry key="txt" value="186" />
           <entry key="xml" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="30161" />
-          <entry key="PLAIN_TEXT" value="214" />
+          <entry key="JAVA" value="40859" />
+          <entry key="PLAIN_TEXT" value="224" />
           <entry key="Properties" value="100" />
           <entry key="XML" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="48" />
+          <entry key="project.closed" value="51" />
           <entry key="project.open.time.1" value="5" />
           <entry key="project.open.time.12" value="2" />
           <entry key="project.open.time.13" value="1" />
           <entry key="project.open.time.15" value="1" />
           <entry key="project.open.time.16" value="1" />
           <entry key="project.open.time.17" value="1" />
-          <entry key="project.open.time.2" value="1" />
+          <entry key="project.open.time.2" value="2" />
           <entry key="project.open.time.20" value="1" />
-          <entry key="project.open.time.23" value="1" />
+          <entry key="project.open.time.23" value="2" />
           <entry key="project.open.time.24" value="2" />
           <entry key="project.open.time.251" value="1" />
           <entry key="project.open.time.27" value="2" />
@@ -106,8 +142,8 @@
           <entry key="project.open.time.36" value="1" />
           <entry key="project.open.time.37" value="1" />
           <entry key="project.open.time.39" value="2" />
-          <entry key="project.open.time.4" value="2" />
-          <entry key="project.open.time.40" value="1" />
+          <entry key="project.open.time.4" value="3" />
+          <entry key="project.open.time.40" value="2" />
           <entry key="project.open.time.41" value="2" />
           <entry key="project.open.time.42" value="2" />
           <entry key="project.open.time.43" value="2" />
@@ -122,23 +158,25 @@
           <entry key="project.open.time.6" value="3" />
           <entry key="project.open.time.63" value="2" />
           <entry key="project.open.time.64" value="1" />
+          <entry key="project.open.time.66" value="1" />
           <entry key="project.open.time.71" value="2" />
+          <entry key="project.open.time.74" value="1" />
           <entry key="project.open.time.76" value="1" />
           <entry key="project.open.time.8" value="2" />
           <entry key="project.open.time.9" value="1" />
           <entry key="project.open.time.97" value="1" />
-          <entry key="project.opened" value="78" />
+          <entry key="project.opened" value="84" />
         </counts>
       </usages-collector>
     </session>
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+            <state relative-caret-position="396">
+              <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
               <folding>
                 <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
                 <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -147,73 +185,6 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <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="99">
-              <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-              <folding>
-                <element signature="imports" expanded="true" />
-                <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-1170">
-              <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state>
-              <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
-              <folding>
-                <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-                <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="true">
-        <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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-              <folding>
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-                <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>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <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="352">
-              <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -225,18 +196,9 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>inCriteria</find>
-      <find>getPgPlanResulList</find>
-      <find>getPileAcuListByPileAcuStr</find>
-      <find>distinct</find>
-      <find>order</find>
-      <find>canPlanLine</find>
-      <find>isExistLine</find>
-      <find>getPlanResult</find>
       <find>pgPipeLine</find>
       <find>getPipeLineBylineName</find>
       <find>StringU</find>
-      <find>getAllAlarm</find>
       <find>getAlarmList</find>
       <find>getPgInPersonListByDay</find>
       <find>getDayInPgStatistic</find>
@@ -254,7 +216,16 @@
       <find>getPgContructionByNameOrType</find>
       <find>&quot;&quot;,&quot;&quot;,</find>
       <find>getPgContructionDtoByNameOrType</find>
+      <find>addConstruction</find>
+      <find>getPgLineAcuHole</find>
+      <find>getPlanResult</find>
       <find>getConstruction</find>
+      <find>addPipeLine</find>
+      <find>未找到入廊数据</find>
+      <find>getCurrentHoleByAcu</find>
+      <find>getAllAlarm</find>
+      <find>getPgDeviceDtoListByPartition</find>
+      <find>getPgDeviceByDevType</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -263,57 +234,57 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlan.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileHoleManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/planData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/PlanData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
       </list>
     </option>
   </component>
@@ -359,7 +330,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -421,53 +391,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="dto" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="manager" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -479,29 +402,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="rs" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -516,6 +416,7 @@
         </subPane>
       </pane>
       <pane id="Scope" />
+      <pane id="PackagesPane" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -710,7 +611,13 @@
       <workItem from="1574902733573" duration="1829000" />
       <workItem from="1574998240004" duration="7016000" />
       <workItem from="1575247959683" duration="6997000" />
-      <workItem from="1575704345590" duration="40473000" />
+      <workItem from="1575704345590" duration="69381000" />
+      <workItem from="1575869479666" duration="721000" />
+      <workItem from="1575947104878" duration="6101000" />
+      <workItem from="1576128264436" duration="3347000" />
+      <workItem from="1576208571543" duration="22000" />
+      <workItem from="1576227513917" duration="862000" />
+      <workItem from="1576293721220" duration="18246000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -817,11 +724,18 @@
       <option name="project" value="LOCAL" />
       <updated>1575775489149</updated>
     </task>
-    <option name="localTasksCounter" value="16" />
+    <task id="LOCAL-00016" summary="整改施工信息">
+      <created>1575791780774</created>
+      <option name="number" value="00016" />
+      <option name="presentableId" value="LOCAL-00016" />
+      <option name="project" value="LOCAL" />
+      <updated>1575791780774</updated>
+    </task>
+    <option name="localTasksCounter" value="17" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="452131000" />
+    <option name="totallyTimeSpent" value="510338000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -834,9 +748,8 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
-    <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.24205749" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2647504" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -847,7 +760,7 @@
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.3295082" />
       <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.4819672" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.65737706" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.3295082" />
@@ -939,7 +852,8 @@
     <MESSAGE value="重新设计智能规划部分" />
     <MESSAGE value="完成智能规划对接" />
     <MESSAGE value="修改报警统计" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改报警统计" />
+    <MESSAGE value="整改施工信息" />
+    <option name="LAST_COMMIT_MESSAGE" value="整改施工信息" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -951,16 +865,10 @@
           <option name="timeStamp" value="3" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java</url>
-          <line>69</line>
+          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java</url>
+          <line>40</line>
           <properties />
-          <option name="timeStamp" value="21" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java</url>
-          <line>96</line>
-          <properties />
-          <option name="timeStamp" value="38" />
+          <option name="timeStamp" value="122" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
@@ -970,394 +878,452 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <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="2068">
-          <caret line="154" column="35" selection-start-line="154" selection-start-column="35" selection-end-line="154" selection-end-column="35" />
-        </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="3300">
-          <caret line="297" column="22" selection-start-line="297" selection-start-column="22" selection-end-line="297" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/StringUtils.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
-          <caret line="13" column="48" lean-forward="true" selection-start-line="13" selection-start-column="48" selection-end-line="13" selection-end-column="48" />
+          <caret line="11" column="5" selection-start-line="11" selection-start-column="5" selection-end-line="11" selection-end-column="5" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="78" lean-forward="true" selection-start-line="78" selection-end-line="78" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="616">
-          <caret line="41" column="1" selection-start-line="41" selection-start-column="1" selection-end-line="41" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="110">
-          <caret line="12" column="23" selection-start-line="12" selection-start-column="23" selection-end-line="12" selection-end-column="23" />
+        <state relative-caret-position="516">
+          <caret line="114" column="12" selection-start-line="114" selection-start-column="12" selection-end-line="114" selection-end-column="12" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="164">
-          <caret line="56" lean-forward="true" selection-start-line="56" selection-end-line="56" />
+        <state relative-caret-position="418">
+          <caret line="33" column="44" selection-start-line="33" selection-start-column="44" selection-end-line="33" selection-end-column="44" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="258">
-          <caret line="27" column="12" lean-forward="true" selection-start-line="27" selection-start-column="12" selection-end-line="27" selection-end-column="12" />
+        <state relative-caret-position="132">
+          <caret line="11" column="20" lean-forward="true" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="20" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.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="-12">
-          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        <state relative-caret-position="516">
+          <caret line="142" column="54" selection-start-line="142" selection-start-column="54" selection-end-line="142" selection-end-column="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="858">
-          <caret line="55" column="27" lean-forward="true" selection-start-line="55" selection-start-column="27" selection-end-line="55" selection-end-column="27" />
+        <state relative-caret-position="66">
+          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="58">
+          <caret line="18" column="28" selection-start-line="18" selection-start-column="19" selection-end-line="18" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="305">
+          <caret line="24" column="31" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="714">
+          <caret line="58" column="5" lean-forward="true" selection-start-line="58" selection-start-column="5" selection-end-line="58" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="924">
+          <caret line="134" column="92" selection-start-line="134" selection-start-column="92" selection-end-line="134" selection-end-column="92" />
+          <folding>
+            <element signature="method#linkDevice#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkPartitionCamera#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkReservePlan#0;class#PgAlarmLinkRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1066">
+          <caret line="90" lean-forward="true" selection-start-line="90" selection-end-line="90" />
+          <folding>
+            <element signature="method#getTjResultByAlarmType#0;class#PgAlarmTjRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="946">
+          <caret line="148" column="11" lean-forward="true" selection-start-line="148" selection-start-column="11" selection-end-line="148" selection-end-column="11" />
+          <folding>
+            <element signature="method#getAlarmTypeList#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#addAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#editAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#deleteAlarmType#0;class#PgAlarmTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="208">
+          <caret line="46" column="23" lean-forward="true" selection-start-line="46" selection-start-column="23" selection-end-line="46" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="113" column="9" lean-forward="true" selection-start-line="113" selection-start-column="9" selection-end-line="113" selection-end-column="9" />
+          <folding>
+            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
+            <element signature="method#getNewestCh4InfoByDev#0;class#PgCh4Rs#0" />
+            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="145" column="6" lean-forward="true" selection-start-line="145" selection-start-column="6" selection-end-line="145" selection-end-column="6" />
+          <folding>
+            <element signature="method#addAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#editAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#deleteAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#getAuthorityList#0;class#PgAuthorityRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="58" column="1" lean-forward="true" selection-start-line="58" selection-start-column="1" selection-end-line="58" selection-end-column="1" />
+          <folding>
+            <element signature="method#getPgAssetPlanList#0;class#PgAssetPlanRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="370">
+          <caret line="371" column="66" selection-start-line="371" selection-start-column="66" selection-end-line="371" selection-end-column="66" />
+          <folding>
+            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#searchConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionDev#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="139" column="13" lean-forward="true" selection-start-line="139" selection-start-column="13" selection-end-line="139" selection-end-column="13" />
+          <folding>
+            <element signature="method#getCoInfoByDevAndDate#0;class#PgCoRs#0" />
+            <element signature="method#getNewestCoInfoByDev#0;class#PgCoRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="540">
+          <caret line="223" column="5" lean-forward="true" selection-start-line="223" selection-start-column="5" selection-end-line="223" selection-end-column="5" />
+          <folding>
+            <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="682">
+          <caret line="100" lean-forward="true" selection-start-line="100" selection-end-line="100" />
+          <folding>
+            <element signature="method#getDeviceTpeyList#0;class#PgDeviceTypeRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="377">
+          <caret line="225" column="35" selection-start-line="225" selection-start-column="35" selection-end-line="225" selection-end-column="35" />
+          <folding>
+            <element signature="method#addEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#addEquipment#1;class#PgEquipmentRs#0" />
+            <element signature="method#getEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#deleteEquipment#0;class#PgEquipmentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="406">
+          <caret line="109" lean-forward="true" selection-start-line="109" selection-end-line="109" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="154">
+          <caret line="28" column="19" selection-start-line="28" selection-start-column="19" selection-end-line="28" selection-end-column="19" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="748">
-          <caret line="49" column="5" lean-forward="true" selection-start-line="49" selection-start-column="5" selection-end-line="49" selection-end-column="5" />
+        <state relative-caret-position="296">
+          <caret line="161" column="35" selection-start-line="161" selection-start-column="35" selection-end-line="161" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="384">
+          <caret line="99" column="5" lean-forward="true" selection-start-line="99" selection-start-column="5" selection-end-line="99" selection-end-column="5" />
+        </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="362">
+          <caret line="340" column="35" selection-start-line="340" selection-start-column="35" selection-end-line="340" selection-end-column="35" />
+          <folding>
+            <element signature="method#addInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPersonInPg#0;class#PgInPgPersonRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-606">
+          <caret line="76" column="20" lean-forward="true" selection-start-line="76" selection-start-column="20" selection-end-line="76" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="65" column="35" selection-start-line="65" selection-start-column="35" selection-end-line="65" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="101" column="35" selection-start-line="101" selection-start-column="35" selection-end-line="101" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="84" column="35" selection-start-line="84" selection-start-column="35" selection-end-line="84" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="59" lean-forward="true" selection-start-line="59" selection-end-line="59" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="60" column="1" lean-forward="true" selection-start-line="60" selection-start-column="1" selection-end-line="60" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="145" column="35" selection-start-line="145" selection-start-column="35" selection-end-line="145" selection-end-column="35" />
+        </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="274">
+          <caret line="350" column="35" selection-start-line="350" selection-start-column="35" selection-end-line="350" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="121" column="39" selection-start-line="121" selection-start-column="39" selection-end-line="121" selection-end-column="39" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="28" column="8" lean-forward="true" selection-start-line="28" selection-start-column="8" selection-end-line="28" selection-end-column="8" />
+        <state relative-caret-position="340">
+          <caret line="103" selection-start-line="103" selection-end-line="103" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="226" column="35" selection-start-line="226" selection-start-column="35" selection-end-line="226" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="203" column="35" selection-start-line="203" selection-start-column="35" selection-end-line="203" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="241" column="35" selection-start-line="241" selection-start-column="35" selection-end-line="241" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="225" column="1" lean-forward="true" selection-start-line="225" selection-start-column="1" selection-end-line="225" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="176" column="5" lean-forward="true" selection-start-line="176" selection-start-column="5" selection-end-line="176" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="178" column="35" lean-forward="true" selection-start-line="178" selection-start-column="35" selection-end-line="178" selection-end-column="35" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="516">
-          <caret line="94" column="53" selection-start-line="94" selection-start-column="53" selection-end-line="94" selection-end-column="53" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="814">
-          <caret line="52" column="9" lean-forward="true" selection-start-line="52" selection-start-column="9" selection-end-line="52" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="182">
-          <caret line="58" column="12" lean-forward="true" selection-start-line="58" selection-start-column="12" selection-end-line="58" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="34" lean-forward="true" selection-start-line="34" selection-end-line="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="32" lean-forward="true" selection-start-line="32" selection-end-line="32" />
-          <folding>
-            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
-            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="185">
-          <caret line="63" column="13" selection-start-line="63" selection-start-column="13" selection-end-line="63" selection-end-column="13" />
-          <folding>
-            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
-            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
-            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="e#6319#6324#0" />
-            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
-          </folding>
+          <caret line="240" lean-forward="true" selection-start-line="240" selection-end-line="240" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
-          <caret line="58" column="28" lean-forward="true" selection-start-line="58" selection-start-column="28" selection-end-line="58" selection-end-column="28" />
-          <folding>
-            <element signature="method#addTempHumData#0;class#PgTempHumRs#0" />
-          </folding>
+        <state relative-caret-position="340">
+          <caret line="148" column="34" selection-start-line="148" selection-start-column="34" selection-end-line="148" selection-end-column="34" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
+        <state relative-caret-position="458">
+          <caret line="99" column="35" selection-start-line="99" selection-start-column="35" selection-end-line="99" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+        <state relative-caret-position="384">
+          <caret line="145" column="32" lean-forward="true" selection-start-line="145" selection-start-column="32" selection-end-line="145" selection-end-column="32" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="414">
-          <caret line="22" column="46" lean-forward="true" selection-start-line="22" selection-start-column="46" selection-end-line="22" selection-end-column="46" />
-        </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="396">
-          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" column="83" selection-start-line="11" selection-start-column="83" selection-end-line="11" selection-end-column="83" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="26">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
-          <folding>
-            <element signature="method#getPgInPgStatusByPerson#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNumByName#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNum#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPersonListByDay#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPgStatusByPgInPgPerson#0;class#PgInPgStatusManager#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="44">
-          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-12">
-          <caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="87" lean-forward="true" selection-start-line="87" selection-end-line="87" />
-          <folding>
-            <element signature="method#getConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#addConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#deleteConstructionType#0;class#PgConstructionTypeRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
-          <folding>
-            <element signature="method#getConstructionTypeByType#0;class#PgConstructionTypeManager#0" />
-            <element signature="method#getAllConstructionTypeDto#0;class#PgConstructionTypeManager#0" />
-          </folding>
-        </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="145">
-          <caret line="258" column="9" lean-forward="true" selection-start-line="258" selection-start-column="9" selection-end-line="258" selection-end-column="9" />
-          <folding>
-            <element signature="method#getMonthInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayInPgStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgOverViewRs#0" />
-            <element signature="method#getAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getMonthAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayAlarmStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgOverViewRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="103">
-          <caret line="105" column="50" lean-forward="true" selection-start-line="105" selection-start-column="50" selection-end-line="105" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateBasicDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="99">
-          <caret line="125" selection-start-line="125" selection-end-line="125" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="190">
-          <caret line="24" column="35" lean-forward="true" selection-start-line="24" selection-start-column="35" selection-end-line="24" selection-end-column="35" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="436">
-          <caret line="24" lean-forward="true" selection-start-line="24" selection-end-line="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" lean-forward="true" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="300">
-          <caret line="34" column="31" lean-forward="true" selection-start-line="34" selection-start-column="31" selection-end-line="34" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="42" column="13" lean-forward="true" selection-start-line="42" selection-start-column="13" selection-end-line="42" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="120" column="72" lean-forward="true" selection-start-line="120" selection-start-column="72" selection-end-line="120" selection-end-column="72" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="293">
-          <caret line="58" column="73" lean-forward="true" selection-start-line="58" selection-start-column="73" selection-end-line="58" selection-end-column="73" />
-          <folding>
-            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
-            <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
-          </folding>
-        </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="307">
-          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
+        <state relative-caret-position="758">
+          <caret line="130" column="5" lean-forward="true" selection-start-line="130" selection-start-column="5" selection-end-line="130" selection-end-column="5" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1170">
-          <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
+        <state relative-caret-position="494">
+          <caret line="86" column="62" lean-forward="true" selection-start-line="86" selection-start-column="62" selection-end-line="86" selection-end-column="62" />
           <folding>
-            <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-            <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+            <element signature="method#getAllDevice#0;class#PgDeviceManager#0" />
+            <element signature="method#getAllDev#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="195" column="28" lean-forward="true" selection-start-line="195" selection-start-column="28" selection-end-line="195" selection-end-column="28" />
+        <state relative-caret-position="166">
+          <caret line="174" column="13" lean-forward="true" selection-start-line="174" selection-start-column="13" selection-end-line="174" selection-end-column="13" />
           <folding>
-            <element signature="method#getAlarmByTypeAndTime#0;class#PgAlarmManager#0" />
-            <element signature="method#getAlarmNum#0;class#PgAlarmManager#0" />
             <element signature="method#getDayAlarmStatistic#0;class#PgAlarmManager#0" />
+            <element signature="method#getAlarmList#0;class#PgAlarmManager#0" />
             <element signature="method#createDTO#0;class#PgAlarmManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="364">
+          <caret line="46" column="56" lean-forward="true" selection-start-line="46" selection-start-column="56" selection-end-line="46" selection-end-column="56" />
+          <folding>
+            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
+            <element signature="method#getPgDev#0;class#PgDeviceRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
+            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+        <state relative-caret-position="396">
+          <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
           <folding>
             <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
             <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -1365,52 +1331,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="239">
-          <caret line="21" column="33" lean-forward="true" selection-start-line="21" selection-start-column="33" selection-end-line="21" selection-end-column="33" />
-        </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="352">
-          <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-        </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="99">
-          <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-          </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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-          <folding>
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-            <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>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
index c436c93..e913155 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
@@ -132,7 +132,10 @@
             this.setAlarmType("");
         else
             this.setAlarmType(pgAlarm.getAlarmTypeId().getAlarmType());
-        this.setAlarmValue(pgAlarm.getAlarmValue());
+        if(pgAlarm.getAlarmValue()==null)
+            this.setAlarmValue("");
+        else
+            this.setAlarmValue(pgAlarm.getAlarmValue());
         if (pgAlarm.getAlarmDate() != null)
             this.setAlarmDate(sdf.format(pgAlarm.getAlarmDate()));
         else
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
index a43965c..565cb41 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -159,11 +159,21 @@
     }
 
     //获取历史报警消息列表
-    public List<PgAlarmDto> getAllAlarm(String alarmType,String startDay,String endDay,String isNew,int page,int rows) {
-        try {
+    public  Map<String, Object> getAllAlarm(String alarmType,String partition,String startDay,String endDay,String isNew,int page,int rows) {
 
+        Map<String, Object> resultMap = new HashMap<>();
+        String msg="";
+
+        try {
             Criteria criteria = createCriteria(PgAlarm.class);
 
+            if (StringUtils.isNotBlank(partition)) {
+                DetachedCriteria inCriteria = DetachedCriteria.forClass(PgDevice.class);
+                inCriteria.add(Restrictions.eq("partition", partition));
+                inCriteria.setProjection(Property.forName("id"));
+                criteria.add(Property.forName("alarmDevId").in(inCriteria));
+            }
+
             if (StringUtils.isNotBlank(alarmType)&&!alarmType.contains("全部")&&pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
                 criteria.add(Restrictions.eq("alarmTypeId", pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)));
 
@@ -190,8 +200,16 @@
             for (PgAlarm pgAlarm : pgAlarmList) {
                 pgAlarmDtoList.add(new PgAlarmDto(pgAlarm));
             }
-
-            return pgAlarmDtoList;
+            if(pgAlarmDtoList==null||pgAlarmDtoList.size()==0) {
+                resultMap.put("msg", "没有报警信息");
+                resultMap.put("code","0");
+            }else {
+                resultMap.put("code","200");
+                resultMap.put("msg", "报警信息获取成功");
+            }
+            resultMap.put("count",pg.getTotalCount());
+            resultMap.put("result",pgAlarmDtoList);
+            return resultMap;
         }
         catch(Exception ex){
             ex.printStackTrace();
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index 7547560..654f49e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -24,11 +24,11 @@
 
         Criteria criteria = createCriteria(PgDevice.class);
 
-        if(road!=null)
+        if(StringUtils.isNotBlank(road))
             criteria.add(Restrictions.eq("road",road));
-        if(partition!=null)
+        if(StringUtils.isNotBlank(partition))
             criteria.add(Restrictions.eq("partition",partition));
-        if(devType!=null)
+        if(StringUtils.isNotBlank(devType))
             criteria.add(Restrictions.eq("devType",devType));
 
         criteria.add(Restrictions.eq("active", 1));
@@ -43,6 +43,29 @@
         return pgDeviceDtoList;
     }
 
+    public List<PgDeviceDto> getAllDev(String road,String partition,String devType) {
+
+        Criteria criteria = createCriteria(PgDevice.class);
+
+        if(StringUtils.isNotBlank(road))
+            criteria.add(Restrictions.eq("road",road));
+        if(StringUtils.isNotBlank(partition))
+            criteria.add(Restrictions.eq("partition",partition));
+        if(StringUtils.isNotBlank(devType))
+            criteria.add(Restrictions.like("devType","%"+devType+"%"));
+
+        criteria.add(Restrictions.eq("active", 1));
+        criteria.addOrder(Order.desc("id"));
+        List<PgDevice> pgDeviceList = criteria.list();
+
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
+        for (PgDevice pgDevice : pgDeviceList) {
+            pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
+        }
+
+        return pgDeviceDtoList;
+    }
+
     //根据名字获取当前设备
     public PgDevice getDeviceByAssetCode(String assetCode) {
         Criteria criteria=createCriteria(PgDevice.class);
@@ -56,9 +79,9 @@
     }
 
     //根据类型获取设备列表
-    public List<PgDeviceDto> getDeviceByDevTypee(String devType) {
+    public List<PgDeviceDto> getDeviceByDevType(String devType) {
         Criteria criteria=createCriteria(PgDevice.class);
-        criteria.add(Restrictions.eq("devType",devType));
+        criteria.add(Restrictions.like("devType","%"+devType+"%"));
 
         List<PgDevice> pgDeviceList=criteria.list();
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
@@ -106,7 +129,7 @@
         criteria.add(Restrictions.eq("partition",partition));
 
         List<PgDevice> pgDeviceList=criteria.list();
-        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<PgDeviceDto>();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
 
         for (PgDevice pgDevice : pgDeviceList) {
             pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
index 3a3bccd..595730e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
@@ -1,10 +1,13 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.devTable.domain.PgAlarmType;
 import com.casic.PgInterface.devTable.domain.PgPartition;
 import com.casic.PgInterface.devTable.domain.PgRoad;
 import com.casic.PgInterface.devTable.domain.PipeGallery;
 import com.casic.PgInterface.devTable.dto.PgPartitionDto;
+import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
@@ -12,7 +15,9 @@
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Created by yxw on 2017/11/4.
@@ -21,7 +26,8 @@
 public class PgPartitionManager extends HibernateEntityDao<PgPartition> {
 
     @Resource
-    PgRoadManager pgRoadManager;
+    private PgRoadManager pgRoadManager;
+
 
     public PgPartition getPartitionByParName(String parName) {
         Criteria criteria = getSession().createCriteria(PgPartition.class);
@@ -99,4 +105,5 @@
         return pgPartitionDtoList;
     }
 
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
index f216360..a6928f1 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
@@ -5,6 +5,7 @@
 public class PgPlanResultRe {
 
     private String taskKey;
+    private List<String> pileAcuList;
     private List<PgPlanResult> pgPlanResultList;
 
     public String getTaskKey() {
@@ -15,6 +16,14 @@
         this.taskKey = taskKey;
     }
 
+    public List<String> getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(List<String> pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+
     public List<PgPlanResult> getPgPlanResultList() {
         return pgPlanResultList;
     }
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
index 71ea765..47eea07 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
@@ -54,9 +54,7 @@
 
         List<PgLineHole> pgLineHoleList=criteria.list();
         List<PgLineHoleDTO> pgLineHoleDTOList=new ArrayList<>();
-        if(pgLineHoleList==null||pgLineHoleList.size()==0)
-            return null;
-        else
+        if(pgLineHoleList!=null&&pgLineHoleList.size()!=0)
             pgLineHoleDTOList=PgLineHoleDTO.ConvertToDTOList(pgLineHoleList,pgPileAcuManager,pgRoadManager);
         return pgLineHoleDTOList;
     }
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
index 0fd9e1f..841a386 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
@@ -1,12 +1,15 @@
 package com.casic.PgInterface.intelPlan.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.devTable.domain.PgPartition;
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
 import com.casic.PgInterface.intelPlan.domain.PgLineHole;
 import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
 import com.casic.PgInterface.intelPlan.domain.PgSection;
 import com.casic.PgInterface.intelPlan.dto.PgPlanResult;
 import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
 import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -22,6 +25,9 @@
     @Resource
     private PgLineHoleManager pgLineHoleManager;
 
+    @Resource
+    private PgRoadManager pgRoadManager;
+
     public PgPileAcu getPgPileAcuByCode(String acuCode){
         List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
 
@@ -58,7 +64,9 @@
         for(PgPlanTask pgPlanTask:pgPlanTaskList){
             List<PgPlanResult> pgPlanResultList=getPgPlanResultByPlantask(pgPlanTask);
             PgPlanResultRe pgPlanResultRe=new PgPlanResultRe();
+
             pgPlanResultRe.setTaskKey(pgPlanTask.getTaskKey());
+            pgPlanResultRe.setPileAcuList(pgPlanTask.getPileAcuList());
             pgPlanResultRe.setPgPlanResultList(pgPlanResultList);
 
             pgPlanResultReList.add(pgPlanResultRe);
@@ -142,4 +150,57 @@
         return length;
     }
 
+    private PgPileAcu getPgPileAcuByAcuCode(String acuCode){
+        List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
+
+        if(pgPileAcuList==null||pgPileAcuList.size()==0)
+            return null;
+        else
+            return pgPileAcuList.get(0);
+    }
+
+    public List<PgAcuTask> getACUTask(String pileAcuList){
+        String[] acuArray=pileAcuList.split(",");
+        List<PgAcuTask> pgAcuTaskList=new ArrayList<>();
+
+        for(String acu:acuArray){
+            PgPileAcu pgPileAcu=this.getPgPileAcuByCode(acu);
+            String roadName=pgRoadManager.get(pgPileAcu.getRoadId()).getRoadName();
+
+            if(!containRoad(roadName,pgAcuTaskList))
+            {
+                PgAcuTask pgAcuTask=new PgAcuTask();
+                pgAcuTask.setRoadName(roadName);
+                pgAcuTask.setPileAcuList(acu);
+                pgAcuTaskList.add(pgAcuTask);
+            }
+            else{
+                PgAcuTask pgAcuTask=getIndexRoad(roadName,pgAcuTaskList);
+                if(pgAcuTask!=null)
+                    pgAcuTask.setPileAcuList(pgAcuTask.getPileAcuList()+","+acu);
+            }
+        }
+
+        return pgAcuTaskList;
+    }
+
+    private boolean containRoad(String roadName,List<PgAcuTask> pgAcuTaskList){
+        if(pgAcuTaskList==null||pgAcuTaskList.size()==0) return false;
+        for(PgAcuTask pgAcuTask:pgAcuTaskList){
+            if(pgAcuTask.getRoadName().equals(roadName))
+                return true;
+        }
+
+        return false;
+    }
+
+    private PgAcuTask getIndexRoad(String roadName, List<PgAcuTask> pgAcuTaskList){
+        for(PgAcuTask pgAcuTask:pgAcuTaskList){
+            if(pgAcuTask.getRoadName().equals(roadName))
+                return pgAcuTask;
+        }
+
+        return null;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java
new file mode 100644
index 0000000..323f7ef
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java
@@ -0,0 +1,25 @@
+package com.casic.PgInterface.reservePlan.dto;
+
+import java.util.List;
+
+public class PgAcuTask {
+
+    private String roadName;//道路
+    private String pileAcuList;//acu分区
+
+    public String getRoadName() {
+        return roadName;
+    }
+
+    public void setRoadName(String roadName) {
+        this.roadName = roadName;
+    }
+
+    public String getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(String pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
index c25e926..c7d7693 100644
--- a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
@@ -70,9 +70,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(Long.valueOf(inPgPersonId));
         PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("hostName",pgInPgPerson.getAssetCode());
-//        PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode());
-//        long maxId = pgTagPositionManager.getMaxId(pgTagMac.getTagMac());
-//        PGTagPosition pgTagPosition = pgTagPositionManager.get(maxId);
+
         PGTagPosition pgTagPosition = tagmacRun.GetTagStatus(pgTagMac);
         boolean bExist = false;
         bExist = pgTagPositionManager.findTagPosition(pgTagPosition.getPositionUpdatetime(),pgTagPosition.getHostId());
@@ -104,8 +102,7 @@
         PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(Long.valueOf(inPgPersonId));
         PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pgInPgPersonId",pgInPgPerson);
         System.out.println("time:"+pgInPgStatus.getInTime());
-//        PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pgInPgPersonId",inPgPersonId);
-//        PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode());
+
         PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("hostName",pgInPgPerson.getAssetCode());
 
         Map<Object,Object> mapPosition = new HashMap<>();
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
index 082ba5d..3eed00a 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
@@ -48,6 +48,7 @@
     public Map<String, Object> linkDevice(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         PgDeviceDto pgDeviceDto = null;
         try {
@@ -62,6 +63,7 @@
                     else {
                         pgDeviceDto = new PgDeviceDto(pgDevice);
                         msg = "报警关联设备获取成功";
+                        code="200";
                     }
                 }
             }
@@ -71,6 +73,7 @@
             e.printStackTrace();
             msg = "获取关联设备失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceDto);
 
@@ -86,6 +89,7 @@
     public Map<String, Object> linkPartitionCamera(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
         try {
@@ -106,6 +110,7 @@
 
                         pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(partition,position);
                         msg = "关联设备获取成功";
+                        code="200";
                     }
                 }
             }
@@ -115,6 +120,7 @@
             e.printStackTrace();
             msg = "分区设备关联失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceDtoList);
         return resultMap;
@@ -129,6 +135,7 @@
     public Map<String, Object> linkReservePlan(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgReservePlanDto> pgReservePlanDtoList=new ArrayList<>();
         try{
@@ -139,10 +146,12 @@
                 else {
                     pgReservePlanDtoList = pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
 
-                    if(pgReservePlanDtoList==null||pgReservePlanDtoList.size()==0)
-                        msg="不存在关联的报警预案";
-                    else
+                    if (pgReservePlanDtoList == null || pgReservePlanDtoList.size() == 0)
+                        msg = "不存在关联的报警预案";
+                    else {
                         msg = "关联预案获取成功";
+                        code="200";
+                    }
                 }
             }
             else
@@ -153,6 +162,7 @@
             e.printStackTrace();
             msg="预案关联失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgReservePlanDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
index 0ddbc4d..0ce886b 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
@@ -41,25 +41,19 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getAlarmList(@FormParam("alarmType") String alarmType,
                                             @FormParam("startDay") String startDay,
+                                            @FormParam("partition") String partition,
                                             @FormParam("endDay") String endDay,
                                             @FormParam("isNew") String isNew,
                                             @FormParam("page") int page,
                                             @FormParam("rows") int rows) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
         try {
-            pgAlarmDtoList = pgAlarmManager.getAllAlarm(alarmType,startDay,endDay,isNew,page,rows);
-            if (pgAlarmDtoList==null||pgAlarmDtoList.size() == 0)
-                msg = "没有报警信息";
-            else
-                msg = "报警信息获取成功";
+            resultMap = pgAlarmManager.getAllAlarm(alarmType,partition,startDay,endDay,isNew,page,rows);
+
         } catch (Exception e) {
             e.printStackTrace();
-            msg = "报警信息获取失败";
         }
-        resultMap.put("msg", msg);
-        resultMap.put("result", pgAlarmDtoList);
         return resultMap;
     }
 
@@ -71,9 +65,10 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> clearAlarmList(@FormParam("id") String id) throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        String result = "false";
+        String result = "";
+        String code="0";
 
         try {
             PgAlarm pgAlarm = new PgAlarm();
@@ -86,12 +81,14 @@
                 pgAlarmManager.save(pgAlarm);
                 msg = "报警信息清除成功";
                 result = "true";
+                code = "200";
             }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警信息清除失败";
             result = "false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
@@ -106,21 +103,26 @@
     public Map<String, Object> getAlarmByTypeOrTime(@FormParam("alarmType") String alarmType,
                                                     @FormParam("startTime") String startTime,
                                                     @FormParam("endTime") String endTime) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
-        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<PgAlarmDto>();
+        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
         try {
             pgAlarmDtoList = pgAlarmManager.getAlarmByTypeAndTime(alarmType, startTime, endTime);
             if (pgAlarmDtoList == null || pgAlarmDtoList.size() == 0)
                 msg = "报警信息不存在";
             else
+            {
                 msg = "报警信息获取成功";
+                code="200";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警信息获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
index 29ce8a4..ed0bf34 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
@@ -39,8 +39,8 @@
     public Map<String, Object> getAlarmRule(@FormParam("devType") String devType) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
-        System.out.println("devType:"+devType);
         List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<>();
         try {
             pgAlarmRuleDtoList = pgAlarmRuleManager.getAlarmRuleDto(devType);
@@ -52,6 +52,7 @@
             e.printStackTrace();
             msg = "报警阈值信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmRuleDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
index 24ab894..abef1b1 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
@@ -39,16 +39,21 @@
                                                      @FormParam("endDate") String endDate)throws Exception{
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
+
         List<PgAlarmTjDto> pgAlarmTjDtoList=null;
         try{
             pgAlarmTjDtoList=pgAlarmTjManager.getAlarmTjResultByType(startDate,endDate);
             msg="获取成功";
+            code="200";
         }
         catch(Exception ex) {
             msg = "统计失败";
         }
-        resultMap.put("result",pgAlarmTjDtoList);
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
+        resultMap.put("result",pgAlarmTjDtoList);
+
         return resultMap;
     }
 
@@ -61,23 +66,27 @@
     public Map<String, Object> getAlarmByTime(@FormParam("startTime") String startTime,
                                               @FormParam("endTime") String endTime,
                                               @FormParam("statisticType") String statisticType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code = "0";
 
-        List<PgAlarmTjDto> pgAlarmTjDtoList = new ArrayList<PgAlarmTjDto>();
+        List<PgAlarmTjDto> pgAlarmTjDtoList = new ArrayList<>();
         try {
             pgAlarmTjDtoList = pgAlarmTjManager.getAlarmByTime(startTime, endTime, statisticType);
             if(pgAlarmTjDtoList==null)
                 msg="报警统计信息获取失败";
-            else
-                msg="报警统计信息获取成功";
+            else {
+                msg = "报警统计信息获取成功";
+                code="200";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警统计信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmTjDtoList);
         return resultMap;
     }
 
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
index 28bc811..b6278a9 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
@@ -30,7 +30,6 @@
     @Resource
     private PgAlarmTypeManager pgAlarmTypeManager;
 
-
     /**
      * 获取报警类型
      */
@@ -38,19 +37,24 @@
     @Path("getAlarmType")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getAlarmTypeList()throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
-        List<PgAlarmTypeDto> pgAlarmTypeDtoList=new ArrayList<PgAlarmTypeDto>();
+        String code="";
+
+        List<PgAlarmTypeDto> pgAlarmTypeDtoList=new ArrayList<>();
         try {
             pgAlarmTypeDtoList = pgAlarmTypeManager.getAllAlarmTypeDto();
             if(pgAlarmTypeDtoList.size()==0)
                 msg="没有报警类型信息";
-            else
-                msg="报警类型信息获取成功";
+            else {
+                code="200";
+                msg = "报警类型信息获取成功";
+            }
         }catch(Exception e){
             e.printStackTrace();
             msg="报警类型信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAlarmTypeDtoList);
         return resultMap;
@@ -66,6 +70,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
@@ -83,6 +88,7 @@
                 logger.info("成功保存");
                 result = "true";
                 msg = "保存成功";
+                code="200";
             }
         } catch (Exception e) {
             result = "false";
@@ -90,6 +96,7 @@
             e.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -106,6 +113,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try{
             if(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
@@ -119,6 +127,7 @@
                 pgAlarmTypeManager.save(pgAlarmType);
                 result = "true";
                 msg = "编辑成功";
+                code="200";
             }
         }
         catch(Exception e)
@@ -128,6 +137,7 @@
             e.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("result",result);
         resultMap.put("msg",msg);
 
@@ -146,6 +156,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
         String result="false";
+        String code="0";
 
         try {
             PgAlarmType pgAlarmType=pgAlarmTypeManager.get(Long.valueOf(id));
@@ -157,6 +168,7 @@
             {
                 pgAlarmType.setActive(0);
                 pgAlarmTypeManager.save(pgAlarmType);
+                code="200";
                 msg="报警类型删除成功";
                 result="true";
             }
@@ -165,6 +177,7 @@
             msg="报警类型删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
index 4533e1a..85940bb 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
@@ -33,12 +33,15 @@
                                                  @FormParam("inSpectionPlace") String inSpectionPlace){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
         List<PgAssetPlanDto> pgAssetPlanDtoList=new ArrayList<>();
         try{
             pgAssetPlanDtoList=pgAssetPlanManager.getPgAssetPlanDtoList(startDay,endDay,inSpectionPlace);
-            if(pgAssetPlanDtoList!=null&&pgAssetPlanDtoList.size()!=0)
-                msg="巡检信息获取成功";
+            if(pgAssetPlanDtoList!=null&&pgAssetPlanDtoList.size()!=0) {
+                code="200";
+                msg = "巡检信息获取成功";
+            }
             else
                 msg="不存在巡检信息";
         }
@@ -47,6 +50,7 @@
             msg="巡检信息获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAssetPlanDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
index 47ef9d1..5cbdfcb 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
@@ -30,12 +30,15 @@
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
         String result="";
+        String code="0";
 
         List<PgAssetPlanStatic> pgAssetPlanStaticList = null;
         try{
             pgAssetPlanStaticList=pgAssetPlanManager.getPgAssetPlanStaticLisByTime(startTime,endTime,staticType);
-            if(pgAssetPlanStaticList!=null&&pgAssetPlanStaticList.size()!=0)
-                msg="巡检统计信息获取成功";
+            if(pgAssetPlanStaticList!=null&&pgAssetPlanStaticList.size()!=0) {
+                code = "200";
+                msg = "巡检统计信息获取成功";
+            }
             else
                 msg="统计信息获取失败";
         }
@@ -44,6 +47,7 @@
             msg="统计失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAssetPlanStaticList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
index 26f5d6a..503bfe3 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
@@ -40,6 +40,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="";
 
         try{
             PgAuthority pgAuthority=new PgAuthority();
@@ -50,6 +51,7 @@
 
             pgAuthorityManager.save(pgAuthority);
             msg="用户权限保存成功";
+            code="200";
             result="true";
         }
         catch(Exception e) {
@@ -57,6 +59,7 @@
             msg = "新增权限失败";
             result = "false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -65,22 +68,25 @@
 
     /*
        *编辑角权限信息
-        */
+    */
     @POST
     @Path("editAuthority")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> editAuthority(@FormParam("id") String id,
                                        @FormParam("authority") String authority,
                                        @FormParam("concent") String concent) throws Exception{
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
+
         try {
             PgAuthority pgAuthority=pgAuthorityManager.get(Long.valueOf(id));
             pgAuthority.setAuthority(authority);
             pgAuthority.setConcent(concent);
 
             pgAuthorityManager.save(pgAuthority);
+            code="200";
             msg="权限保存成功";
             result="true";
         }
@@ -90,7 +96,7 @@
             msg="权限编辑失败";
             result="false";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -105,9 +111,10 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> deleteAuthority(@FormParam("id") String id)throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
-        String result="false";
+        String result="";
+        String code="0";
 
         try {
             PgAuthority pgAuthority= pgAuthorityManager.get(Long.valueOf(id));
@@ -119,6 +126,7 @@
             {
                 pgAuthority.setActive(0);
                 pgAuthorityManager.save(pgAuthority);
+                code="200";
                 msg="删除权限成功";
                 result="true";
             }
@@ -127,37 +135,40 @@
             msg="删除权限失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
     }
 
     /*
-* 获取权限信息
- */
+    * 获取权限信息
+    */
     @POST
     @Path("getAuthorityList")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> getAuthorityList() {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgAuthorityDto> pgAuthorityDtoList = new ArrayList<PgAuthorityDto>();
         try {
             pgAuthorityDtoList = pgAuthorityManager.getAuthorityList();
             if (pgAuthorityDtoList == null)
                 msg = "不存在权限信息";
-            else
+            else {
+                code = "200";
                 msg = "权限信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "权限信息获取是失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAuthorityDtoList);
         return resultMap;
     }
 
 
-
-
 }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
index a9ef521..a74ecc7 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
@@ -45,6 +45,7 @@
                                                @FormParam("endDate") String endDate)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgHistoryDataDto> pgHistoryDataDtoList=new ArrayList<>();
 
         try {
@@ -55,13 +56,16 @@
                 pgHistoryDataDtoList=pgCh4Manager.getAllCH4Data(pgDevice,startDate,endDate);
                 if(pgHistoryDataDtoList==null)
                     msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+                else {
+                    code = "200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgHistoryDataDtoList);
         return resultMap;
@@ -75,8 +79,9 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getNewestCh4InfoByDev(@FormParam("assetCode") String assetCode)throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
+        String code="0";
         PgCh4Dto pgCh4Dto=new PgCh4Dto(null);
 
         try {
@@ -87,13 +92,17 @@
                 pgCh4Dto=pgCh4Manager.getNewestCH4Data(pgDevice);
                 if(pgCh4Dto==null)
                     msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgCh4Dto);
         return resultMap;
@@ -111,6 +120,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
@@ -127,6 +137,7 @@
                 pgCh4.setPgDeviceId(pgDevice);
 
                 pgCh4Manager.save(pgCh4);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -135,7 +146,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
index a7eac39..dfc8ca5 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
@@ -43,23 +43,27 @@
                                                       @FormParam("endDate") String endDate)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgHistoryDataDto> pgHistoryDataDtoList=new ArrayList<>();
 
         try {
             PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
                 msg="设备不存在";
-            else{
-                pgHistoryDataDtoList=pgCoManager.getAllCoData(pgDevice, startDate, endDate);
-                if(pgHistoryDataDtoList==null)
-                    msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+            else {
+                pgHistoryDataDtoList = pgCoManager.getAllCoData(pgDevice, startDate, endDate);
+                if (pgHistoryDataDtoList == null)
+                    msg = "没有满足要求的数据";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgHistoryDataDtoList);
         return resultMap;
@@ -75,6 +79,7 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         PgCoDto pgCoDto=new PgCoDto(null);
 
         try {
@@ -85,13 +90,16 @@
                 pgCoDto=pgCoManager.getNewestCoData(pgDevice);
                 if(pgCoDto==null)
                     msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgCoDto);
         return resultMap;
@@ -110,6 +118,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         try {
@@ -126,6 +135,7 @@
 
                 pgCoManager.save(pgCo);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
         } catch (Exception e) {
@@ -133,7 +143,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
index b4b826e..9af98a3 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
@@ -60,6 +60,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         try {
 
@@ -80,8 +81,8 @@
                 pgConstruction.setPgConstructionTypeId(pgConstructionType.getId());
                 pgConstruction.setActive(1);
                 pgConstruction.setParName(parName);
-                logger.info("保存成功");
                 pgConstructionManager.save(pgConstruction);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -90,6 +91,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("success", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -116,6 +118,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
@@ -140,6 +143,7 @@
                 pgConstruction.setParName(parName);
 
                 pgConstructionManager.save(pgConstruction);
+                code="200";
                 result = "true";
                 msg = "编辑成功";
             }
@@ -150,7 +154,7 @@
             e.printStackTrace();
 
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -167,6 +171,8 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
+
         try {
             PgConstruction pgConstruction = pgConstructionManager.get(Long.valueOf(id));
             if (pgConstruction == null)
@@ -177,6 +183,7 @@
             {
                 pgConstruction.setActive(0);
                 pgConstructionManager.save(pgConstruction);
+                code="200";
                 result = "true";
                 msg = "成功删除信息";
             }
@@ -185,6 +192,7 @@
             result = "false";
             msg = "删除失败";
         }
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -204,9 +212,11 @@
                                                   @FormParam("rows") int rows)throws Exception{
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
         List<PgConstructionDto> pgConstructionDtoList=new ArrayList<>();
         try{
             pgConstructionDtoList=pgConstructionManager.getPgContructionDto(cs_name,cs_type,startTime,endTime,page,rows);
+            code="200";
             msg="信息获取成功";
         }
         catch(Exception e)
@@ -214,6 +224,7 @@
             e.printStackTrace();
             msg="查询失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
 
@@ -231,18 +242,22 @@
                                                               @FormParam("statisticType") String statisticType) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgConstructionStiatistic> pgConstructionStiatisticList=new ArrayList<>();
         try {
             pgConstructionStiatisticList = pgConstructionManager.getConstructionByTimeAndStatus(startTime, endTime, statisticType);
             if(pgConstructionStiatisticList==null)
                 msg="施工统计信息获取失败";
-            else
-                msg="施工统计信息获取成功";
+            else {
+                code="200";
+                msg = "施工统计信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "施工统计信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgConstructionStiatisticList);
         return resultMap;
@@ -257,6 +272,7 @@
     public Map<String, Object> getConstructionByType(@FormParam("statisticType") String statisticType){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
         List<PgConstructionStiatistic> pgConstructionStiatisticList=new ArrayList<>();
 
         try{
@@ -268,6 +284,7 @@
                 resultMap.put("result",null);
             }
             else {
+                code="200";
                 msg = "统计信息获取成功";
                 resultMap.put("result", pgConstructionStiatisticList);
             }
@@ -278,6 +295,7 @@
             msg="统计失败";
             resultMap.put("result",null);
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         return resultMap;
     }
@@ -291,9 +309,11 @@
     public Map<String, Object> getConstructionToday() throws Exception{
         Map<String,Object> resultMap=new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgConstructionDto> pgConstructionDtoList=new ArrayList<PgConstructionDto>();
         try {
             pgConstructionDtoList = pgConstructionManager.getConstructionToday();
+            code="200";
             msg = "当天施工信息获取成功";
         }
         catch(Exception e)
@@ -301,7 +321,7 @@
             e.printStackTrace();
             msg="获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
         return resultMap;
@@ -316,6 +336,7 @@
     public Map<String, Object> getConstructionDev(@FormParam("id") String id) throws Exception{
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
         List<PgDeviceDto> pgDeviceDtoList =new ArrayList<>();
         try{
@@ -325,14 +346,17 @@
 
             if(pgDeviceDtoList==null)
                 msg="信息获取失败";
-            else
-                msg="信息获取成功";
+            else {
+                code="200";
+                msg = "信息获取成功";
+            }
         }
         catch(Exception e)
         {
             e.printStackTrace();
-            msg="设备信息获取成功";
+            msg="信息获取是被";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgDeviceDtoList);
 
@@ -346,17 +370,21 @@
     @Path("getConstruction")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getConstruction() throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
-        List<PgConstructionDto> pgConstructionDtoList=new ArrayList<PgConstructionDto>();
+        String code="0";
+
+        List<PgConstructionDto> pgConstructionDtoList=new ArrayList<>();
 
         try{
             pgConstructionDtoList=pgConstructionManager.getPgConstructionList();
             if(pgConstructionDtoList==null||pgConstructionDtoList.size()==0)
                 msg="不存在施工记录";
-            else
-                msg="施工信息获取成功";
+            else {
+                code = "200";
+                msg = "施工信息获取成功";
+            }
         }
         catch(Exception e)
         {
@@ -364,6 +392,7 @@
             msg="施工信息获取失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java
index fd3d53e..2019502 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java
@@ -39,12 +39,12 @@
         try {
             pgConstructionTypeDtoList = pgConstructionTypeManager.getAllConstructionTypeDto();
             if (pgConstructionTypeDtoList.size() == 0)
-                msg = "没有项目类型信息";
+                msg = "获取失败";
             else
-                msg = "项目类型获取成功";
+                msg = "获取成功";
         } catch (Exception e) {
             e.printStackTrace();
-            msg = "项目类型信息获取失败";
+            msg = "获取失败";
         }
         resultMap.put("msg", msg);
         resultMap.put("result", pgConstructionTypeDtoList);
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
index 90d001c..037a399 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
@@ -51,6 +51,7 @@
 
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if (StringUtils.isBlank(construct_doc)||StringUtils.isBlank(doc_name))
@@ -65,6 +66,7 @@
             pgCsDocument.setActive(1);
             pgCsDocumentManager.save(pgCsDocument);
 
+            code="200";
             result = "true";
             msg = "保存成功";
 
@@ -74,6 +76,7 @@
             ex.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("success", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -90,6 +93,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             PgCsDocument pgCsDocument = pgCsDocumentManager.get(Long.valueOf(id));
@@ -103,6 +107,7 @@
 
                 pgCsDocumentManager.save(pgCsDocument);
 
+                code="200";
                 result = "true";
                 msg = "编辑成功";
             }
@@ -112,6 +117,7 @@
             msg = "编辑失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -125,9 +131,9 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
         String result="";
+        String code="0";
 
         try{
-
             PgCsDocument pgCsDocument = pgCsDocumentManager.get(Long.valueOf(id));
             if(pgCsDocument==null)
             {
@@ -137,6 +143,7 @@
             else{
                 pgCsDocument.setActive(0);
                 pgCsDocumentManager.save(pgCsDocument);
+                code="200";
                 result="true";
                 msg="删除成功";
             }
@@ -147,7 +154,7 @@
             msg="预案删除失败";
             result="false";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -168,18 +175,21 @@
 
         String msg="";
         String result="";
+        String code="0";
 
         try {
             pgCsDocumentDtoList = pgCsDocumentManager.getAllDocData(cs_name);
-            if (pgCsDocumentDtoList != null)
+            if (pgCsDocumentDtoList != null) {
+                code="200";
                 msg = "获取数据成功";
+            }
             else
                 msg = "没有满足条件的数据";
         }catch (Exception e){
             e.printStackTrace();
             msg = "获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgCsDocumentDtoList);
         return resultMap;
@@ -192,20 +202,22 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
 
         String msg = "";
+        String code="0";
         ResponseEntity<byte[]> path = null;
         try {
             PgCsDocument pgCsDocument = pgCsDocumentManager.get(Long.valueOf(id));
             path = pgCsDocumentManager.downloadFile(pgCsDocument);
             if (path == null)
                 msg = "不存在该文档";
-            else
+            else {
+                code = "200";
                 msg = "下载成功";
-
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "下载失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", path.getBody());
         resultMap.put("msg", msg);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
index 94c5c84..ffc8b95 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
@@ -41,22 +41,24 @@
     public Map<String, Object> getPgDeviceByDevType(@FormParam("devType") String devType) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
         try {
-            pgDeviceDtoList = pgDeviceManager.getDeviceByDevTypee(devType);
+            pgDeviceDtoList = pgDeviceManager.getDeviceByDevType(devType);
             if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0){
                 msg="不存在满足要求的数据";
-                resultMap.put("result",null);
             }
             else{
-                resultMap.put("result", pgDeviceDtoList);
+                code="200";
                 msg = "获取成功";
             }
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", pgDeviceDtoList);
         return resultMap;
     }
 
@@ -69,25 +71,26 @@
     public Map<String, Object> getPgDeviceByAssetCode(@FormParam("assetCode") String assetCode) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         PgDeviceDto pgDeviceDto=null;
         try {
             PgDevice pgDevice = pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
             {
                 msg="不存在设备信息";
-                resultMap.put("result",null);
             }
             else {
                 pgDeviceDto = new PgDeviceDto(pgDevice);
                 msg = "获取成功";
-                resultMap.put("result", pgDeviceDto);
+                code="200";
             }
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", pgDeviceDto);
         return resultMap;
     }
 
@@ -102,27 +105,61 @@
                                              @FormParam("devType") String devType)throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
         try {
             pgDeviceDtoList = pgDeviceManager.getAllDevice(road,partition,devType);
             if(pgDeviceDtoList.size()==0) {
                 msg = "没有找到设备信息";
-                resultMap.put("result",null);
             }
             else {
                 msg = "设备信息获取成功";
-                resultMap.put("result", pgDeviceDtoList);
+                code="200";
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result", pgDeviceDtoList);
         return resultMap;
     }
 
     /**
+     * 显示设备列表
+     */
+    @POST
+    @Path("getPgDev")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String, Object> getPgDev(@FormParam("road") String road,
+                                             @FormParam("partition") String partition,
+                                             @FormParam("devType") String devType)throws Exception {
+        Map<String, Object> resultMap = new HashMap<>();
+        String msg="";
+        String code="0";
+        List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
+        try {
+            pgDeviceDtoList = pgDeviceManager.getAllDev(road,partition,devType);
+            if(pgDeviceDtoList.size()==0) {
+                msg = "没有找到设备信息";
+            }
+            else {
+                code="200";
+                msg = "设备信息获取成功";
+            }
+        }catch(Exception e){
+            e.printStackTrace();
+            msg="设备信息获取失败";
+        }
+        resultMap.put("code",code);
+        resultMap.put("msg",msg);
+        resultMap.put("result", pgDeviceDtoList);
+        return resultMap;
+    }
+
+
+    /**
      * 新增设备
      */
     @POST
@@ -145,6 +182,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if (pgDeviceManager.getDeviceByAssetCode(assetCode)!=null) {
@@ -169,6 +207,7 @@
 
                 pgDeviceManager.save(pgDevice);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
 
@@ -177,10 +216,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -208,14 +246,9 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
-            /*
-            if (pgDeviceManager.getDeviceByAssetCode(assetCode)!=null) {
-                result = "false";
-                msg = "已存在同名设备";
-            } else {
-            */
             PgDevice pgDevice = pgDeviceManager.get(Long.valueOf(id));
             pgDevice.setPipeGallery(pipeGallery);
             pgDevice.setPartition(partition);
@@ -233,14 +266,14 @@
 
             pgDeviceManager.save(pgDevice);
             result = "true";
+            code="200";
             msg = "编辑成功";
-            //}
         } catch (Exception e) {
             result = "false";
             msg = "编辑失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("result",result);
         resultMap.put("msg",msg);
         return resultMap;
@@ -256,7 +289,8 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
-        String result="false";
+        String result="";
+        String code="0";
 
         try {
             PgDevice pgDevice=pgDeviceManager.get(Long.valueOf(id));
@@ -268,6 +302,7 @@
             {
                 pgDevice.setActive(0);
                 pgDeviceManager.save(pgDevice);
+                code="200";
                 msg="设备删除成功";
                 result="true";
             }
@@ -276,6 +311,7 @@
             msg="设备删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -291,18 +327,18 @@
     {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         PgDeviceDto pgDeviceDto=null;
 
         try{
             PgDevice pgDevice=pgDeviceManager.getDeviceBydevCode(devCode);
             if(pgDevice==null) {
                 msg = "设备信息获取失败";
-                resultMap.put("result",null);
             }
             else{
                 pgDeviceDto = new PgDeviceDto(pgDevice);
                 msg = "设备信息获取成功";
-                resultMap.put("result",pgDeviceDto);
+                code="200";
             }
         }
         catch(Exception ex)
@@ -310,8 +346,9 @@
             ex.printStackTrace();
             msg="设备状态获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgDeviceDto);
         return resultMap;
     }
 
@@ -324,17 +361,17 @@
     public Map<String,Object> getDeviceByPartition(@FormParam("partition") String partition) throws Exception{
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<PgDeviceDto>();
 
         try{
             pgDeviceDtoList=pgDeviceManager.getPgDeviceDtoListByPartition(partition);
             if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0) {
                 msg = "设备信息获取失败";
-                resultMap.put("result",null);
             }
             else {
+                code="200";
                 msg = "设备信息获取成功";
-                resultMap.put("result",pgDeviceDtoList);
             }
         }
         catch(Exception e)
@@ -342,8 +379,9 @@
             e.printStackTrace();
             msg="设备信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgDeviceDtoList);
         return resultMap;
     }
 
@@ -353,17 +391,16 @@
     public Map<String,Object> getDeviceByOldDAssetCodeCode(@FormParam("assetCode") String assetCode) throws Exception{
         Map<String, Object> resultMap = new HashMap<>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
 
         try{
             pgDeviceDtoList=pgDeviceManager.getDeviceByOldDAssetCodeCode(assetCode);
-            if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0) {
-                msg = "设备信息获取失败";;
-                resultMap.put("result",null);
-            }
+            if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0)
+                msg = "设备信息获取失败";
             else {
                 msg = "设备信息获取成功";
-                resultMap.put("result",pgDeviceDtoList);
+                code="200";
             }
         }
         catch(Exception e)
@@ -372,8 +409,9 @@
             msg="设备信息获取失败";
             resultMap.put("result",null);
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgDeviceDtoList);
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java
index 421d249..f6f167d 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java
@@ -38,17 +38,21 @@
     public Map<String, Object> getDeviceTpeyList()throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgDeviceTypeDto> pgDeviceTypeDtoList=new ArrayList<PgDeviceTypeDto>();
         try {
             pgDeviceTypeDtoList = pgDeviceTypeManager.getAllDeviceType();
             if(pgDeviceTypeDtoList.size()==0)
                 msg="没有找到设备类型信息";
-            else
-                msg="设备类型信息获取成功";
+            else {
+                code="200";
+                msg = "设备类型信息获取成功";
+            }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备类型信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgDeviceTypeDtoList);
         return resultMap;
@@ -66,6 +70,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if (pgDeviceTypeManager.getDeviceTypeByDeType(devType)!=null) {
@@ -79,6 +84,7 @@
 
                 pgDeviceTypeManager.save(pgDeviceType);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
 
@@ -87,10 +93,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
index c276fb3..c789960 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
@@ -44,6 +44,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 
         try {
@@ -62,6 +63,7 @@
                 pgEquipment.setActive(1);
 
                 pgEquipmentManager.save(pgEquipment);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -70,9 +72,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -89,9 +91,10 @@
                                             @FormParam("ownerUnit") String ownerUnit,
                                             @FormParam("enterDate") String enterDate,
                                             @FormParam("curUser") String curUser) {
-        HashMap<String, Object> resultMap = new HashMap<String, Object>();
+        HashMap<String, Object> resultMap = new HashMap<>();
         String msg = "";
         String result = "";
+        String code="0";
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 
         try {
@@ -111,6 +114,7 @@
                 pgEquipment.setEnterDate(sdf.parse(enterDate));
 
                 pgEquipmentManager.save(pgEquipment);
+                code="200";
                 msg="编辑成功";
                 result="true";
             }
@@ -119,9 +123,9 @@
             result = "false";
             msg = "编辑失败";
         }
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -134,16 +138,19 @@
     public Map<String, Object> getEquipment(@FormParam("eqName") String eqName,
                                             @FormParam("eqCode") String eqCode,
                                             @FormParam("eqType") String eqType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        List<PgEquipmentDto> pgEquipmentDtoList=new ArrayList<PgEquipmentDto>();
+        String code="0";
+        List<PgEquipmentDto> pgEquipmentDtoList=new ArrayList<>();
 
         try{
             pgEquipmentDtoList=pgEquipmentManager.getEquipmentDtiList(eqName,eqCode,eqType);
             if(pgEquipmentDtoList==null||pgEquipmentDtoList.size()==0)
                 msg="不存在工器具记录";
-            else
-                msg="维获取成功";
+            else {
+                code = "200";
+                msg = "维获取成功";
+            }
         }
         catch(Exception e)
         {
@@ -166,6 +173,7 @@
         HashMap<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
         String result = "";
+        String code="";
 
         try {
             PgEquipment pgEquipment=pgEquipmentManager.get(Long.valueOf(id));
@@ -178,6 +186,7 @@
             {
                 pgEquipment.setActive(0);
                 pgEquipmentManager.save(pgEquipment);
+                code="200";
                 msg="删除成功";
                 result="true";
             }
@@ -186,6 +195,7 @@
             msg="设备信息获取失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -201,16 +211,19 @@
             throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=new ArrayList<PgDeviceTypeStatisticDto>();
 
         try {
             pgDeviceTypeStatisticDtoList=pgEquipmentManager.getDeviceStatisticByDevType(eqType);
 
+            code="200";
             msg = "获取成功";
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceTypeStatisticDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
index 05a9709..a90fd6c 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
@@ -4,9 +4,9 @@
 import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
 import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
 import com.casic.PgInterface.intelPlan.manager.PgPileAcuManager;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import com.casic.PgInterface.test.PlanData;
 import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.ModelAttribute;
 
 import javax.annotation.Resource;
 import javax.ws.rs.FormParam;
@@ -32,23 +32,25 @@
     public Map<String,Object> getPlanResult(@FormParam("planParamStr") String planParamStr){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
-        //List<PgPlanTask> pgPlanTaskList=pgPlanParams.getPgPlanTaskList();
         List<PgPlanTask> pgPlanTaskList=new PgPlanParams().getPgPlanParamsByString(planParamStr);
         List<PgPlanResultRe> pgPlanResultReList=new ArrayList<>();
 
-        try{
-                pgPlanResultReList=pgPileAcuManager.getPgPlanResultList(pgPlanTaskList);
-                if(pgPlanResultReList==null)
-                    msg="管线智能规划出错";
-                else
-                    msg="管线智能规划完成";
+        try {
+            pgPlanResultReList = pgPileAcuManager.getPgPlanResultList(pgPlanTaskList);
+            if (pgPlanResultReList == null)
+                msg = "管线智能规划出错";
+            else {
+                code="200";
+                msg = "管线智能规划完成";
+            }
         }
         catch(Exception ex){
             msg="智能规划出错";
             ex.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgPlanResultReList);
 
@@ -80,4 +82,30 @@
         return resultMap;
     }
 
+    @POST
+    @Path("getPlanTask")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getACUTask(@FormParam("pileAcuList") String pileAcuList){
+
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        String code="0";
+        List<PgAcuTask> pgAcuTaskList=new ArrayList<>();
+
+        try{
+            pgAcuTaskList=pgPileAcuManager.getACUTask(pileAcuList);
+            code="200";
+            msg="任务获取成功";
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            msg="任务获取失败";
+        }
+        resultMap.put("code",code);
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgAcuTaskList);
+
+        return resultMap;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
index ff85c61..66eec76 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
@@ -55,13 +55,13 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         try {
             PgInPgPerson pgInPgPerson = null;//pgInPgPersonManager.getPersonByUserName(userName);
             int iHostName = pgTagMacManager.getCount("select count(1) from PGTagMac where hostname = ?",assetCode);
-//            int iTagMac = pgTagMacManager.getCount("select count(1) from PGTagMac where tagmac = ?",assetCode.toUpperCase());
             if (0==iHostName)
             {
                 result = "false";
@@ -92,9 +92,8 @@
 
                 pgInPgStatusManager.save(pgInPgStatus);
 
-//                String syResult=pgInPgPersonManager.synchorizedInPgInfo(assetCode,userCode,userName,personType);
+                code="200";
                 result = "true";
-//                msg = "人员注册保存成功"+syResult;
                 msg = "人员注册保存成功";
             }
             else {
@@ -106,6 +105,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -120,6 +120,7 @@
     public Map<String, Object> getInPgPerson() throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<>();
         try {
@@ -127,11 +128,15 @@
             if (pgInPgInfoDtoList == null || pgInPgInfoDtoList.size() == 0)
                 msg = "没有找到入廊人员信息";
             else
+            {
+                code="200";
                 msg = "入廊人员信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "入廊人员信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
         return resultMap;
@@ -146,18 +151,22 @@
     public Map<String, Object> getInPgPersonInPg() throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
 
-        List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<PgInPgInfoDto>();
+        List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<>();
         try {
             pgInPgInfoDtoList = pgInPgPersonManager.getPgInPersonList(1);
             if (pgInPgInfoDtoList == null || pgInPgInfoDtoList.size() == 0)
                 msg = "没有找到入廊人员信息";
-            else
+            else {
+                code="200";
                 msg = "入廊人员信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "入廊人员信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
         return resultMap;
@@ -172,6 +181,7 @@
     public Map<String, Object> getInPgPersonByName(@FormParam("userName") String userName) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
 
         PgInPgPerson pgInPgPerson = null;
         PgInPgPersonDto pgInPgPersonDto=null;
@@ -184,12 +194,13 @@
                 pgInPgPersonDto=new PgInPgPersonDto(pgInPgPerson);
                 pgInPgPersonDtoList.add(pgInPgPersonDto);
                 msg = "人员信息获取成功";
+                code="200";
             }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "人员信息获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgPersonDtoList);
         return resultMap;
@@ -206,6 +217,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             PgInPgPerson pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName);
@@ -221,6 +233,7 @@
                     pgInPgPersonManager.save(pgInPgPerson);
                     result = "true";
                     msg = "编辑成功";
+                    code="200";
                 }
             }
         } catch (Exception e) {
@@ -228,9 +241,9 @@
             msg = "编辑失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -244,10 +257,12 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         int inPgNum=0;
         String msg = "";
+        String code="0";
 
         try{
             inPgNum=pgInPgStatusManager.getInPgNum();
 
+            code="200";
             msg="人员入廊次数获取成功";
         }
         catch(Exception e)
@@ -255,6 +270,7 @@
             e.printStackTrace();
             msg="人员入廊次数获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",inPgNum);
 
@@ -272,18 +288,22 @@
                                                    @FormParam("statisticType") String statisticType) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
 
         List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<PgInPgInfoDto>();
         try {
             pgInPgInfoDtoList = pgInPgPersonManager.getPgInPersonListByTime(startTime, endTime, statisticType);
             if(pgInPgInfoDtoList==null)
                 msg="入廊人员统计信息获取失败";
-            else
-                msg="入廊人员统计信息获取成功";
+            else {
+                code="200";
+                msg = "入廊人员统计信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "入廊人员统计信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
         return resultMap;
@@ -296,6 +316,7 @@
 
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
 
         try {
@@ -304,8 +325,10 @@
                 pgDeviceDtoList=pgDeviceManager.getPgCameraListByPosition("",apCodeStr);
                 if(pgDeviceDtoList==null)
                     msg="不存在关联摄像机";
-                else
-                    msg="关联摄像机获取成功";
+                else {
+                    code="200";
+                    msg = "关联摄像机获取成功";
+                }
             } else {
                 msg="请输入Ap编号";
             }
@@ -315,6 +338,7 @@
             msg="关联摄像机获取成功";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgDeviceDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java
index 507b3fe..b43f077 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java
@@ -34,6 +34,7 @@
 
         String result="";
         String msg="";
+        String code="";
         try{
             PgInPgStatus pgInPgStatus=new PgInPgStatus();
 
@@ -44,6 +45,7 @@
             pgInPgStatusManager.save(pgInPgStatus);
             msg="入廊时间提交成功";
             result="true";
+            code="200";
         }
         catch (Exception e){
             e.printStackTrace();
@@ -51,6 +53,7 @@
             result="false";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -66,6 +69,7 @@
 
         String result="";
         String msg="";
+        String code="0";
         try{
             PgInPgPerson pgInPgPerson=pgInPgPersonManager.getPgInPgPersonByAssetCode(assetCode);
 
@@ -79,6 +83,7 @@
             pgInPgStatusManager.save(pgInPgStatus);
 
             msg="出廊时间提交成功";
+            code="200";
             result="true";
         }
         catch (Exception e){
@@ -87,6 +92,7 @@
             result="false";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
index 9def330..9c0ba1f 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
@@ -33,17 +33,20 @@
                                             @FormParam("existNum") String existNum) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         String result="";
 
         try {
             pgIntelPlanManager.savePgIntelPlan(parName,lineName,maxNum,existNum);
             msg="规划数据保存成功";
+            code="200";
             result="true";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "规划数据保存失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
@@ -55,15 +58,18 @@
     public Map<String, Object> getIntelLineType() throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgIntelPlanTypeDto> pgIntelPlanTypeDtoList=new ArrayList<>();
         try {
             pgIntelPlanTypeDtoList=pgIntelPlanManager.getIntelPlanType();
+            code="200";
             msg="获取排线类型成功";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "获取排线类型失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgIntelPlanTypeDtoList);
         return resultMap;
@@ -76,6 +82,7 @@
                                             @FormParam("partitionStr") String partitionStr) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgIntelPlanDto> pgIntelPlanDtoList = new ArrayList<>();
 
@@ -83,8 +90,10 @@
             pgIntelPlanDtoList = pgIntelPlanManager.getPgIntelPlanListByPartion(lineName, partitionStr);
             if(pgIntelPlanDtoList==null||pgIntelPlanDtoList.size()==0)
                 msg="请输入正确的规划参数";
-            else
-                msg="规划数据获取成功";
+            else {
+                code="200";
+                msg = "规划数据获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "规划数据获取失败";
@@ -103,10 +112,12 @@
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
         String result="";
+        String code="0";
 
         try {
             boolean bl=pgIntelPlanManager.addLineUse(lineName,partitionStr,num);
             if(bl){
+                code="200";
                 msg="排线入廊成功";
                 result="true";
             }
@@ -119,6 +130,7 @@
             msg = "排线入廊失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
@@ -132,6 +144,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
         String result="";
+        String code="0";
 
         try {
             PgIntelPlan pgIntelPlan=pgIntelPlanManager.getPgIntelPlanByParNameAndLine(lineName,parName);
@@ -140,11 +153,13 @@
             pgIntelPlanManager.save(pgIntelPlan);
             msg="规划数据删除成功";
             result="true";
+            code="200";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "规划数据删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java b/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java
index 378af00..9c39523 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java
@@ -1,5 +1,6 @@
 package com.casic.PgInterface.rs;
 
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
 import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
 import com.casic.PgInterface.intelPlan.dto.PgLineHoleDTO;
 import com.casic.PgInterface.intelPlan.manager.PgLineHoleManager;
@@ -27,6 +28,9 @@
     @Resource
     private PgPileAcuManager pgPileAcuManager;
 
+    @Resource
+    private PgRoadManager pgRoadManager;
+
     @POST
     @Path("getPgLineAcuHole")
     @Produces(MediaType.APPLICATION_JSON)
@@ -34,23 +38,32 @@
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
         String result="";
+        String code="0";
         List<PgLineHoleDTO> pgLineHoleDTOList=new ArrayList<>();
 
         try {
             PgPileAcu pgPileAcu=pgPileAcuManager.getPgPileAcuByCode(acuCode);
             if(pgPileAcu==null){
                 msg="不存在分区";
-            }else{
-                pgLineHoleDTOList=pgLineHoleManager.getCurrentHoleByAcu(pgPileAcu.getId());
-                if(pgLineHoleDTOList!=null&&pgLineHoleDTOList.size()!=0)
-                    msg="获取成功";
-                else
-                    msg="未找到入廊数据";
+            }else {
+                pgLineHoleDTOList = pgLineHoleManager.getCurrentHoleByAcu(pgPileAcu.getId());
+                if (pgLineHoleDTOList != null && pgLineHoleDTOList.size() != 0)
+                {
+                    code="200";
+                    msg = "获取成功";
+                }
+                else {
+                    PgLineHoleDTO pgLineHoleDTO=new PgLineHoleDTO();
+                    pgLineHoleDTO.setRoad(pgRoadManager.get(pgPileAcu.getRoadId()).getRoadName());
+                    pgLineHoleDTOList.add(pgLineHoleDTO);
+                    msg = "未找到入廊数据";
+                }
             }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgLineHoleDTOList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgLogRs.java b/src/main/java/com/casic/PgInterface/rs/PgLogRs.java
index 39cff52..30db63b 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgLogRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgLogRs.java
@@ -45,6 +45,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         PgLog pgLog=new PgLog();
         try {
             PgUser pgUser = new PgUser();
@@ -60,14 +61,15 @@
             pgLogManager.save(pgLog);
             result = "true";
             msg = "保存成功";
-
+            code="200";
         } catch (Exception e) {
             result = "false";
             msg = "保存失败";
             e.printStackTrace();
         }
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -83,17 +85,21 @@
             throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgLogDto> pgLogDtoList = new ArrayList<PgLogDto>();
         try {
             pgLogDtoList = pgLogManager.getAllLogs(userName, startTime, endTime);
             if (pgLogDtoList == null || pgLogDtoList.size() == 0)
                 msg = "没有找到日志信息";
-            else
+            else {
+                code="200";
                 msg = "日志信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "日志信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgLogDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java
index 9fd0a5f..37b72f6 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java
@@ -36,19 +36,23 @@
         Map<String,Object> resultMap=new HashMap<>();
 
         String msg = "";
+        String code="0";
         List<PgMaintainType> pgMaintainTypeList=new ArrayList<>();
         try{
             pgMaintainTypeList=pgMaintainTypeManager.getMaintainType();
             if(pgMaintainTypeList!=null&&pgMaintainTypeList.size()!=0)
                 msg="不存在运维类别";
-            else
-                msg="运维类别获取成功";
+            else {
+                code="200";
+                msg = "运维类别获取成功";
+            }
         }
         catch(Exception ex)
         {
             ex.printStackTrace();
             msg="运维类别获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgMaintainTypeList);
 
@@ -65,10 +69,11 @@
         Map<String,Object> resultMap=new HashMap<>();
 
         String msg = "";
+        String code="0";
         List<PgMaintainTypeDto> pgMaintainTypeDtoList=new ArrayList<PgMaintainTypeDto>();
         try{
             pgMaintainTypeDtoList=pgMaintainTypeManager.getMaintainTypeModel(type);
-
+            code="200";
             msg="维护类型获取成功";
         }
         catch(Exception ex)
@@ -77,9 +82,9 @@
             msg="维护类型获取失败";
         }
 
-        resultMap.put("result",pgMaintainTypeDtoList);
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgMaintainTypeDtoList);
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java
index d735cc9..82ffca4 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java
@@ -33,12 +33,16 @@
                                                  @FormParam("endTime") String endTime){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
         List<PgMaintanceRecordHeadDto> pgMaintanceRecordHeadDtoList=new ArrayList<>();
         try{
             pgMaintanceRecordHeadDtoList=pgMaintanceRecordHeadManager.getPgMaintanceRecordHeadLsit(repairMan,startTime,endTime);
             if(pgMaintanceRecordHeadDtoList!=null&&pgMaintanceRecordHeadDtoList.size()!=0)
+            {
+                code="200";
                 msg="维护信息获取成功";
+            }
             else
                 msg="不存在维护信息";
         }
@@ -47,6 +51,7 @@
             msg="巡检信息获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgMaintanceRecordHeadDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java
index effc9df..9f46fc8 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java
@@ -32,12 +32,16 @@
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
         String result="";
+        String code="0";
 
         List<PgMaintanceRecordHeadStatic> pgMaintanceRecordHeadStaticList=new ArrayList<>();
         try{
             pgMaintanceRecordHeadStaticList=pgMaintanceRecordHeadManager.getPgMaintanceRecordHeadStaticLisByTime(startTime,endTime,staticType);
             if(pgMaintanceRecordHeadStaticList!=null&&pgMaintanceRecordHeadStaticList.size()!=0)
+            {
+                code="200";
                 msg="维护统计信息获取成功";
+            }
             else
                 msg="维护统计失败";
         }
@@ -46,7 +50,7 @@
             ex.printStackTrace();
             msg="统计失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgMaintanceRecordHeadStaticList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java b/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java
index 3a67bf3..6a5f4dc 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java
@@ -39,27 +39,31 @@
     @Path("getO2InfoByDevAndDate")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getO2InfoByDevAndDate(@FormParam("assetCode") String assetCode,
-                                                      @FormParam("startDate") String startDate,
-                                                      @FormParam("endDate") String endDate)throws Exception {
+                                                     @FormParam("startDate") String startDate,
+                                                     @FormParam("endDate") String endDate)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgHistoryDataDto> pgHistoryDataDtoList=new ArrayList<>();
 
         try {
             PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
                 msg="设备不存在";
-            else{
-                pgHistoryDataDtoList=pgO2Manager.getAllO2Data(pgDevice, startDate, endDate);
-                if(pgHistoryDataDtoList==null)
-                    msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+            else {
+                pgHistoryDataDtoList = pgO2Manager.getAllO2Data(pgDevice, startDate, endDate);
+                if (pgHistoryDataDtoList == null)
+                    msg = "没有满足要求的数据";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgHistoryDataDtoList);
         return resultMap;
@@ -75,23 +79,27 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         PgO2Dto pgO2Dto=new PgO2Dto(null);
 
         try {
             PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
                 msg="设备不存在";
-            else{
-                pgO2Dto=pgO2Manager.getNewestO2Data(pgDevice);
-                if(pgO2Dto==null)
-                    msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+            else {
+                pgO2Dto = pgO2Manager.getNewestO2Data(pgDevice);
+                if (pgO2Dto == null)
+                    msg = "没有满足要求的数据";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgO2Dto);
         return resultMap;
@@ -104,11 +112,12 @@
     @Path("addO2Data")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> addO2Data(@FormParam("devCode") String devCode,
-                                          @FormParam("upTime") String upTime,
-                                          @FormParam("o2") String o2)throws Exception {
+                                         @FormParam("upTime") String upTime,
+                                         @FormParam("o2") String o2)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
@@ -125,6 +134,7 @@
                 pgO2.setPgDeviceId(pgDevice);
 
                 pgO2Manager.save(pgO2);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -133,9 +143,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java b/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java
index 6217cde..70b3b41 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java
@@ -30,8 +30,6 @@
 public class PgOverViewRs {
 
     @Resource
-    private PgInPgPersonManager pgInPgPersonManager;
-    @Resource
     private PgInPgStatusManager pgInPgStatusManager;
     @Resource
     private PgAlarmManager pgAlarmManager;
@@ -46,18 +44,21 @@
     @Path("getPersonNumInPgByMonth")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<Object, String> getMonthInPgPersonNum() throws Exception {
-        Map<Object, String> resultMap = new HashMap<Object, String>();
+        Map<Object, String> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         int inNum = 0;
 
         try {
             inNum = pgInPgStatusManager.getMonthInPgPersonNum();
+            code="200";
             msg = "本月入廊人员次数获取成功";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "本月入廊人员次数获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", String.valueOf(inNum));
 
@@ -73,15 +74,18 @@
     public Map<Object, String> getWeekInPgPersonNum() throws Exception {
         Map<Object, String> resultMap = new HashMap<Object, String>();
         String msg = "";
+        String code="0";
         int inNum = 0;
         try {
             inNum = pgInPgStatusManager.getWeekInPgPersonNum();
+            code="200";
             msg = "本周入廊人员次数获取成功";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "本周入廊人员次数获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", String.valueOf(inNum));
 
@@ -97,19 +101,22 @@
     public Map<String, Object> getDayInPgStatistic() throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<>();
         try {
             pgInPgInfoDtoList = pgInPgStatusManager.getPgInPersonListByDay();
             if (pgInPgInfoDtoList == null)
                 msg = "信息获取失败";
-            else
+            else {
+                code="200";
                 msg = "信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "信息获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
         return resultMap;
@@ -124,18 +131,23 @@
     public Map<String, Object> getTodayInPgInfo() throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
 
         List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<PgInPgInfoDto>();
         try {
             pgInPgInfoDtoList = pgInPgStatusManager.getTodayInPgInfo();
             if(pgInPgInfoDtoList!=null||pgInPgInfoDtoList.size()!=0)
+            {
+                code="200";
                 msg = "信息获取成功";
+            }
             else
                 msg="当天没有入廊人员信息";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
 
@@ -149,18 +161,22 @@
     public Map<String, Object> getAlarmNum(@FormParam("isDevFault") String isDevFault) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         int num = 0;
 
         try {
             if(isDevFault!=null){
                 num = pgAlarmManager.getAlarmNum(isDevFault);
-                msg = "报警数量获取成功";}
+                msg = "报警数量获取成功";
+                code="200";
+            }
             else
                 msg="请输入统计参数";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警数量统计失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", num);
 
@@ -176,16 +192,18 @@
     public Map<Object, String> getMonthAlarmNum(@FormParam("isDevFault") String isDevFault) throws Exception {
         Map<Object, String> resultMap = new HashMap<Object, String>();
         String msg = "";
+        String code="0";
         int inNum = 0;
 
         try {
-                inNum = pgAlarmManager.getMonthAlarmNum(isDevFault);
-                msg = "报警次数获取成功";
+            inNum = pgAlarmManager.getMonthAlarmNum(isDevFault);
+            code="200";
+            msg = "报警次数获取成功";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警次数获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", String.valueOf(inNum));
 
@@ -201,15 +219,17 @@
     public Map<Object, String> getWeekAlarmNum(@FormParam("isDevFault") String isDevFault) throws Exception {
         Map<Object, String> resultMap = new HashMap<Object, String>();
         String msg = "";
+        String code="0";
         int inNum = 0;
         try {
             inNum = pgAlarmManager.getWeekAlarmNum(isDevFault);
+            code="200";
             msg = "报警次数获取成功";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警次数获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", String.valueOf(inNum));
 
@@ -225,14 +245,17 @@
     public Map<String, Object> getDayAlarmStatistic() throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgAlarmTjDto> pgAlarmTjDtoList = new ArrayList<PgAlarmTjDto>();
         try {
             pgAlarmTjDtoList = pgAlarmManager.getDayAlarmStatistic();
             if (pgAlarmTjDtoList == null)
                 msg = "信息获取失败";
-            else
+            else {
+                code="200";
                 msg = "信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "信息获取失败";
@@ -252,9 +275,11 @@
     public Map<String, Object> getAlarmList(@FormParam("isDevFault") String isDevFault) throws Exception{
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         List<PgAlarmDto> pgAlarmDtoList=new ArrayList<>();
         try{
             pgAlarmDtoList=pgAlarmManager.getAlarmList(isDevFault);
+            code="200";
             msg="信息获取成功";
         }
         catch(Exception e)
@@ -262,6 +287,7 @@
             e.printStackTrace();
             msg="信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAlarmDtoList);
 
@@ -278,17 +304,19 @@
     public Map<String,Object> getConstructionNum() throws Exception{
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgConstructionTypeNumStatisticDto> pgConstructionTypeNumDtoList=new ArrayList<PgConstructionTypeNumStatisticDto>();
         try{
             pgConstructionTypeNumDtoList=pgConstructionManager.getConstructionNum();
             msg="施工数量获取成功";
+            code="200";
         }
         catch(Exception e)
         {
             e.printStackTrace();
             msg="施工数量统计";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionTypeNumDtoList);
 
@@ -302,21 +330,25 @@
     @Path("getConstructionToday")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> getConstructionToday() throws Exception{
-        Map<String,Object > resultMap = new HashMap<String,Object>();
+        Map<String,Object > resultMap = new HashMap<>();
         String msg = "";
-        List<PgConstructionDto> pgConstructionDtoList=new ArrayList<PgConstructionDto>();
+        String code="0";
+        List<PgConstructionDto> pgConstructionDtoList=new ArrayList<>();
         try {
             pgConstructionDtoList = pgConstructionManager.getConstructionToday();
-            if (pgConstructionDtoList == null&&pgConstructionDtoList.size()==0)
+            if (pgConstructionDtoList == null && pgConstructionDtoList.size() == 0)
                 msg = "不存在施工信息";
-            else
+            else {
+                code="200";
                 msg = "施工信息获取成功";
+            }
         }
         catch(Exception e)
         {
             e.printStackTrace();
             msg="施工信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
 

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 25ded8a..283d7ab 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,20 +7,56 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" 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/construction/manager/PgCsDocumentManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/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/manager/PgAlarmManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/~$说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/~$说明20191207.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.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$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/接口说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明20191207.docx" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
@@ -51,7 +87,7 @@
         <counts>
           <entry key="class" value="4" />
           <entry key="iml" value="2" />
-          <entry key="java" value="707" />
+          <entry key="java" value="820" />
           <entry key="properties" value="14" />
           <entry key="xml" value="7" />
         </counts>
@@ -60,7 +96,7 @@
         <counts>
           <entry key="CLASS" value="4" />
           <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="707" />
+          <entry key="JAVA" value="820" />
           <entry key="Properties" value="14" />
           <entry key="XML" value="7" />
         </counts>
@@ -68,32 +104,32 @@
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
           <entry key="dummy" value="38" />
-          <entry key="java" value="30161" />
+          <entry key="java" value="40859" />
           <entry key="properties" value="100" />
-          <entry key="txt" value="176" />
+          <entry key="txt" value="186" />
           <entry key="xml" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="30161" />
-          <entry key="PLAIN_TEXT" value="214" />
+          <entry key="JAVA" value="40859" />
+          <entry key="PLAIN_TEXT" value="224" />
           <entry key="Properties" value="100" />
           <entry key="XML" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="48" />
+          <entry key="project.closed" value="51" />
           <entry key="project.open.time.1" value="5" />
           <entry key="project.open.time.12" value="2" />
           <entry key="project.open.time.13" value="1" />
           <entry key="project.open.time.15" value="1" />
           <entry key="project.open.time.16" value="1" />
           <entry key="project.open.time.17" value="1" />
-          <entry key="project.open.time.2" value="1" />
+          <entry key="project.open.time.2" value="2" />
           <entry key="project.open.time.20" value="1" />
-          <entry key="project.open.time.23" value="1" />
+          <entry key="project.open.time.23" value="2" />
           <entry key="project.open.time.24" value="2" />
           <entry key="project.open.time.251" value="1" />
           <entry key="project.open.time.27" value="2" />
@@ -106,8 +142,8 @@
           <entry key="project.open.time.36" value="1" />
           <entry key="project.open.time.37" value="1" />
           <entry key="project.open.time.39" value="2" />
-          <entry key="project.open.time.4" value="2" />
-          <entry key="project.open.time.40" value="1" />
+          <entry key="project.open.time.4" value="3" />
+          <entry key="project.open.time.40" value="2" />
           <entry key="project.open.time.41" value="2" />
           <entry key="project.open.time.42" value="2" />
           <entry key="project.open.time.43" value="2" />
@@ -122,23 +158,25 @@
           <entry key="project.open.time.6" value="3" />
           <entry key="project.open.time.63" value="2" />
           <entry key="project.open.time.64" value="1" />
+          <entry key="project.open.time.66" value="1" />
           <entry key="project.open.time.71" value="2" />
+          <entry key="project.open.time.74" value="1" />
           <entry key="project.open.time.76" value="1" />
           <entry key="project.open.time.8" value="2" />
           <entry key="project.open.time.9" value="1" />
           <entry key="project.open.time.97" value="1" />
-          <entry key="project.opened" value="78" />
+          <entry key="project.opened" value="84" />
         </counts>
       </usages-collector>
     </session>
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+            <state relative-caret-position="396">
+              <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
               <folding>
                 <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
                 <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -147,73 +185,6 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <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="99">
-              <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-              <folding>
-                <element signature="imports" expanded="true" />
-                <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-1170">
-              <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state>
-              <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
-              <folding>
-                <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-                <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="true">
-        <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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-              <folding>
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-                <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>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <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="352">
-              <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -225,18 +196,9 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>inCriteria</find>
-      <find>getPgPlanResulList</find>
-      <find>getPileAcuListByPileAcuStr</find>
-      <find>distinct</find>
-      <find>order</find>
-      <find>canPlanLine</find>
-      <find>isExistLine</find>
-      <find>getPlanResult</find>
       <find>pgPipeLine</find>
       <find>getPipeLineBylineName</find>
       <find>StringU</find>
-      <find>getAllAlarm</find>
       <find>getAlarmList</find>
       <find>getPgInPersonListByDay</find>
       <find>getDayInPgStatistic</find>
@@ -254,7 +216,16 @@
       <find>getPgContructionByNameOrType</find>
       <find>&quot;&quot;,&quot;&quot;,</find>
       <find>getPgContructionDtoByNameOrType</find>
+      <find>addConstruction</find>
+      <find>getPgLineAcuHole</find>
+      <find>getPlanResult</find>
       <find>getConstruction</find>
+      <find>addPipeLine</find>
+      <find>未找到入廊数据</find>
+      <find>getCurrentHoleByAcu</find>
+      <find>getAllAlarm</find>
+      <find>getPgDeviceDtoListByPartition</find>
+      <find>getPgDeviceByDevType</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -263,57 +234,57 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlan.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileHoleManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/planData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/PlanData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
       </list>
     </option>
   </component>
@@ -359,7 +330,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -421,53 +391,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="dto" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="manager" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -479,29 +402,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="rs" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -516,6 +416,7 @@
         </subPane>
       </pane>
       <pane id="Scope" />
+      <pane id="PackagesPane" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -710,7 +611,13 @@
       <workItem from="1574902733573" duration="1829000" />
       <workItem from="1574998240004" duration="7016000" />
       <workItem from="1575247959683" duration="6997000" />
-      <workItem from="1575704345590" duration="40473000" />
+      <workItem from="1575704345590" duration="69381000" />
+      <workItem from="1575869479666" duration="721000" />
+      <workItem from="1575947104878" duration="6101000" />
+      <workItem from="1576128264436" duration="3347000" />
+      <workItem from="1576208571543" duration="22000" />
+      <workItem from="1576227513917" duration="862000" />
+      <workItem from="1576293721220" duration="18246000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -817,11 +724,18 @@
       <option name="project" value="LOCAL" />
       <updated>1575775489149</updated>
     </task>
-    <option name="localTasksCounter" value="16" />
+    <task id="LOCAL-00016" summary="整改施工信息">
+      <created>1575791780774</created>
+      <option name="number" value="00016" />
+      <option name="presentableId" value="LOCAL-00016" />
+      <option name="project" value="LOCAL" />
+      <updated>1575791780774</updated>
+    </task>
+    <option name="localTasksCounter" value="17" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="452131000" />
+    <option name="totallyTimeSpent" value="510338000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -834,9 +748,8 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
-    <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.24205749" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2647504" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -847,7 +760,7 @@
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.3295082" />
       <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.4819672" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.65737706" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.3295082" />
@@ -939,7 +852,8 @@
     <MESSAGE value="重新设计智能规划部分" />
     <MESSAGE value="完成智能规划对接" />
     <MESSAGE value="修改报警统计" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改报警统计" />
+    <MESSAGE value="整改施工信息" />
+    <option name="LAST_COMMIT_MESSAGE" value="整改施工信息" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -951,16 +865,10 @@
           <option name="timeStamp" value="3" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java</url>
-          <line>69</line>
+          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java</url>
+          <line>40</line>
           <properties />
-          <option name="timeStamp" value="21" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java</url>
-          <line>96</line>
-          <properties />
-          <option name="timeStamp" value="38" />
+          <option name="timeStamp" value="122" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
@@ -970,394 +878,452 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <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="2068">
-          <caret line="154" column="35" selection-start-line="154" selection-start-column="35" selection-end-line="154" selection-end-column="35" />
-        </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="3300">
-          <caret line="297" column="22" selection-start-line="297" selection-start-column="22" selection-end-line="297" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/StringUtils.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
-          <caret line="13" column="48" lean-forward="true" selection-start-line="13" selection-start-column="48" selection-end-line="13" selection-end-column="48" />
+          <caret line="11" column="5" selection-start-line="11" selection-start-column="5" selection-end-line="11" selection-end-column="5" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="78" lean-forward="true" selection-start-line="78" selection-end-line="78" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="616">
-          <caret line="41" column="1" selection-start-line="41" selection-start-column="1" selection-end-line="41" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="110">
-          <caret line="12" column="23" selection-start-line="12" selection-start-column="23" selection-end-line="12" selection-end-column="23" />
+        <state relative-caret-position="516">
+          <caret line="114" column="12" selection-start-line="114" selection-start-column="12" selection-end-line="114" selection-end-column="12" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="164">
-          <caret line="56" lean-forward="true" selection-start-line="56" selection-end-line="56" />
+        <state relative-caret-position="418">
+          <caret line="33" column="44" selection-start-line="33" selection-start-column="44" selection-end-line="33" selection-end-column="44" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="258">
-          <caret line="27" column="12" lean-forward="true" selection-start-line="27" selection-start-column="12" selection-end-line="27" selection-end-column="12" />
+        <state relative-caret-position="132">
+          <caret line="11" column="20" lean-forward="true" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="20" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.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="-12">
-          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        <state relative-caret-position="516">
+          <caret line="142" column="54" selection-start-line="142" selection-start-column="54" selection-end-line="142" selection-end-column="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="858">
-          <caret line="55" column="27" lean-forward="true" selection-start-line="55" selection-start-column="27" selection-end-line="55" selection-end-column="27" />
+        <state relative-caret-position="66">
+          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="58">
+          <caret line="18" column="28" selection-start-line="18" selection-start-column="19" selection-end-line="18" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="305">
+          <caret line="24" column="31" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="714">
+          <caret line="58" column="5" lean-forward="true" selection-start-line="58" selection-start-column="5" selection-end-line="58" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="924">
+          <caret line="134" column="92" selection-start-line="134" selection-start-column="92" selection-end-line="134" selection-end-column="92" />
+          <folding>
+            <element signature="method#linkDevice#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkPartitionCamera#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkReservePlan#0;class#PgAlarmLinkRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1066">
+          <caret line="90" lean-forward="true" selection-start-line="90" selection-end-line="90" />
+          <folding>
+            <element signature="method#getTjResultByAlarmType#0;class#PgAlarmTjRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="946">
+          <caret line="148" column="11" lean-forward="true" selection-start-line="148" selection-start-column="11" selection-end-line="148" selection-end-column="11" />
+          <folding>
+            <element signature="method#getAlarmTypeList#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#addAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#editAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#deleteAlarmType#0;class#PgAlarmTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="208">
+          <caret line="46" column="23" lean-forward="true" selection-start-line="46" selection-start-column="23" selection-end-line="46" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="113" column="9" lean-forward="true" selection-start-line="113" selection-start-column="9" selection-end-line="113" selection-end-column="9" />
+          <folding>
+            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
+            <element signature="method#getNewestCh4InfoByDev#0;class#PgCh4Rs#0" />
+            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="145" column="6" lean-forward="true" selection-start-line="145" selection-start-column="6" selection-end-line="145" selection-end-column="6" />
+          <folding>
+            <element signature="method#addAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#editAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#deleteAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#getAuthorityList#0;class#PgAuthorityRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="58" column="1" lean-forward="true" selection-start-line="58" selection-start-column="1" selection-end-line="58" selection-end-column="1" />
+          <folding>
+            <element signature="method#getPgAssetPlanList#0;class#PgAssetPlanRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="370">
+          <caret line="371" column="66" selection-start-line="371" selection-start-column="66" selection-end-line="371" selection-end-column="66" />
+          <folding>
+            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#searchConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionDev#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="139" column="13" lean-forward="true" selection-start-line="139" selection-start-column="13" selection-end-line="139" selection-end-column="13" />
+          <folding>
+            <element signature="method#getCoInfoByDevAndDate#0;class#PgCoRs#0" />
+            <element signature="method#getNewestCoInfoByDev#0;class#PgCoRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="540">
+          <caret line="223" column="5" lean-forward="true" selection-start-line="223" selection-start-column="5" selection-end-line="223" selection-end-column="5" />
+          <folding>
+            <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="682">
+          <caret line="100" lean-forward="true" selection-start-line="100" selection-end-line="100" />
+          <folding>
+            <element signature="method#getDeviceTpeyList#0;class#PgDeviceTypeRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="377">
+          <caret line="225" column="35" selection-start-line="225" selection-start-column="35" selection-end-line="225" selection-end-column="35" />
+          <folding>
+            <element signature="method#addEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#addEquipment#1;class#PgEquipmentRs#0" />
+            <element signature="method#getEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#deleteEquipment#0;class#PgEquipmentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="406">
+          <caret line="109" lean-forward="true" selection-start-line="109" selection-end-line="109" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="154">
+          <caret line="28" column="19" selection-start-line="28" selection-start-column="19" selection-end-line="28" selection-end-column="19" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="748">
-          <caret line="49" column="5" lean-forward="true" selection-start-line="49" selection-start-column="5" selection-end-line="49" selection-end-column="5" />
+        <state relative-caret-position="296">
+          <caret line="161" column="35" selection-start-line="161" selection-start-column="35" selection-end-line="161" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="384">
+          <caret line="99" column="5" lean-forward="true" selection-start-line="99" selection-start-column="5" selection-end-line="99" selection-end-column="5" />
+        </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="362">
+          <caret line="340" column="35" selection-start-line="340" selection-start-column="35" selection-end-line="340" selection-end-column="35" />
+          <folding>
+            <element signature="method#addInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPersonInPg#0;class#PgInPgPersonRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-606">
+          <caret line="76" column="20" lean-forward="true" selection-start-line="76" selection-start-column="20" selection-end-line="76" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="65" column="35" selection-start-line="65" selection-start-column="35" selection-end-line="65" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="101" column="35" selection-start-line="101" selection-start-column="35" selection-end-line="101" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="84" column="35" selection-start-line="84" selection-start-column="35" selection-end-line="84" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="59" lean-forward="true" selection-start-line="59" selection-end-line="59" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="60" column="1" lean-forward="true" selection-start-line="60" selection-start-column="1" selection-end-line="60" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="145" column="35" selection-start-line="145" selection-start-column="35" selection-end-line="145" selection-end-column="35" />
+        </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="274">
+          <caret line="350" column="35" selection-start-line="350" selection-start-column="35" selection-end-line="350" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="121" column="39" selection-start-line="121" selection-start-column="39" selection-end-line="121" selection-end-column="39" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="28" column="8" lean-forward="true" selection-start-line="28" selection-start-column="8" selection-end-line="28" selection-end-column="8" />
+        <state relative-caret-position="340">
+          <caret line="103" selection-start-line="103" selection-end-line="103" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="226" column="35" selection-start-line="226" selection-start-column="35" selection-end-line="226" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="203" column="35" selection-start-line="203" selection-start-column="35" selection-end-line="203" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="241" column="35" selection-start-line="241" selection-start-column="35" selection-end-line="241" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="225" column="1" lean-forward="true" selection-start-line="225" selection-start-column="1" selection-end-line="225" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="176" column="5" lean-forward="true" selection-start-line="176" selection-start-column="5" selection-end-line="176" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="178" column="35" lean-forward="true" selection-start-line="178" selection-start-column="35" selection-end-line="178" selection-end-column="35" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="516">
-          <caret line="94" column="53" selection-start-line="94" selection-start-column="53" selection-end-line="94" selection-end-column="53" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="814">
-          <caret line="52" column="9" lean-forward="true" selection-start-line="52" selection-start-column="9" selection-end-line="52" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="182">
-          <caret line="58" column="12" lean-forward="true" selection-start-line="58" selection-start-column="12" selection-end-line="58" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="34" lean-forward="true" selection-start-line="34" selection-end-line="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="32" lean-forward="true" selection-start-line="32" selection-end-line="32" />
-          <folding>
-            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
-            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="185">
-          <caret line="63" column="13" selection-start-line="63" selection-start-column="13" selection-end-line="63" selection-end-column="13" />
-          <folding>
-            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
-            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
-            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="e#6319#6324#0" />
-            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
-          </folding>
+          <caret line="240" lean-forward="true" selection-start-line="240" selection-end-line="240" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
-          <caret line="58" column="28" lean-forward="true" selection-start-line="58" selection-start-column="28" selection-end-line="58" selection-end-column="28" />
-          <folding>
-            <element signature="method#addTempHumData#0;class#PgTempHumRs#0" />
-          </folding>
+        <state relative-caret-position="340">
+          <caret line="148" column="34" selection-start-line="148" selection-start-column="34" selection-end-line="148" selection-end-column="34" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
+        <state relative-caret-position="458">
+          <caret line="99" column="35" selection-start-line="99" selection-start-column="35" selection-end-line="99" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+        <state relative-caret-position="384">
+          <caret line="145" column="32" lean-forward="true" selection-start-line="145" selection-start-column="32" selection-end-line="145" selection-end-column="32" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="414">
-          <caret line="22" column="46" lean-forward="true" selection-start-line="22" selection-start-column="46" selection-end-line="22" selection-end-column="46" />
-        </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="396">
-          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" column="83" selection-start-line="11" selection-start-column="83" selection-end-line="11" selection-end-column="83" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="26">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
-          <folding>
-            <element signature="method#getPgInPgStatusByPerson#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNumByName#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNum#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPersonListByDay#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPgStatusByPgInPgPerson#0;class#PgInPgStatusManager#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="44">
-          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-12">
-          <caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="87" lean-forward="true" selection-start-line="87" selection-end-line="87" />
-          <folding>
-            <element signature="method#getConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#addConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#deleteConstructionType#0;class#PgConstructionTypeRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
-          <folding>
-            <element signature="method#getConstructionTypeByType#0;class#PgConstructionTypeManager#0" />
-            <element signature="method#getAllConstructionTypeDto#0;class#PgConstructionTypeManager#0" />
-          </folding>
-        </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="145">
-          <caret line="258" column="9" lean-forward="true" selection-start-line="258" selection-start-column="9" selection-end-line="258" selection-end-column="9" />
-          <folding>
-            <element signature="method#getMonthInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayInPgStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgOverViewRs#0" />
-            <element signature="method#getAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getMonthAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayAlarmStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgOverViewRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="103">
-          <caret line="105" column="50" lean-forward="true" selection-start-line="105" selection-start-column="50" selection-end-line="105" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateBasicDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="99">
-          <caret line="125" selection-start-line="125" selection-end-line="125" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="190">
-          <caret line="24" column="35" lean-forward="true" selection-start-line="24" selection-start-column="35" selection-end-line="24" selection-end-column="35" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="436">
-          <caret line="24" lean-forward="true" selection-start-line="24" selection-end-line="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" lean-forward="true" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="300">
-          <caret line="34" column="31" lean-forward="true" selection-start-line="34" selection-start-column="31" selection-end-line="34" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="42" column="13" lean-forward="true" selection-start-line="42" selection-start-column="13" selection-end-line="42" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="120" column="72" lean-forward="true" selection-start-line="120" selection-start-column="72" selection-end-line="120" selection-end-column="72" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="293">
-          <caret line="58" column="73" lean-forward="true" selection-start-line="58" selection-start-column="73" selection-end-line="58" selection-end-column="73" />
-          <folding>
-            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
-            <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
-          </folding>
-        </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="307">
-          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
+        <state relative-caret-position="758">
+          <caret line="130" column="5" lean-forward="true" selection-start-line="130" selection-start-column="5" selection-end-line="130" selection-end-column="5" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1170">
-          <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
+        <state relative-caret-position="494">
+          <caret line="86" column="62" lean-forward="true" selection-start-line="86" selection-start-column="62" selection-end-line="86" selection-end-column="62" />
           <folding>
-            <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-            <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+            <element signature="method#getAllDevice#0;class#PgDeviceManager#0" />
+            <element signature="method#getAllDev#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="195" column="28" lean-forward="true" selection-start-line="195" selection-start-column="28" selection-end-line="195" selection-end-column="28" />
+        <state relative-caret-position="166">
+          <caret line="174" column="13" lean-forward="true" selection-start-line="174" selection-start-column="13" selection-end-line="174" selection-end-column="13" />
           <folding>
-            <element signature="method#getAlarmByTypeAndTime#0;class#PgAlarmManager#0" />
-            <element signature="method#getAlarmNum#0;class#PgAlarmManager#0" />
             <element signature="method#getDayAlarmStatistic#0;class#PgAlarmManager#0" />
+            <element signature="method#getAlarmList#0;class#PgAlarmManager#0" />
             <element signature="method#createDTO#0;class#PgAlarmManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="364">
+          <caret line="46" column="56" lean-forward="true" selection-start-line="46" selection-start-column="56" selection-end-line="46" selection-end-column="56" />
+          <folding>
+            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
+            <element signature="method#getPgDev#0;class#PgDeviceRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
+            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+        <state relative-caret-position="396">
+          <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
           <folding>
             <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
             <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -1365,52 +1331,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="239">
-          <caret line="21" column="33" lean-forward="true" selection-start-line="21" selection-start-column="33" selection-end-line="21" selection-end-column="33" />
-        </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="352">
-          <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-        </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="99">
-          <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-          </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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-          <folding>
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-            <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>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
index c436c93..e913155 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
@@ -132,7 +132,10 @@
             this.setAlarmType("");
         else
             this.setAlarmType(pgAlarm.getAlarmTypeId().getAlarmType());
-        this.setAlarmValue(pgAlarm.getAlarmValue());
+        if(pgAlarm.getAlarmValue()==null)
+            this.setAlarmValue("");
+        else
+            this.setAlarmValue(pgAlarm.getAlarmValue());
         if (pgAlarm.getAlarmDate() != null)
             this.setAlarmDate(sdf.format(pgAlarm.getAlarmDate()));
         else
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
index a43965c..565cb41 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -159,11 +159,21 @@
     }
 
     //获取历史报警消息列表
-    public List<PgAlarmDto> getAllAlarm(String alarmType,String startDay,String endDay,String isNew,int page,int rows) {
-        try {
+    public  Map<String, Object> getAllAlarm(String alarmType,String partition,String startDay,String endDay,String isNew,int page,int rows) {
 
+        Map<String, Object> resultMap = new HashMap<>();
+        String msg="";
+
+        try {
             Criteria criteria = createCriteria(PgAlarm.class);
 
+            if (StringUtils.isNotBlank(partition)) {
+                DetachedCriteria inCriteria = DetachedCriteria.forClass(PgDevice.class);
+                inCriteria.add(Restrictions.eq("partition", partition));
+                inCriteria.setProjection(Property.forName("id"));
+                criteria.add(Property.forName("alarmDevId").in(inCriteria));
+            }
+
             if (StringUtils.isNotBlank(alarmType)&&!alarmType.contains("全部")&&pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
                 criteria.add(Restrictions.eq("alarmTypeId", pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)));
 
@@ -190,8 +200,16 @@
             for (PgAlarm pgAlarm : pgAlarmList) {
                 pgAlarmDtoList.add(new PgAlarmDto(pgAlarm));
             }
-
-            return pgAlarmDtoList;
+            if(pgAlarmDtoList==null||pgAlarmDtoList.size()==0) {
+                resultMap.put("msg", "没有报警信息");
+                resultMap.put("code","0");
+            }else {
+                resultMap.put("code","200");
+                resultMap.put("msg", "报警信息获取成功");
+            }
+            resultMap.put("count",pg.getTotalCount());
+            resultMap.put("result",pgAlarmDtoList);
+            return resultMap;
         }
         catch(Exception ex){
             ex.printStackTrace();
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index 7547560..654f49e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -24,11 +24,11 @@
 
         Criteria criteria = createCriteria(PgDevice.class);
 
-        if(road!=null)
+        if(StringUtils.isNotBlank(road))
             criteria.add(Restrictions.eq("road",road));
-        if(partition!=null)
+        if(StringUtils.isNotBlank(partition))
             criteria.add(Restrictions.eq("partition",partition));
-        if(devType!=null)
+        if(StringUtils.isNotBlank(devType))
             criteria.add(Restrictions.eq("devType",devType));
 
         criteria.add(Restrictions.eq("active", 1));
@@ -43,6 +43,29 @@
         return pgDeviceDtoList;
     }
 
+    public List<PgDeviceDto> getAllDev(String road,String partition,String devType) {
+
+        Criteria criteria = createCriteria(PgDevice.class);
+
+        if(StringUtils.isNotBlank(road))
+            criteria.add(Restrictions.eq("road",road));
+        if(StringUtils.isNotBlank(partition))
+            criteria.add(Restrictions.eq("partition",partition));
+        if(StringUtils.isNotBlank(devType))
+            criteria.add(Restrictions.like("devType","%"+devType+"%"));
+
+        criteria.add(Restrictions.eq("active", 1));
+        criteria.addOrder(Order.desc("id"));
+        List<PgDevice> pgDeviceList = criteria.list();
+
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
+        for (PgDevice pgDevice : pgDeviceList) {
+            pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
+        }
+
+        return pgDeviceDtoList;
+    }
+
     //根据名字获取当前设备
     public PgDevice getDeviceByAssetCode(String assetCode) {
         Criteria criteria=createCriteria(PgDevice.class);
@@ -56,9 +79,9 @@
     }
 
     //根据类型获取设备列表
-    public List<PgDeviceDto> getDeviceByDevTypee(String devType) {
+    public List<PgDeviceDto> getDeviceByDevType(String devType) {
         Criteria criteria=createCriteria(PgDevice.class);
-        criteria.add(Restrictions.eq("devType",devType));
+        criteria.add(Restrictions.like("devType","%"+devType+"%"));
 
         List<PgDevice> pgDeviceList=criteria.list();
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
@@ -106,7 +129,7 @@
         criteria.add(Restrictions.eq("partition",partition));
 
         List<PgDevice> pgDeviceList=criteria.list();
-        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<PgDeviceDto>();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
 
         for (PgDevice pgDevice : pgDeviceList) {
             pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
index 3a3bccd..595730e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
@@ -1,10 +1,13 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.devTable.domain.PgAlarmType;
 import com.casic.PgInterface.devTable.domain.PgPartition;
 import com.casic.PgInterface.devTable.domain.PgRoad;
 import com.casic.PgInterface.devTable.domain.PipeGallery;
 import com.casic.PgInterface.devTable.dto.PgPartitionDto;
+import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
@@ -12,7 +15,9 @@
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Created by yxw on 2017/11/4.
@@ -21,7 +26,8 @@
 public class PgPartitionManager extends HibernateEntityDao<PgPartition> {
 
     @Resource
-    PgRoadManager pgRoadManager;
+    private PgRoadManager pgRoadManager;
+
 
     public PgPartition getPartitionByParName(String parName) {
         Criteria criteria = getSession().createCriteria(PgPartition.class);
@@ -99,4 +105,5 @@
         return pgPartitionDtoList;
     }
 
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
index f216360..a6928f1 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
@@ -5,6 +5,7 @@
 public class PgPlanResultRe {
 
     private String taskKey;
+    private List<String> pileAcuList;
     private List<PgPlanResult> pgPlanResultList;
 
     public String getTaskKey() {
@@ -15,6 +16,14 @@
         this.taskKey = taskKey;
     }
 
+    public List<String> getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(List<String> pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+
     public List<PgPlanResult> getPgPlanResultList() {
         return pgPlanResultList;
     }
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
index 71ea765..47eea07 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
@@ -54,9 +54,7 @@
 
         List<PgLineHole> pgLineHoleList=criteria.list();
         List<PgLineHoleDTO> pgLineHoleDTOList=new ArrayList<>();
-        if(pgLineHoleList==null||pgLineHoleList.size()==0)
-            return null;
-        else
+        if(pgLineHoleList!=null&&pgLineHoleList.size()!=0)
             pgLineHoleDTOList=PgLineHoleDTO.ConvertToDTOList(pgLineHoleList,pgPileAcuManager,pgRoadManager);
         return pgLineHoleDTOList;
     }
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
index 0fd9e1f..841a386 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
@@ -1,12 +1,15 @@
 package com.casic.PgInterface.intelPlan.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.devTable.domain.PgPartition;
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
 import com.casic.PgInterface.intelPlan.domain.PgLineHole;
 import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
 import com.casic.PgInterface.intelPlan.domain.PgSection;
 import com.casic.PgInterface.intelPlan.dto.PgPlanResult;
 import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
 import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -22,6 +25,9 @@
     @Resource
     private PgLineHoleManager pgLineHoleManager;
 
+    @Resource
+    private PgRoadManager pgRoadManager;
+
     public PgPileAcu getPgPileAcuByCode(String acuCode){
         List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
 
@@ -58,7 +64,9 @@
         for(PgPlanTask pgPlanTask:pgPlanTaskList){
             List<PgPlanResult> pgPlanResultList=getPgPlanResultByPlantask(pgPlanTask);
             PgPlanResultRe pgPlanResultRe=new PgPlanResultRe();
+
             pgPlanResultRe.setTaskKey(pgPlanTask.getTaskKey());
+            pgPlanResultRe.setPileAcuList(pgPlanTask.getPileAcuList());
             pgPlanResultRe.setPgPlanResultList(pgPlanResultList);
 
             pgPlanResultReList.add(pgPlanResultRe);
@@ -142,4 +150,57 @@
         return length;
     }
 
+    private PgPileAcu getPgPileAcuByAcuCode(String acuCode){
+        List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
+
+        if(pgPileAcuList==null||pgPileAcuList.size()==0)
+            return null;
+        else
+            return pgPileAcuList.get(0);
+    }
+
+    public List<PgAcuTask> getACUTask(String pileAcuList){
+        String[] acuArray=pileAcuList.split(",");
+        List<PgAcuTask> pgAcuTaskList=new ArrayList<>();
+
+        for(String acu:acuArray){
+            PgPileAcu pgPileAcu=this.getPgPileAcuByCode(acu);
+            String roadName=pgRoadManager.get(pgPileAcu.getRoadId()).getRoadName();
+
+            if(!containRoad(roadName,pgAcuTaskList))
+            {
+                PgAcuTask pgAcuTask=new PgAcuTask();
+                pgAcuTask.setRoadName(roadName);
+                pgAcuTask.setPileAcuList(acu);
+                pgAcuTaskList.add(pgAcuTask);
+            }
+            else{
+                PgAcuTask pgAcuTask=getIndexRoad(roadName,pgAcuTaskList);
+                if(pgAcuTask!=null)
+                    pgAcuTask.setPileAcuList(pgAcuTask.getPileAcuList()+","+acu);
+            }
+        }
+
+        return pgAcuTaskList;
+    }
+
+    private boolean containRoad(String roadName,List<PgAcuTask> pgAcuTaskList){
+        if(pgAcuTaskList==null||pgAcuTaskList.size()==0) return false;
+        for(PgAcuTask pgAcuTask:pgAcuTaskList){
+            if(pgAcuTask.getRoadName().equals(roadName))
+                return true;
+        }
+
+        return false;
+    }
+
+    private PgAcuTask getIndexRoad(String roadName, List<PgAcuTask> pgAcuTaskList){
+        for(PgAcuTask pgAcuTask:pgAcuTaskList){
+            if(pgAcuTask.getRoadName().equals(roadName))
+                return pgAcuTask;
+        }
+
+        return null;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java
new file mode 100644
index 0000000..323f7ef
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java
@@ -0,0 +1,25 @@
+package com.casic.PgInterface.reservePlan.dto;
+
+import java.util.List;
+
+public class PgAcuTask {
+
+    private String roadName;//道路
+    private String pileAcuList;//acu分区
+
+    public String getRoadName() {
+        return roadName;
+    }
+
+    public void setRoadName(String roadName) {
+        this.roadName = roadName;
+    }
+
+    public String getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(String pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
index c25e926..c7d7693 100644
--- a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
@@ -70,9 +70,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(Long.valueOf(inPgPersonId));
         PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("hostName",pgInPgPerson.getAssetCode());
-//        PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode());
-//        long maxId = pgTagPositionManager.getMaxId(pgTagMac.getTagMac());
-//        PGTagPosition pgTagPosition = pgTagPositionManager.get(maxId);
+
         PGTagPosition pgTagPosition = tagmacRun.GetTagStatus(pgTagMac);
         boolean bExist = false;
         bExist = pgTagPositionManager.findTagPosition(pgTagPosition.getPositionUpdatetime(),pgTagPosition.getHostId());
@@ -104,8 +102,7 @@
         PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(Long.valueOf(inPgPersonId));
         PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pgInPgPersonId",pgInPgPerson);
         System.out.println("time:"+pgInPgStatus.getInTime());
-//        PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pgInPgPersonId",inPgPersonId);
-//        PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode());
+
         PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("hostName",pgInPgPerson.getAssetCode());
 
         Map<Object,Object> mapPosition = new HashMap<>();
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
index 082ba5d..3eed00a 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
@@ -48,6 +48,7 @@
     public Map<String, Object> linkDevice(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         PgDeviceDto pgDeviceDto = null;
         try {
@@ -62,6 +63,7 @@
                     else {
                         pgDeviceDto = new PgDeviceDto(pgDevice);
                         msg = "报警关联设备获取成功";
+                        code="200";
                     }
                 }
             }
@@ -71,6 +73,7 @@
             e.printStackTrace();
             msg = "获取关联设备失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceDto);
 
@@ -86,6 +89,7 @@
     public Map<String, Object> linkPartitionCamera(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
         try {
@@ -106,6 +110,7 @@
 
                         pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(partition,position);
                         msg = "关联设备获取成功";
+                        code="200";
                     }
                 }
             }
@@ -115,6 +120,7 @@
             e.printStackTrace();
             msg = "分区设备关联失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceDtoList);
         return resultMap;
@@ -129,6 +135,7 @@
     public Map<String, Object> linkReservePlan(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgReservePlanDto> pgReservePlanDtoList=new ArrayList<>();
         try{
@@ -139,10 +146,12 @@
                 else {
                     pgReservePlanDtoList = pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
 
-                    if(pgReservePlanDtoList==null||pgReservePlanDtoList.size()==0)
-                        msg="不存在关联的报警预案";
-                    else
+                    if (pgReservePlanDtoList == null || pgReservePlanDtoList.size() == 0)
+                        msg = "不存在关联的报警预案";
+                    else {
                         msg = "关联预案获取成功";
+                        code="200";
+                    }
                 }
             }
             else
@@ -153,6 +162,7 @@
             e.printStackTrace();
             msg="预案关联失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgReservePlanDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
index 0ddbc4d..0ce886b 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
@@ -41,25 +41,19 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getAlarmList(@FormParam("alarmType") String alarmType,
                                             @FormParam("startDay") String startDay,
+                                            @FormParam("partition") String partition,
                                             @FormParam("endDay") String endDay,
                                             @FormParam("isNew") String isNew,
                                             @FormParam("page") int page,
                                             @FormParam("rows") int rows) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
         try {
-            pgAlarmDtoList = pgAlarmManager.getAllAlarm(alarmType,startDay,endDay,isNew,page,rows);
-            if (pgAlarmDtoList==null||pgAlarmDtoList.size() == 0)
-                msg = "没有报警信息";
-            else
-                msg = "报警信息获取成功";
+            resultMap = pgAlarmManager.getAllAlarm(alarmType,partition,startDay,endDay,isNew,page,rows);
+
         } catch (Exception e) {
             e.printStackTrace();
-            msg = "报警信息获取失败";
         }
-        resultMap.put("msg", msg);
-        resultMap.put("result", pgAlarmDtoList);
         return resultMap;
     }
 
@@ -71,9 +65,10 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> clearAlarmList(@FormParam("id") String id) throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        String result = "false";
+        String result = "";
+        String code="0";
 
         try {
             PgAlarm pgAlarm = new PgAlarm();
@@ -86,12 +81,14 @@
                 pgAlarmManager.save(pgAlarm);
                 msg = "报警信息清除成功";
                 result = "true";
+                code = "200";
             }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警信息清除失败";
             result = "false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
@@ -106,21 +103,26 @@
     public Map<String, Object> getAlarmByTypeOrTime(@FormParam("alarmType") String alarmType,
                                                     @FormParam("startTime") String startTime,
                                                     @FormParam("endTime") String endTime) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
-        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<PgAlarmDto>();
+        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
         try {
             pgAlarmDtoList = pgAlarmManager.getAlarmByTypeAndTime(alarmType, startTime, endTime);
             if (pgAlarmDtoList == null || pgAlarmDtoList.size() == 0)
                 msg = "报警信息不存在";
             else
+            {
                 msg = "报警信息获取成功";
+                code="200";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警信息获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
index 29ce8a4..ed0bf34 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
@@ -39,8 +39,8 @@
     public Map<String, Object> getAlarmRule(@FormParam("devType") String devType) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
-        System.out.println("devType:"+devType);
         List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<>();
         try {
             pgAlarmRuleDtoList = pgAlarmRuleManager.getAlarmRuleDto(devType);
@@ -52,6 +52,7 @@
             e.printStackTrace();
             msg = "报警阈值信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmRuleDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
index 24ab894..abef1b1 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
@@ -39,16 +39,21 @@
                                                      @FormParam("endDate") String endDate)throws Exception{
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
+
         List<PgAlarmTjDto> pgAlarmTjDtoList=null;
         try{
             pgAlarmTjDtoList=pgAlarmTjManager.getAlarmTjResultByType(startDate,endDate);
             msg="获取成功";
+            code="200";
         }
         catch(Exception ex) {
             msg = "统计失败";
         }
-        resultMap.put("result",pgAlarmTjDtoList);
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
+        resultMap.put("result",pgAlarmTjDtoList);
+
         return resultMap;
     }
 
@@ -61,23 +66,27 @@
     public Map<String, Object> getAlarmByTime(@FormParam("startTime") String startTime,
                                               @FormParam("endTime") String endTime,
                                               @FormParam("statisticType") String statisticType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code = "0";
 
-        List<PgAlarmTjDto> pgAlarmTjDtoList = new ArrayList<PgAlarmTjDto>();
+        List<PgAlarmTjDto> pgAlarmTjDtoList = new ArrayList<>();
         try {
             pgAlarmTjDtoList = pgAlarmTjManager.getAlarmByTime(startTime, endTime, statisticType);
             if(pgAlarmTjDtoList==null)
                 msg="报警统计信息获取失败";
-            else
-                msg="报警统计信息获取成功";
+            else {
+                msg = "报警统计信息获取成功";
+                code="200";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警统计信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmTjDtoList);
         return resultMap;
     }
 
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
index 28bc811..b6278a9 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
@@ -30,7 +30,6 @@
     @Resource
     private PgAlarmTypeManager pgAlarmTypeManager;
 
-
     /**
      * 获取报警类型
      */
@@ -38,19 +37,24 @@
     @Path("getAlarmType")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getAlarmTypeList()throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
-        List<PgAlarmTypeDto> pgAlarmTypeDtoList=new ArrayList<PgAlarmTypeDto>();
+        String code="";
+
+        List<PgAlarmTypeDto> pgAlarmTypeDtoList=new ArrayList<>();
         try {
             pgAlarmTypeDtoList = pgAlarmTypeManager.getAllAlarmTypeDto();
             if(pgAlarmTypeDtoList.size()==0)
                 msg="没有报警类型信息";
-            else
-                msg="报警类型信息获取成功";
+            else {
+                code="200";
+                msg = "报警类型信息获取成功";
+            }
         }catch(Exception e){
             e.printStackTrace();
             msg="报警类型信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAlarmTypeDtoList);
         return resultMap;
@@ -66,6 +70,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
@@ -83,6 +88,7 @@
                 logger.info("成功保存");
                 result = "true";
                 msg = "保存成功";
+                code="200";
             }
         } catch (Exception e) {
             result = "false";
@@ -90,6 +96,7 @@
             e.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -106,6 +113,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try{
             if(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
@@ -119,6 +127,7 @@
                 pgAlarmTypeManager.save(pgAlarmType);
                 result = "true";
                 msg = "编辑成功";
+                code="200";
             }
         }
         catch(Exception e)
@@ -128,6 +137,7 @@
             e.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("result",result);
         resultMap.put("msg",msg);
 
@@ -146,6 +156,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
         String result="false";
+        String code="0";
 
         try {
             PgAlarmType pgAlarmType=pgAlarmTypeManager.get(Long.valueOf(id));
@@ -157,6 +168,7 @@
             {
                 pgAlarmType.setActive(0);
                 pgAlarmTypeManager.save(pgAlarmType);
+                code="200";
                 msg="报警类型删除成功";
                 result="true";
             }
@@ -165,6 +177,7 @@
             msg="报警类型删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
index 4533e1a..85940bb 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
@@ -33,12 +33,15 @@
                                                  @FormParam("inSpectionPlace") String inSpectionPlace){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
         List<PgAssetPlanDto> pgAssetPlanDtoList=new ArrayList<>();
         try{
             pgAssetPlanDtoList=pgAssetPlanManager.getPgAssetPlanDtoList(startDay,endDay,inSpectionPlace);
-            if(pgAssetPlanDtoList!=null&&pgAssetPlanDtoList.size()!=0)
-                msg="巡检信息获取成功";
+            if(pgAssetPlanDtoList!=null&&pgAssetPlanDtoList.size()!=0) {
+                code="200";
+                msg = "巡检信息获取成功";
+            }
             else
                 msg="不存在巡检信息";
         }
@@ -47,6 +50,7 @@
             msg="巡检信息获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAssetPlanDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
index 47ef9d1..5cbdfcb 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
@@ -30,12 +30,15 @@
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
         String result="";
+        String code="0";
 
         List<PgAssetPlanStatic> pgAssetPlanStaticList = null;
         try{
             pgAssetPlanStaticList=pgAssetPlanManager.getPgAssetPlanStaticLisByTime(startTime,endTime,staticType);
-            if(pgAssetPlanStaticList!=null&&pgAssetPlanStaticList.size()!=0)
-                msg="巡检统计信息获取成功";
+            if(pgAssetPlanStaticList!=null&&pgAssetPlanStaticList.size()!=0) {
+                code = "200";
+                msg = "巡检统计信息获取成功";
+            }
             else
                 msg="统计信息获取失败";
         }
@@ -44,6 +47,7 @@
             msg="统计失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAssetPlanStaticList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
index 26f5d6a..503bfe3 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
@@ -40,6 +40,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="";
 
         try{
             PgAuthority pgAuthority=new PgAuthority();
@@ -50,6 +51,7 @@
 
             pgAuthorityManager.save(pgAuthority);
             msg="用户权限保存成功";
+            code="200";
             result="true";
         }
         catch(Exception e) {
@@ -57,6 +59,7 @@
             msg = "新增权限失败";
             result = "false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -65,22 +68,25 @@
 
     /*
        *编辑角权限信息
-        */
+    */
     @POST
     @Path("editAuthority")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> editAuthority(@FormParam("id") String id,
                                        @FormParam("authority") String authority,
                                        @FormParam("concent") String concent) throws Exception{
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
+
         try {
             PgAuthority pgAuthority=pgAuthorityManager.get(Long.valueOf(id));
             pgAuthority.setAuthority(authority);
             pgAuthority.setConcent(concent);
 
             pgAuthorityManager.save(pgAuthority);
+            code="200";
             msg="权限保存成功";
             result="true";
         }
@@ -90,7 +96,7 @@
             msg="权限编辑失败";
             result="false";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -105,9 +111,10 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> deleteAuthority(@FormParam("id") String id)throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
-        String result="false";
+        String result="";
+        String code="0";
 
         try {
             PgAuthority pgAuthority= pgAuthorityManager.get(Long.valueOf(id));
@@ -119,6 +126,7 @@
             {
                 pgAuthority.setActive(0);
                 pgAuthorityManager.save(pgAuthority);
+                code="200";
                 msg="删除权限成功";
                 result="true";
             }
@@ -127,37 +135,40 @@
             msg="删除权限失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
     }
 
     /*
-* 获取权限信息
- */
+    * 获取权限信息
+    */
     @POST
     @Path("getAuthorityList")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> getAuthorityList() {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgAuthorityDto> pgAuthorityDtoList = new ArrayList<PgAuthorityDto>();
         try {
             pgAuthorityDtoList = pgAuthorityManager.getAuthorityList();
             if (pgAuthorityDtoList == null)
                 msg = "不存在权限信息";
-            else
+            else {
+                code = "200";
                 msg = "权限信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "权限信息获取是失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAuthorityDtoList);
         return resultMap;
     }
 
 
-
-
 }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
index a9ef521..a74ecc7 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
@@ -45,6 +45,7 @@
                                                @FormParam("endDate") String endDate)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgHistoryDataDto> pgHistoryDataDtoList=new ArrayList<>();
 
         try {
@@ -55,13 +56,16 @@
                 pgHistoryDataDtoList=pgCh4Manager.getAllCH4Data(pgDevice,startDate,endDate);
                 if(pgHistoryDataDtoList==null)
                     msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+                else {
+                    code = "200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgHistoryDataDtoList);
         return resultMap;
@@ -75,8 +79,9 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getNewestCh4InfoByDev(@FormParam("assetCode") String assetCode)throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
+        String code="0";
         PgCh4Dto pgCh4Dto=new PgCh4Dto(null);
 
         try {
@@ -87,13 +92,17 @@
                 pgCh4Dto=pgCh4Manager.getNewestCH4Data(pgDevice);
                 if(pgCh4Dto==null)
                     msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgCh4Dto);
         return resultMap;
@@ -111,6 +120,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
@@ -127,6 +137,7 @@
                 pgCh4.setPgDeviceId(pgDevice);
 
                 pgCh4Manager.save(pgCh4);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -135,7 +146,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
index a7eac39..dfc8ca5 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
@@ -43,23 +43,27 @@
                                                       @FormParam("endDate") String endDate)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgHistoryDataDto> pgHistoryDataDtoList=new ArrayList<>();
 
         try {
             PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
                 msg="设备不存在";
-            else{
-                pgHistoryDataDtoList=pgCoManager.getAllCoData(pgDevice, startDate, endDate);
-                if(pgHistoryDataDtoList==null)
-                    msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+            else {
+                pgHistoryDataDtoList = pgCoManager.getAllCoData(pgDevice, startDate, endDate);
+                if (pgHistoryDataDtoList == null)
+                    msg = "没有满足要求的数据";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgHistoryDataDtoList);
         return resultMap;
@@ -75,6 +79,7 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         PgCoDto pgCoDto=new PgCoDto(null);
 
         try {
@@ -85,13 +90,16 @@
                 pgCoDto=pgCoManager.getNewestCoData(pgDevice);
                 if(pgCoDto==null)
                     msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgCoDto);
         return resultMap;
@@ -110,6 +118,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         try {
@@ -126,6 +135,7 @@
 
                 pgCoManager.save(pgCo);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
         } catch (Exception e) {
@@ -133,7 +143,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
index b4b826e..9af98a3 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
@@ -60,6 +60,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         try {
 
@@ -80,8 +81,8 @@
                 pgConstruction.setPgConstructionTypeId(pgConstructionType.getId());
                 pgConstruction.setActive(1);
                 pgConstruction.setParName(parName);
-                logger.info("保存成功");
                 pgConstructionManager.save(pgConstruction);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -90,6 +91,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("success", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -116,6 +118,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
@@ -140,6 +143,7 @@
                 pgConstruction.setParName(parName);
 
                 pgConstructionManager.save(pgConstruction);
+                code="200";
                 result = "true";
                 msg = "编辑成功";
             }
@@ -150,7 +154,7 @@
             e.printStackTrace();
 
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -167,6 +171,8 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
+
         try {
             PgConstruction pgConstruction = pgConstructionManager.get(Long.valueOf(id));
             if (pgConstruction == null)
@@ -177,6 +183,7 @@
             {
                 pgConstruction.setActive(0);
                 pgConstructionManager.save(pgConstruction);
+                code="200";
                 result = "true";
                 msg = "成功删除信息";
             }
@@ -185,6 +192,7 @@
             result = "false";
             msg = "删除失败";
         }
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -204,9 +212,11 @@
                                                   @FormParam("rows") int rows)throws Exception{
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
         List<PgConstructionDto> pgConstructionDtoList=new ArrayList<>();
         try{
             pgConstructionDtoList=pgConstructionManager.getPgContructionDto(cs_name,cs_type,startTime,endTime,page,rows);
+            code="200";
             msg="信息获取成功";
         }
         catch(Exception e)
@@ -214,6 +224,7 @@
             e.printStackTrace();
             msg="查询失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
 
@@ -231,18 +242,22 @@
                                                               @FormParam("statisticType") String statisticType) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgConstructionStiatistic> pgConstructionStiatisticList=new ArrayList<>();
         try {
             pgConstructionStiatisticList = pgConstructionManager.getConstructionByTimeAndStatus(startTime, endTime, statisticType);
             if(pgConstructionStiatisticList==null)
                 msg="施工统计信息获取失败";
-            else
-                msg="施工统计信息获取成功";
+            else {
+                code="200";
+                msg = "施工统计信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "施工统计信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgConstructionStiatisticList);
         return resultMap;
@@ -257,6 +272,7 @@
     public Map<String, Object> getConstructionByType(@FormParam("statisticType") String statisticType){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
         List<PgConstructionStiatistic> pgConstructionStiatisticList=new ArrayList<>();
 
         try{
@@ -268,6 +284,7 @@
                 resultMap.put("result",null);
             }
             else {
+                code="200";
                 msg = "统计信息获取成功";
                 resultMap.put("result", pgConstructionStiatisticList);
             }
@@ -278,6 +295,7 @@
             msg="统计失败";
             resultMap.put("result",null);
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         return resultMap;
     }
@@ -291,9 +309,11 @@
     public Map<String, Object> getConstructionToday() throws Exception{
         Map<String,Object> resultMap=new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgConstructionDto> pgConstructionDtoList=new ArrayList<PgConstructionDto>();
         try {
             pgConstructionDtoList = pgConstructionManager.getConstructionToday();
+            code="200";
             msg = "当天施工信息获取成功";
         }
         catch(Exception e)
@@ -301,7 +321,7 @@
             e.printStackTrace();
             msg="获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
         return resultMap;
@@ -316,6 +336,7 @@
     public Map<String, Object> getConstructionDev(@FormParam("id") String id) throws Exception{
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
         List<PgDeviceDto> pgDeviceDtoList =new ArrayList<>();
         try{
@@ -325,14 +346,17 @@
 
             if(pgDeviceDtoList==null)
                 msg="信息获取失败";
-            else
-                msg="信息获取成功";
+            else {
+                code="200";
+                msg = "信息获取成功";
+            }
         }
         catch(Exception e)
         {
             e.printStackTrace();
-            msg="设备信息获取成功";
+            msg="信息获取是被";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgDeviceDtoList);
 
@@ -346,17 +370,21 @@
     @Path("getConstruction")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getConstruction() throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
-        List<PgConstructionDto> pgConstructionDtoList=new ArrayList<PgConstructionDto>();
+        String code="0";
+
+        List<PgConstructionDto> pgConstructionDtoList=new ArrayList<>();
 
         try{
             pgConstructionDtoList=pgConstructionManager.getPgConstructionList();
             if(pgConstructionDtoList==null||pgConstructionDtoList.size()==0)
                 msg="不存在施工记录";
-            else
-                msg="施工信息获取成功";
+            else {
+                code = "200";
+                msg = "施工信息获取成功";
+            }
         }
         catch(Exception e)
         {
@@ -364,6 +392,7 @@
             msg="施工信息获取失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java
index fd3d53e..2019502 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java
@@ -39,12 +39,12 @@
         try {
             pgConstructionTypeDtoList = pgConstructionTypeManager.getAllConstructionTypeDto();
             if (pgConstructionTypeDtoList.size() == 0)
-                msg = "没有项目类型信息";
+                msg = "获取失败";
             else
-                msg = "项目类型获取成功";
+                msg = "获取成功";
         } catch (Exception e) {
             e.printStackTrace();
-            msg = "项目类型信息获取失败";
+            msg = "获取失败";
         }
         resultMap.put("msg", msg);
         resultMap.put("result", pgConstructionTypeDtoList);
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
index 90d001c..037a399 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
@@ -51,6 +51,7 @@
 
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if (StringUtils.isBlank(construct_doc)||StringUtils.isBlank(doc_name))
@@ -65,6 +66,7 @@
             pgCsDocument.setActive(1);
             pgCsDocumentManager.save(pgCsDocument);
 
+            code="200";
             result = "true";
             msg = "保存成功";
 
@@ -74,6 +76,7 @@
             ex.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("success", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -90,6 +93,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             PgCsDocument pgCsDocument = pgCsDocumentManager.get(Long.valueOf(id));
@@ -103,6 +107,7 @@
 
                 pgCsDocumentManager.save(pgCsDocument);
 
+                code="200";
                 result = "true";
                 msg = "编辑成功";
             }
@@ -112,6 +117,7 @@
             msg = "编辑失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -125,9 +131,9 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
         String result="";
+        String code="0";
 
         try{
-
             PgCsDocument pgCsDocument = pgCsDocumentManager.get(Long.valueOf(id));
             if(pgCsDocument==null)
             {
@@ -137,6 +143,7 @@
             else{
                 pgCsDocument.setActive(0);
                 pgCsDocumentManager.save(pgCsDocument);
+                code="200";
                 result="true";
                 msg="删除成功";
             }
@@ -147,7 +154,7 @@
             msg="预案删除失败";
             result="false";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -168,18 +175,21 @@
 
         String msg="";
         String result="";
+        String code="0";
 
         try {
             pgCsDocumentDtoList = pgCsDocumentManager.getAllDocData(cs_name);
-            if (pgCsDocumentDtoList != null)
+            if (pgCsDocumentDtoList != null) {
+                code="200";
                 msg = "获取数据成功";
+            }
             else
                 msg = "没有满足条件的数据";
         }catch (Exception e){
             e.printStackTrace();
             msg = "获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgCsDocumentDtoList);
         return resultMap;
@@ -192,20 +202,22 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
 
         String msg = "";
+        String code="0";
         ResponseEntity<byte[]> path = null;
         try {
             PgCsDocument pgCsDocument = pgCsDocumentManager.get(Long.valueOf(id));
             path = pgCsDocumentManager.downloadFile(pgCsDocument);
             if (path == null)
                 msg = "不存在该文档";
-            else
+            else {
+                code = "200";
                 msg = "下载成功";
-
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "下载失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", path.getBody());
         resultMap.put("msg", msg);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
index 94c5c84..ffc8b95 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
@@ -41,22 +41,24 @@
     public Map<String, Object> getPgDeviceByDevType(@FormParam("devType") String devType) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
         try {
-            pgDeviceDtoList = pgDeviceManager.getDeviceByDevTypee(devType);
+            pgDeviceDtoList = pgDeviceManager.getDeviceByDevType(devType);
             if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0){
                 msg="不存在满足要求的数据";
-                resultMap.put("result",null);
             }
             else{
-                resultMap.put("result", pgDeviceDtoList);
+                code="200";
                 msg = "获取成功";
             }
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", pgDeviceDtoList);
         return resultMap;
     }
 
@@ -69,25 +71,26 @@
     public Map<String, Object> getPgDeviceByAssetCode(@FormParam("assetCode") String assetCode) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         PgDeviceDto pgDeviceDto=null;
         try {
             PgDevice pgDevice = pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
             {
                 msg="不存在设备信息";
-                resultMap.put("result",null);
             }
             else {
                 pgDeviceDto = new PgDeviceDto(pgDevice);
                 msg = "获取成功";
-                resultMap.put("result", pgDeviceDto);
+                code="200";
             }
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", pgDeviceDto);
         return resultMap;
     }
 
@@ -102,27 +105,61 @@
                                              @FormParam("devType") String devType)throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
         try {
             pgDeviceDtoList = pgDeviceManager.getAllDevice(road,partition,devType);
             if(pgDeviceDtoList.size()==0) {
                 msg = "没有找到设备信息";
-                resultMap.put("result",null);
             }
             else {
                 msg = "设备信息获取成功";
-                resultMap.put("result", pgDeviceDtoList);
+                code="200";
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result", pgDeviceDtoList);
         return resultMap;
     }
 
     /**
+     * 显示设备列表
+     */
+    @POST
+    @Path("getPgDev")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String, Object> getPgDev(@FormParam("road") String road,
+                                             @FormParam("partition") String partition,
+                                             @FormParam("devType") String devType)throws Exception {
+        Map<String, Object> resultMap = new HashMap<>();
+        String msg="";
+        String code="0";
+        List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
+        try {
+            pgDeviceDtoList = pgDeviceManager.getAllDev(road,partition,devType);
+            if(pgDeviceDtoList.size()==0) {
+                msg = "没有找到设备信息";
+            }
+            else {
+                code="200";
+                msg = "设备信息获取成功";
+            }
+        }catch(Exception e){
+            e.printStackTrace();
+            msg="设备信息获取失败";
+        }
+        resultMap.put("code",code);
+        resultMap.put("msg",msg);
+        resultMap.put("result", pgDeviceDtoList);
+        return resultMap;
+    }
+
+
+    /**
      * 新增设备
      */
     @POST
@@ -145,6 +182,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if (pgDeviceManager.getDeviceByAssetCode(assetCode)!=null) {
@@ -169,6 +207,7 @@
 
                 pgDeviceManager.save(pgDevice);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
 
@@ -177,10 +216,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -208,14 +246,9 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
-            /*
-            if (pgDeviceManager.getDeviceByAssetCode(assetCode)!=null) {
-                result = "false";
-                msg = "已存在同名设备";
-            } else {
-            */
             PgDevice pgDevice = pgDeviceManager.get(Long.valueOf(id));
             pgDevice.setPipeGallery(pipeGallery);
             pgDevice.setPartition(partition);
@@ -233,14 +266,14 @@
 
             pgDeviceManager.save(pgDevice);
             result = "true";
+            code="200";
             msg = "编辑成功";
-            //}
         } catch (Exception e) {
             result = "false";
             msg = "编辑失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("result",result);
         resultMap.put("msg",msg);
         return resultMap;
@@ -256,7 +289,8 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
-        String result="false";
+        String result="";
+        String code="0";
 
         try {
             PgDevice pgDevice=pgDeviceManager.get(Long.valueOf(id));
@@ -268,6 +302,7 @@
             {
                 pgDevice.setActive(0);
                 pgDeviceManager.save(pgDevice);
+                code="200";
                 msg="设备删除成功";
                 result="true";
             }
@@ -276,6 +311,7 @@
             msg="设备删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -291,18 +327,18 @@
     {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         PgDeviceDto pgDeviceDto=null;
 
         try{
             PgDevice pgDevice=pgDeviceManager.getDeviceBydevCode(devCode);
             if(pgDevice==null) {
                 msg = "设备信息获取失败";
-                resultMap.put("result",null);
             }
             else{
                 pgDeviceDto = new PgDeviceDto(pgDevice);
                 msg = "设备信息获取成功";
-                resultMap.put("result",pgDeviceDto);
+                code="200";
             }
         }
         catch(Exception ex)
@@ -310,8 +346,9 @@
             ex.printStackTrace();
             msg="设备状态获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgDeviceDto);
         return resultMap;
     }
 
@@ -324,17 +361,17 @@
     public Map<String,Object> getDeviceByPartition(@FormParam("partition") String partition) throws Exception{
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<PgDeviceDto>();
 
         try{
             pgDeviceDtoList=pgDeviceManager.getPgDeviceDtoListByPartition(partition);
             if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0) {
                 msg = "设备信息获取失败";
-                resultMap.put("result",null);
             }
             else {
+                code="200";
                 msg = "设备信息获取成功";
-                resultMap.put("result",pgDeviceDtoList);
             }
         }
         catch(Exception e)
@@ -342,8 +379,9 @@
             e.printStackTrace();
             msg="设备信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgDeviceDtoList);
         return resultMap;
     }
 
@@ -353,17 +391,16 @@
     public Map<String,Object> getDeviceByOldDAssetCodeCode(@FormParam("assetCode") String assetCode) throws Exception{
         Map<String, Object> resultMap = new HashMap<>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
 
         try{
             pgDeviceDtoList=pgDeviceManager.getDeviceByOldDAssetCodeCode(assetCode);
-            if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0) {
-                msg = "设备信息获取失败";;
-                resultMap.put("result",null);
-            }
+            if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0)
+                msg = "设备信息获取失败";
             else {
                 msg = "设备信息获取成功";
-                resultMap.put("result",pgDeviceDtoList);
+                code="200";
             }
         }
         catch(Exception e)
@@ -372,8 +409,9 @@
             msg="设备信息获取失败";
             resultMap.put("result",null);
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgDeviceDtoList);
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java
index 421d249..f6f167d 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java
@@ -38,17 +38,21 @@
     public Map<String, Object> getDeviceTpeyList()throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgDeviceTypeDto> pgDeviceTypeDtoList=new ArrayList<PgDeviceTypeDto>();
         try {
             pgDeviceTypeDtoList = pgDeviceTypeManager.getAllDeviceType();
             if(pgDeviceTypeDtoList.size()==0)
                 msg="没有找到设备类型信息";
-            else
-                msg="设备类型信息获取成功";
+            else {
+                code="200";
+                msg = "设备类型信息获取成功";
+            }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备类型信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgDeviceTypeDtoList);
         return resultMap;
@@ -66,6 +70,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if (pgDeviceTypeManager.getDeviceTypeByDeType(devType)!=null) {
@@ -79,6 +84,7 @@
 
                 pgDeviceTypeManager.save(pgDeviceType);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
 
@@ -87,10 +93,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
index c276fb3..c789960 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
@@ -44,6 +44,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 
         try {
@@ -62,6 +63,7 @@
                 pgEquipment.setActive(1);
 
                 pgEquipmentManager.save(pgEquipment);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -70,9 +72,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -89,9 +91,10 @@
                                             @FormParam("ownerUnit") String ownerUnit,
                                             @FormParam("enterDate") String enterDate,
                                             @FormParam("curUser") String curUser) {
-        HashMap<String, Object> resultMap = new HashMap<String, Object>();
+        HashMap<String, Object> resultMap = new HashMap<>();
         String msg = "";
         String result = "";
+        String code="0";
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 
         try {
@@ -111,6 +114,7 @@
                 pgEquipment.setEnterDate(sdf.parse(enterDate));
 
                 pgEquipmentManager.save(pgEquipment);
+                code="200";
                 msg="编辑成功";
                 result="true";
             }
@@ -119,9 +123,9 @@
             result = "false";
             msg = "编辑失败";
         }
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -134,16 +138,19 @@
     public Map<String, Object> getEquipment(@FormParam("eqName") String eqName,
                                             @FormParam("eqCode") String eqCode,
                                             @FormParam("eqType") String eqType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        List<PgEquipmentDto> pgEquipmentDtoList=new ArrayList<PgEquipmentDto>();
+        String code="0";
+        List<PgEquipmentDto> pgEquipmentDtoList=new ArrayList<>();
 
         try{
             pgEquipmentDtoList=pgEquipmentManager.getEquipmentDtiList(eqName,eqCode,eqType);
             if(pgEquipmentDtoList==null||pgEquipmentDtoList.size()==0)
                 msg="不存在工器具记录";
-            else
-                msg="维获取成功";
+            else {
+                code = "200";
+                msg = "维获取成功";
+            }
         }
         catch(Exception e)
         {
@@ -166,6 +173,7 @@
         HashMap<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
         String result = "";
+        String code="";
 
         try {
             PgEquipment pgEquipment=pgEquipmentManager.get(Long.valueOf(id));
@@ -178,6 +186,7 @@
             {
                 pgEquipment.setActive(0);
                 pgEquipmentManager.save(pgEquipment);
+                code="200";
                 msg="删除成功";
                 result="true";
             }
@@ -186,6 +195,7 @@
             msg="设备信息获取失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -201,16 +211,19 @@
             throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=new ArrayList<PgDeviceTypeStatisticDto>();
 
         try {
             pgDeviceTypeStatisticDtoList=pgEquipmentManager.getDeviceStatisticByDevType(eqType);
 
+            code="200";
             msg = "获取成功";
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceTypeStatisticDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
index 05a9709..a90fd6c 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
@@ -4,9 +4,9 @@
 import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
 import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
 import com.casic.PgInterface.intelPlan.manager.PgPileAcuManager;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import com.casic.PgInterface.test.PlanData;
 import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.ModelAttribute;
 
 import javax.annotation.Resource;
 import javax.ws.rs.FormParam;
@@ -32,23 +32,25 @@
     public Map<String,Object> getPlanResult(@FormParam("planParamStr") String planParamStr){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
-        //List<PgPlanTask> pgPlanTaskList=pgPlanParams.getPgPlanTaskList();
         List<PgPlanTask> pgPlanTaskList=new PgPlanParams().getPgPlanParamsByString(planParamStr);
         List<PgPlanResultRe> pgPlanResultReList=new ArrayList<>();
 
-        try{
-                pgPlanResultReList=pgPileAcuManager.getPgPlanResultList(pgPlanTaskList);
-                if(pgPlanResultReList==null)
-                    msg="管线智能规划出错";
-                else
-                    msg="管线智能规划完成";
+        try {
+            pgPlanResultReList = pgPileAcuManager.getPgPlanResultList(pgPlanTaskList);
+            if (pgPlanResultReList == null)
+                msg = "管线智能规划出错";
+            else {
+                code="200";
+                msg = "管线智能规划完成";
+            }
         }
         catch(Exception ex){
             msg="智能规划出错";
             ex.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgPlanResultReList);
 
@@ -80,4 +82,30 @@
         return resultMap;
     }
 
+    @POST
+    @Path("getPlanTask")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getACUTask(@FormParam("pileAcuList") String pileAcuList){
+
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        String code="0";
+        List<PgAcuTask> pgAcuTaskList=new ArrayList<>();
+
+        try{
+            pgAcuTaskList=pgPileAcuManager.getACUTask(pileAcuList);
+            code="200";
+            msg="任务获取成功";
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            msg="任务获取失败";
+        }
+        resultMap.put("code",code);
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgAcuTaskList);
+
+        return resultMap;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
index ff85c61..66eec76 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
@@ -55,13 +55,13 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         try {
             PgInPgPerson pgInPgPerson = null;//pgInPgPersonManager.getPersonByUserName(userName);
             int iHostName = pgTagMacManager.getCount("select count(1) from PGTagMac where hostname = ?",assetCode);
-//            int iTagMac = pgTagMacManager.getCount("select count(1) from PGTagMac where tagmac = ?",assetCode.toUpperCase());
             if (0==iHostName)
             {
                 result = "false";
@@ -92,9 +92,8 @@
 
                 pgInPgStatusManager.save(pgInPgStatus);
 
-//                String syResult=pgInPgPersonManager.synchorizedInPgInfo(assetCode,userCode,userName,personType);
+                code="200";
                 result = "true";
-//                msg = "人员注册保存成功"+syResult;
                 msg = "人员注册保存成功";
             }
             else {
@@ -106,6 +105,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -120,6 +120,7 @@
     public Map<String, Object> getInPgPerson() throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<>();
         try {
@@ -127,11 +128,15 @@
             if (pgInPgInfoDtoList == null || pgInPgInfoDtoList.size() == 0)
                 msg = "没有找到入廊人员信息";
             else
+            {
+                code="200";
                 msg = "入廊人员信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "入廊人员信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
         return resultMap;
@@ -146,18 +151,22 @@
     public Map<String, Object> getInPgPersonInPg() throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
 
-        List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<PgInPgInfoDto>();
+        List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<>();
         try {
             pgInPgInfoDtoList = pgInPgPersonManager.getPgInPersonList(1);
             if (pgInPgInfoDtoList == null || pgInPgInfoDtoList.size() == 0)
                 msg = "没有找到入廊人员信息";
-            else
+            else {
+                code="200";
                 msg = "入廊人员信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "入廊人员信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
         return resultMap;
@@ -172,6 +181,7 @@
     public Map<String, Object> getInPgPersonByName(@FormParam("userName") String userName) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
 
         PgInPgPerson pgInPgPerson = null;
         PgInPgPersonDto pgInPgPersonDto=null;
@@ -184,12 +194,13 @@
                 pgInPgPersonDto=new PgInPgPersonDto(pgInPgPerson);
                 pgInPgPersonDtoList.add(pgInPgPersonDto);
                 msg = "人员信息获取成功";
+                code="200";
             }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "人员信息获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgPersonDtoList);
         return resultMap;
@@ -206,6 +217,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             PgInPgPerson pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName);
@@ -221,6 +233,7 @@
                     pgInPgPersonManager.save(pgInPgPerson);
                     result = "true";
                     msg = "编辑成功";
+                    code="200";
                 }
             }
         } catch (Exception e) {
@@ -228,9 +241,9 @@
             msg = "编辑失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -244,10 +257,12 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         int inPgNum=0;
         String msg = "";
+        String code="0";
 
         try{
             inPgNum=pgInPgStatusManager.getInPgNum();
 
+            code="200";
             msg="人员入廊次数获取成功";
         }
         catch(Exception e)
@@ -255,6 +270,7 @@
             e.printStackTrace();
             msg="人员入廊次数获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",inPgNum);
 
@@ -272,18 +288,22 @@
                                                    @FormParam("statisticType") String statisticType) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
 
         List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<PgInPgInfoDto>();
         try {
             pgInPgInfoDtoList = pgInPgPersonManager.getPgInPersonListByTime(startTime, endTime, statisticType);
             if(pgInPgInfoDtoList==null)
                 msg="入廊人员统计信息获取失败";
-            else
-                msg="入廊人员统计信息获取成功";
+            else {
+                code="200";
+                msg = "入廊人员统计信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "入廊人员统计信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
         return resultMap;
@@ -296,6 +316,7 @@
 
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
 
         try {
@@ -304,8 +325,10 @@
                 pgDeviceDtoList=pgDeviceManager.getPgCameraListByPosition("",apCodeStr);
                 if(pgDeviceDtoList==null)
                     msg="不存在关联摄像机";
-                else
-                    msg="关联摄像机获取成功";
+                else {
+                    code="200";
+                    msg = "关联摄像机获取成功";
+                }
             } else {
                 msg="请输入Ap编号";
             }
@@ -315,6 +338,7 @@
             msg="关联摄像机获取成功";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgDeviceDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java
index 507b3fe..b43f077 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java
@@ -34,6 +34,7 @@
 
         String result="";
         String msg="";
+        String code="";
         try{
             PgInPgStatus pgInPgStatus=new PgInPgStatus();
 
@@ -44,6 +45,7 @@
             pgInPgStatusManager.save(pgInPgStatus);
             msg="入廊时间提交成功";
             result="true";
+            code="200";
         }
         catch (Exception e){
             e.printStackTrace();
@@ -51,6 +53,7 @@
             result="false";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -66,6 +69,7 @@
 
         String result="";
         String msg="";
+        String code="0";
         try{
             PgInPgPerson pgInPgPerson=pgInPgPersonManager.getPgInPgPersonByAssetCode(assetCode);
 
@@ -79,6 +83,7 @@
             pgInPgStatusManager.save(pgInPgStatus);
 
             msg="出廊时间提交成功";
+            code="200";
             result="true";
         }
         catch (Exception e){
@@ -87,6 +92,7 @@
             result="false";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
index 9def330..9c0ba1f 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
@@ -33,17 +33,20 @@
                                             @FormParam("existNum") String existNum) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         String result="";
 
         try {
             pgIntelPlanManager.savePgIntelPlan(parName,lineName,maxNum,existNum);
             msg="规划数据保存成功";
+            code="200";
             result="true";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "规划数据保存失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
@@ -55,15 +58,18 @@
     public Map<String, Object> getIntelLineType() throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgIntelPlanTypeDto> pgIntelPlanTypeDtoList=new ArrayList<>();
         try {
             pgIntelPlanTypeDtoList=pgIntelPlanManager.getIntelPlanType();
+            code="200";
             msg="获取排线类型成功";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "获取排线类型失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgIntelPlanTypeDtoList);
         return resultMap;
@@ -76,6 +82,7 @@
                                             @FormParam("partitionStr") String partitionStr) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgIntelPlanDto> pgIntelPlanDtoList = new ArrayList<>();
 
@@ -83,8 +90,10 @@
             pgIntelPlanDtoList = pgIntelPlanManager.getPgIntelPlanListByPartion(lineName, partitionStr);
             if(pgIntelPlanDtoList==null||pgIntelPlanDtoList.size()==0)
                 msg="请输入正确的规划参数";
-            else
-                msg="规划数据获取成功";
+            else {
+                code="200";
+                msg = "规划数据获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "规划数据获取失败";
@@ -103,10 +112,12 @@
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
         String result="";
+        String code="0";
 
         try {
             boolean bl=pgIntelPlanManager.addLineUse(lineName,partitionStr,num);
             if(bl){
+                code="200";
                 msg="排线入廊成功";
                 result="true";
             }
@@ -119,6 +130,7 @@
             msg = "排线入廊失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
@@ -132,6 +144,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
         String result="";
+        String code="0";
 
         try {
             PgIntelPlan pgIntelPlan=pgIntelPlanManager.getPgIntelPlanByParNameAndLine(lineName,parName);
@@ -140,11 +153,13 @@
             pgIntelPlanManager.save(pgIntelPlan);
             msg="规划数据删除成功";
             result="true";
+            code="200";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "规划数据删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java b/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java
index 378af00..9c39523 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java
@@ -1,5 +1,6 @@
 package com.casic.PgInterface.rs;
 
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
 import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
 import com.casic.PgInterface.intelPlan.dto.PgLineHoleDTO;
 import com.casic.PgInterface.intelPlan.manager.PgLineHoleManager;
@@ -27,6 +28,9 @@
     @Resource
     private PgPileAcuManager pgPileAcuManager;
 
+    @Resource
+    private PgRoadManager pgRoadManager;
+
     @POST
     @Path("getPgLineAcuHole")
     @Produces(MediaType.APPLICATION_JSON)
@@ -34,23 +38,32 @@
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
         String result="";
+        String code="0";
         List<PgLineHoleDTO> pgLineHoleDTOList=new ArrayList<>();
 
         try {
             PgPileAcu pgPileAcu=pgPileAcuManager.getPgPileAcuByCode(acuCode);
             if(pgPileAcu==null){
                 msg="不存在分区";
-            }else{
-                pgLineHoleDTOList=pgLineHoleManager.getCurrentHoleByAcu(pgPileAcu.getId());
-                if(pgLineHoleDTOList!=null&&pgLineHoleDTOList.size()!=0)
-                    msg="获取成功";
-                else
-                    msg="未找到入廊数据";
+            }else {
+                pgLineHoleDTOList = pgLineHoleManager.getCurrentHoleByAcu(pgPileAcu.getId());
+                if (pgLineHoleDTOList != null && pgLineHoleDTOList.size() != 0)
+                {
+                    code="200";
+                    msg = "获取成功";
+                }
+                else {
+                    PgLineHoleDTO pgLineHoleDTO=new PgLineHoleDTO();
+                    pgLineHoleDTO.setRoad(pgRoadManager.get(pgPileAcu.getRoadId()).getRoadName());
+                    pgLineHoleDTOList.add(pgLineHoleDTO);
+                    msg = "未找到入廊数据";
+                }
             }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgLineHoleDTOList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgLogRs.java b/src/main/java/com/casic/PgInterface/rs/PgLogRs.java
index 39cff52..30db63b 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgLogRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgLogRs.java
@@ -45,6 +45,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         PgLog pgLog=new PgLog();
         try {
             PgUser pgUser = new PgUser();
@@ -60,14 +61,15 @@
             pgLogManager.save(pgLog);
             result = "true";
             msg = "保存成功";
-
+            code="200";
         } catch (Exception e) {
             result = "false";
             msg = "保存失败";
             e.printStackTrace();
         }
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -83,17 +85,21 @@
             throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgLogDto> pgLogDtoList = new ArrayList<PgLogDto>();
         try {
             pgLogDtoList = pgLogManager.getAllLogs(userName, startTime, endTime);
             if (pgLogDtoList == null || pgLogDtoList.size() == 0)
                 msg = "没有找到日志信息";
-            else
+            else {
+                code="200";
                 msg = "日志信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "日志信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgLogDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java
index 9fd0a5f..37b72f6 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java
@@ -36,19 +36,23 @@
         Map<String,Object> resultMap=new HashMap<>();
 
         String msg = "";
+        String code="0";
         List<PgMaintainType> pgMaintainTypeList=new ArrayList<>();
         try{
             pgMaintainTypeList=pgMaintainTypeManager.getMaintainType();
             if(pgMaintainTypeList!=null&&pgMaintainTypeList.size()!=0)
                 msg="不存在运维类别";
-            else
-                msg="运维类别获取成功";
+            else {
+                code="200";
+                msg = "运维类别获取成功";
+            }
         }
         catch(Exception ex)
         {
             ex.printStackTrace();
             msg="运维类别获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgMaintainTypeList);
 
@@ -65,10 +69,11 @@
         Map<String,Object> resultMap=new HashMap<>();
 
         String msg = "";
+        String code="0";
         List<PgMaintainTypeDto> pgMaintainTypeDtoList=new ArrayList<PgMaintainTypeDto>();
         try{
             pgMaintainTypeDtoList=pgMaintainTypeManager.getMaintainTypeModel(type);
-
+            code="200";
             msg="维护类型获取成功";
         }
         catch(Exception ex)
@@ -77,9 +82,9 @@
             msg="维护类型获取失败";
         }
 
-        resultMap.put("result",pgMaintainTypeDtoList);
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgMaintainTypeDtoList);
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java
index d735cc9..82ffca4 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java
@@ -33,12 +33,16 @@
                                                  @FormParam("endTime") String endTime){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
         List<PgMaintanceRecordHeadDto> pgMaintanceRecordHeadDtoList=new ArrayList<>();
         try{
             pgMaintanceRecordHeadDtoList=pgMaintanceRecordHeadManager.getPgMaintanceRecordHeadLsit(repairMan,startTime,endTime);
             if(pgMaintanceRecordHeadDtoList!=null&&pgMaintanceRecordHeadDtoList.size()!=0)
+            {
+                code="200";
                 msg="维护信息获取成功";
+            }
             else
                 msg="不存在维护信息";
         }
@@ -47,6 +51,7 @@
             msg="巡检信息获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgMaintanceRecordHeadDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java
index effc9df..9f46fc8 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java
@@ -32,12 +32,16 @@
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
         String result="";
+        String code="0";
 
         List<PgMaintanceRecordHeadStatic> pgMaintanceRecordHeadStaticList=new ArrayList<>();
         try{
             pgMaintanceRecordHeadStaticList=pgMaintanceRecordHeadManager.getPgMaintanceRecordHeadStaticLisByTime(startTime,endTime,staticType);
             if(pgMaintanceRecordHeadStaticList!=null&&pgMaintanceRecordHeadStaticList.size()!=0)
+            {
+                code="200";
                 msg="维护统计信息获取成功";
+            }
             else
                 msg="维护统计失败";
         }
@@ -46,7 +50,7 @@
             ex.printStackTrace();
             msg="统计失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgMaintanceRecordHeadStaticList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java b/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java
index 3a67bf3..6a5f4dc 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java
@@ -39,27 +39,31 @@
     @Path("getO2InfoByDevAndDate")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getO2InfoByDevAndDate(@FormParam("assetCode") String assetCode,
-                                                      @FormParam("startDate") String startDate,
-                                                      @FormParam("endDate") String endDate)throws Exception {
+                                                     @FormParam("startDate") String startDate,
+                                                     @FormParam("endDate") String endDate)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgHistoryDataDto> pgHistoryDataDtoList=new ArrayList<>();
 
         try {
             PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
                 msg="设备不存在";
-            else{
-                pgHistoryDataDtoList=pgO2Manager.getAllO2Data(pgDevice, startDate, endDate);
-                if(pgHistoryDataDtoList==null)
-                    msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+            else {
+                pgHistoryDataDtoList = pgO2Manager.getAllO2Data(pgDevice, startDate, endDate);
+                if (pgHistoryDataDtoList == null)
+                    msg = "没有满足要求的数据";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgHistoryDataDtoList);
         return resultMap;
@@ -75,23 +79,27 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         PgO2Dto pgO2Dto=new PgO2Dto(null);
 
         try {
             PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
                 msg="设备不存在";
-            else{
-                pgO2Dto=pgO2Manager.getNewestO2Data(pgDevice);
-                if(pgO2Dto==null)
-                    msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+            else {
+                pgO2Dto = pgO2Manager.getNewestO2Data(pgDevice);
+                if (pgO2Dto == null)
+                    msg = "没有满足要求的数据";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgO2Dto);
         return resultMap;
@@ -104,11 +112,12 @@
     @Path("addO2Data")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> addO2Data(@FormParam("devCode") String devCode,
-                                          @FormParam("upTime") String upTime,
-                                          @FormParam("o2") String o2)throws Exception {
+                                         @FormParam("upTime") String upTime,
+                                         @FormParam("o2") String o2)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
@@ -125,6 +134,7 @@
                 pgO2.setPgDeviceId(pgDevice);
 
                 pgO2Manager.save(pgO2);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -133,9 +143,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java b/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java
index 6217cde..70b3b41 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java
@@ -30,8 +30,6 @@
 public class PgOverViewRs {
 
     @Resource
-    private PgInPgPersonManager pgInPgPersonManager;
-    @Resource
     private PgInPgStatusManager pgInPgStatusManager;
     @Resource
     private PgAlarmManager pgAlarmManager;
@@ -46,18 +44,21 @@
     @Path("getPersonNumInPgByMonth")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<Object, String> getMonthInPgPersonNum() throws Exception {
-        Map<Object, String> resultMap = new HashMap<Object, String>();
+        Map<Object, String> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         int inNum = 0;
 
         try {
             inNum = pgInPgStatusManager.getMonthInPgPersonNum();
+            code="200";
             msg = "本月入廊人员次数获取成功";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "本月入廊人员次数获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", String.valueOf(inNum));
 
@@ -73,15 +74,18 @@
     public Map<Object, String> getWeekInPgPersonNum() throws Exception {
         Map<Object, String> resultMap = new HashMap<Object, String>();
         String msg = "";
+        String code="0";
         int inNum = 0;
         try {
             inNum = pgInPgStatusManager.getWeekInPgPersonNum();
+            code="200";
             msg = "本周入廊人员次数获取成功";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "本周入廊人员次数获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", String.valueOf(inNum));
 
@@ -97,19 +101,22 @@
     public Map<String, Object> getDayInPgStatistic() throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<>();
         try {
             pgInPgInfoDtoList = pgInPgStatusManager.getPgInPersonListByDay();
             if (pgInPgInfoDtoList == null)
                 msg = "信息获取失败";
-            else
+            else {
+                code="200";
                 msg = "信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "信息获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
         return resultMap;
@@ -124,18 +131,23 @@
     public Map<String, Object> getTodayInPgInfo() throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
 
         List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<PgInPgInfoDto>();
         try {
             pgInPgInfoDtoList = pgInPgStatusManager.getTodayInPgInfo();
             if(pgInPgInfoDtoList!=null||pgInPgInfoDtoList.size()!=0)
+            {
+                code="200";
                 msg = "信息获取成功";
+            }
             else
                 msg="当天没有入廊人员信息";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
 
@@ -149,18 +161,22 @@
     public Map<String, Object> getAlarmNum(@FormParam("isDevFault") String isDevFault) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         int num = 0;
 
         try {
             if(isDevFault!=null){
                 num = pgAlarmManager.getAlarmNum(isDevFault);
-                msg = "报警数量获取成功";}
+                msg = "报警数量获取成功";
+                code="200";
+            }
             else
                 msg="请输入统计参数";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警数量统计失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", num);
 
@@ -176,16 +192,18 @@
     public Map<Object, String> getMonthAlarmNum(@FormParam("isDevFault") String isDevFault) throws Exception {
         Map<Object, String> resultMap = new HashMap<Object, String>();
         String msg = "";
+        String code="0";
         int inNum = 0;
 
         try {
-                inNum = pgAlarmManager.getMonthAlarmNum(isDevFault);
-                msg = "报警次数获取成功";
+            inNum = pgAlarmManager.getMonthAlarmNum(isDevFault);
+            code="200";
+            msg = "报警次数获取成功";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警次数获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", String.valueOf(inNum));
 
@@ -201,15 +219,17 @@
     public Map<Object, String> getWeekAlarmNum(@FormParam("isDevFault") String isDevFault) throws Exception {
         Map<Object, String> resultMap = new HashMap<Object, String>();
         String msg = "";
+        String code="0";
         int inNum = 0;
         try {
             inNum = pgAlarmManager.getWeekAlarmNum(isDevFault);
+            code="200";
             msg = "报警次数获取成功";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警次数获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", String.valueOf(inNum));
 
@@ -225,14 +245,17 @@
     public Map<String, Object> getDayAlarmStatistic() throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgAlarmTjDto> pgAlarmTjDtoList = new ArrayList<PgAlarmTjDto>();
         try {
             pgAlarmTjDtoList = pgAlarmManager.getDayAlarmStatistic();
             if (pgAlarmTjDtoList == null)
                 msg = "信息获取失败";
-            else
+            else {
+                code="200";
                 msg = "信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "信息获取失败";
@@ -252,9 +275,11 @@
     public Map<String, Object> getAlarmList(@FormParam("isDevFault") String isDevFault) throws Exception{
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         List<PgAlarmDto> pgAlarmDtoList=new ArrayList<>();
         try{
             pgAlarmDtoList=pgAlarmManager.getAlarmList(isDevFault);
+            code="200";
             msg="信息获取成功";
         }
         catch(Exception e)
@@ -262,6 +287,7 @@
             e.printStackTrace();
             msg="信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAlarmDtoList);
 
@@ -278,17 +304,19 @@
     public Map<String,Object> getConstructionNum() throws Exception{
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgConstructionTypeNumStatisticDto> pgConstructionTypeNumDtoList=new ArrayList<PgConstructionTypeNumStatisticDto>();
         try{
             pgConstructionTypeNumDtoList=pgConstructionManager.getConstructionNum();
             msg="施工数量获取成功";
+            code="200";
         }
         catch(Exception e)
         {
             e.printStackTrace();
             msg="施工数量统计";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionTypeNumDtoList);
 
@@ -302,21 +330,25 @@
     @Path("getConstructionToday")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> getConstructionToday() throws Exception{
-        Map<String,Object > resultMap = new HashMap<String,Object>();
+        Map<String,Object > resultMap = new HashMap<>();
         String msg = "";
-        List<PgConstructionDto> pgConstructionDtoList=new ArrayList<PgConstructionDto>();
+        String code="0";
+        List<PgConstructionDto> pgConstructionDtoList=new ArrayList<>();
         try {
             pgConstructionDtoList = pgConstructionManager.getConstructionToday();
-            if (pgConstructionDtoList == null&&pgConstructionDtoList.size()==0)
+            if (pgConstructionDtoList == null && pgConstructionDtoList.size() == 0)
                 msg = "不存在施工信息";
-            else
+            else {
+                code="200";
                 msg = "施工信息获取成功";
+            }
         }
         catch(Exception e)
         {
             e.printStackTrace();
             msg="施工信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java b/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java
index d3c10d4..31ffcfc 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java
@@ -48,6 +48,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 
         try {
@@ -66,9 +67,9 @@
                 pgPartition.setMaterial(material);
                 pgPartition.setActive(1);
 
-                logger.info("成功保存");
                 pgPartitionManager.save(pgPartition);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
         } catch (Exception e) {
@@ -76,9 +77,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
         return resultMap;
     }
     /*
@@ -100,6 +101,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         PgPartition partition = new PgPartition();
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
@@ -122,6 +124,7 @@
 
                 pgPartitionManager.save(pgPartition);
                 result = "true";
+                code="200";
                 msg = "编辑成功";
             }
 
@@ -131,8 +134,10 @@
             e.printStackTrace();
         }
 
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
+
         return resultMap;
     }
 
@@ -147,7 +152,8 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
-        String result="false";
+        String result="";
+        String code="0";
 
         try {
             PgPartition pgPartition=pgPartitionManager.get(Long.valueOf(id));
@@ -161,12 +167,14 @@
                 pgPartitionManager.save(pgPartition);
                 msg="分区删除成功";
                 result="true";
+                code="200";
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="分区删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -181,14 +189,17 @@
     public Map<String, Object> getPartition() throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgPartitionDto> pgPartitionDtoList = new ArrayList<PgPartitionDto>();
         try {
             pgPartitionDtoList = pgPartitionManager.getPgPartitionDtoList();
+            code="200";
             msg = "获取成功";
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgPartitionDtoList);
         return resultMap;
@@ -203,14 +214,17 @@
     public Map<String, Object> getPartitionListByName(@FormParam("parName") String parName) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgPartitionDto> pgPartitionDtoList = new ArrayList<PgPartitionDto>();
         try {
             pgPartitionDtoList = pgPartitionManager.getPartitionByName(parName);
+            code="200";
             msg = "获取成功";
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgPartitionDtoList);
         return resultMap;

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 25ded8a..283d7ab 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,20 +7,56 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" 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/construction/manager/PgCsDocumentManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/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/manager/PgAlarmManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/~$说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/~$说明20191207.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.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$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/接口说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明20191207.docx" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
@@ -51,7 +87,7 @@
         <counts>
           <entry key="class" value="4" />
           <entry key="iml" value="2" />
-          <entry key="java" value="707" />
+          <entry key="java" value="820" />
           <entry key="properties" value="14" />
           <entry key="xml" value="7" />
         </counts>
@@ -60,7 +96,7 @@
         <counts>
           <entry key="CLASS" value="4" />
           <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="707" />
+          <entry key="JAVA" value="820" />
           <entry key="Properties" value="14" />
           <entry key="XML" value="7" />
         </counts>
@@ -68,32 +104,32 @@
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
           <entry key="dummy" value="38" />
-          <entry key="java" value="30161" />
+          <entry key="java" value="40859" />
           <entry key="properties" value="100" />
-          <entry key="txt" value="176" />
+          <entry key="txt" value="186" />
           <entry key="xml" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="30161" />
-          <entry key="PLAIN_TEXT" value="214" />
+          <entry key="JAVA" value="40859" />
+          <entry key="PLAIN_TEXT" value="224" />
           <entry key="Properties" value="100" />
           <entry key="XML" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="48" />
+          <entry key="project.closed" value="51" />
           <entry key="project.open.time.1" value="5" />
           <entry key="project.open.time.12" value="2" />
           <entry key="project.open.time.13" value="1" />
           <entry key="project.open.time.15" value="1" />
           <entry key="project.open.time.16" value="1" />
           <entry key="project.open.time.17" value="1" />
-          <entry key="project.open.time.2" value="1" />
+          <entry key="project.open.time.2" value="2" />
           <entry key="project.open.time.20" value="1" />
-          <entry key="project.open.time.23" value="1" />
+          <entry key="project.open.time.23" value="2" />
           <entry key="project.open.time.24" value="2" />
           <entry key="project.open.time.251" value="1" />
           <entry key="project.open.time.27" value="2" />
@@ -106,8 +142,8 @@
           <entry key="project.open.time.36" value="1" />
           <entry key="project.open.time.37" value="1" />
           <entry key="project.open.time.39" value="2" />
-          <entry key="project.open.time.4" value="2" />
-          <entry key="project.open.time.40" value="1" />
+          <entry key="project.open.time.4" value="3" />
+          <entry key="project.open.time.40" value="2" />
           <entry key="project.open.time.41" value="2" />
           <entry key="project.open.time.42" value="2" />
           <entry key="project.open.time.43" value="2" />
@@ -122,23 +158,25 @@
           <entry key="project.open.time.6" value="3" />
           <entry key="project.open.time.63" value="2" />
           <entry key="project.open.time.64" value="1" />
+          <entry key="project.open.time.66" value="1" />
           <entry key="project.open.time.71" value="2" />
+          <entry key="project.open.time.74" value="1" />
           <entry key="project.open.time.76" value="1" />
           <entry key="project.open.time.8" value="2" />
           <entry key="project.open.time.9" value="1" />
           <entry key="project.open.time.97" value="1" />
-          <entry key="project.opened" value="78" />
+          <entry key="project.opened" value="84" />
         </counts>
       </usages-collector>
     </session>
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+            <state relative-caret-position="396">
+              <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
               <folding>
                 <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
                 <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -147,73 +185,6 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <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="99">
-              <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-              <folding>
-                <element signature="imports" expanded="true" />
-                <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-1170">
-              <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state>
-              <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
-              <folding>
-                <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-                <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="true">
-        <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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-              <folding>
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-                <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>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <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="352">
-              <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -225,18 +196,9 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>inCriteria</find>
-      <find>getPgPlanResulList</find>
-      <find>getPileAcuListByPileAcuStr</find>
-      <find>distinct</find>
-      <find>order</find>
-      <find>canPlanLine</find>
-      <find>isExistLine</find>
-      <find>getPlanResult</find>
       <find>pgPipeLine</find>
       <find>getPipeLineBylineName</find>
       <find>StringU</find>
-      <find>getAllAlarm</find>
       <find>getAlarmList</find>
       <find>getPgInPersonListByDay</find>
       <find>getDayInPgStatistic</find>
@@ -254,7 +216,16 @@
       <find>getPgContructionByNameOrType</find>
       <find>&quot;&quot;,&quot;&quot;,</find>
       <find>getPgContructionDtoByNameOrType</find>
+      <find>addConstruction</find>
+      <find>getPgLineAcuHole</find>
+      <find>getPlanResult</find>
       <find>getConstruction</find>
+      <find>addPipeLine</find>
+      <find>未找到入廊数据</find>
+      <find>getCurrentHoleByAcu</find>
+      <find>getAllAlarm</find>
+      <find>getPgDeviceDtoListByPartition</find>
+      <find>getPgDeviceByDevType</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -263,57 +234,57 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlan.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileHoleManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/planData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/PlanData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
       </list>
     </option>
   </component>
@@ -359,7 +330,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -421,53 +391,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="dto" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="manager" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -479,29 +402,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="rs" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -516,6 +416,7 @@
         </subPane>
       </pane>
       <pane id="Scope" />
+      <pane id="PackagesPane" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -710,7 +611,13 @@
       <workItem from="1574902733573" duration="1829000" />
       <workItem from="1574998240004" duration="7016000" />
       <workItem from="1575247959683" duration="6997000" />
-      <workItem from="1575704345590" duration="40473000" />
+      <workItem from="1575704345590" duration="69381000" />
+      <workItem from="1575869479666" duration="721000" />
+      <workItem from="1575947104878" duration="6101000" />
+      <workItem from="1576128264436" duration="3347000" />
+      <workItem from="1576208571543" duration="22000" />
+      <workItem from="1576227513917" duration="862000" />
+      <workItem from="1576293721220" duration="18246000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -817,11 +724,18 @@
       <option name="project" value="LOCAL" />
       <updated>1575775489149</updated>
     </task>
-    <option name="localTasksCounter" value="16" />
+    <task id="LOCAL-00016" summary="整改施工信息">
+      <created>1575791780774</created>
+      <option name="number" value="00016" />
+      <option name="presentableId" value="LOCAL-00016" />
+      <option name="project" value="LOCAL" />
+      <updated>1575791780774</updated>
+    </task>
+    <option name="localTasksCounter" value="17" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="452131000" />
+    <option name="totallyTimeSpent" value="510338000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -834,9 +748,8 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
-    <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.24205749" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2647504" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -847,7 +760,7 @@
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.3295082" />
       <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.4819672" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.65737706" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.3295082" />
@@ -939,7 +852,8 @@
     <MESSAGE value="重新设计智能规划部分" />
     <MESSAGE value="完成智能规划对接" />
     <MESSAGE value="修改报警统计" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改报警统计" />
+    <MESSAGE value="整改施工信息" />
+    <option name="LAST_COMMIT_MESSAGE" value="整改施工信息" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -951,16 +865,10 @@
           <option name="timeStamp" value="3" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java</url>
-          <line>69</line>
+          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java</url>
+          <line>40</line>
           <properties />
-          <option name="timeStamp" value="21" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java</url>
-          <line>96</line>
-          <properties />
-          <option name="timeStamp" value="38" />
+          <option name="timeStamp" value="122" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
@@ -970,394 +878,452 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <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="2068">
-          <caret line="154" column="35" selection-start-line="154" selection-start-column="35" selection-end-line="154" selection-end-column="35" />
-        </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="3300">
-          <caret line="297" column="22" selection-start-line="297" selection-start-column="22" selection-end-line="297" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/StringUtils.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
-          <caret line="13" column="48" lean-forward="true" selection-start-line="13" selection-start-column="48" selection-end-line="13" selection-end-column="48" />
+          <caret line="11" column="5" selection-start-line="11" selection-start-column="5" selection-end-line="11" selection-end-column="5" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="78" lean-forward="true" selection-start-line="78" selection-end-line="78" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="616">
-          <caret line="41" column="1" selection-start-line="41" selection-start-column="1" selection-end-line="41" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="110">
-          <caret line="12" column="23" selection-start-line="12" selection-start-column="23" selection-end-line="12" selection-end-column="23" />
+        <state relative-caret-position="516">
+          <caret line="114" column="12" selection-start-line="114" selection-start-column="12" selection-end-line="114" selection-end-column="12" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="164">
-          <caret line="56" lean-forward="true" selection-start-line="56" selection-end-line="56" />
+        <state relative-caret-position="418">
+          <caret line="33" column="44" selection-start-line="33" selection-start-column="44" selection-end-line="33" selection-end-column="44" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="258">
-          <caret line="27" column="12" lean-forward="true" selection-start-line="27" selection-start-column="12" selection-end-line="27" selection-end-column="12" />
+        <state relative-caret-position="132">
+          <caret line="11" column="20" lean-forward="true" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="20" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.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="-12">
-          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        <state relative-caret-position="516">
+          <caret line="142" column="54" selection-start-line="142" selection-start-column="54" selection-end-line="142" selection-end-column="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="858">
-          <caret line="55" column="27" lean-forward="true" selection-start-line="55" selection-start-column="27" selection-end-line="55" selection-end-column="27" />
+        <state relative-caret-position="66">
+          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="58">
+          <caret line="18" column="28" selection-start-line="18" selection-start-column="19" selection-end-line="18" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="305">
+          <caret line="24" column="31" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="714">
+          <caret line="58" column="5" lean-forward="true" selection-start-line="58" selection-start-column="5" selection-end-line="58" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="924">
+          <caret line="134" column="92" selection-start-line="134" selection-start-column="92" selection-end-line="134" selection-end-column="92" />
+          <folding>
+            <element signature="method#linkDevice#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkPartitionCamera#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkReservePlan#0;class#PgAlarmLinkRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1066">
+          <caret line="90" lean-forward="true" selection-start-line="90" selection-end-line="90" />
+          <folding>
+            <element signature="method#getTjResultByAlarmType#0;class#PgAlarmTjRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="946">
+          <caret line="148" column="11" lean-forward="true" selection-start-line="148" selection-start-column="11" selection-end-line="148" selection-end-column="11" />
+          <folding>
+            <element signature="method#getAlarmTypeList#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#addAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#editAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#deleteAlarmType#0;class#PgAlarmTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="208">
+          <caret line="46" column="23" lean-forward="true" selection-start-line="46" selection-start-column="23" selection-end-line="46" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="113" column="9" lean-forward="true" selection-start-line="113" selection-start-column="9" selection-end-line="113" selection-end-column="9" />
+          <folding>
+            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
+            <element signature="method#getNewestCh4InfoByDev#0;class#PgCh4Rs#0" />
+            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="145" column="6" lean-forward="true" selection-start-line="145" selection-start-column="6" selection-end-line="145" selection-end-column="6" />
+          <folding>
+            <element signature="method#addAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#editAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#deleteAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#getAuthorityList#0;class#PgAuthorityRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="58" column="1" lean-forward="true" selection-start-line="58" selection-start-column="1" selection-end-line="58" selection-end-column="1" />
+          <folding>
+            <element signature="method#getPgAssetPlanList#0;class#PgAssetPlanRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="370">
+          <caret line="371" column="66" selection-start-line="371" selection-start-column="66" selection-end-line="371" selection-end-column="66" />
+          <folding>
+            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#searchConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionDev#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="139" column="13" lean-forward="true" selection-start-line="139" selection-start-column="13" selection-end-line="139" selection-end-column="13" />
+          <folding>
+            <element signature="method#getCoInfoByDevAndDate#0;class#PgCoRs#0" />
+            <element signature="method#getNewestCoInfoByDev#0;class#PgCoRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="540">
+          <caret line="223" column="5" lean-forward="true" selection-start-line="223" selection-start-column="5" selection-end-line="223" selection-end-column="5" />
+          <folding>
+            <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="682">
+          <caret line="100" lean-forward="true" selection-start-line="100" selection-end-line="100" />
+          <folding>
+            <element signature="method#getDeviceTpeyList#0;class#PgDeviceTypeRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="377">
+          <caret line="225" column="35" selection-start-line="225" selection-start-column="35" selection-end-line="225" selection-end-column="35" />
+          <folding>
+            <element signature="method#addEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#addEquipment#1;class#PgEquipmentRs#0" />
+            <element signature="method#getEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#deleteEquipment#0;class#PgEquipmentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="406">
+          <caret line="109" lean-forward="true" selection-start-line="109" selection-end-line="109" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="154">
+          <caret line="28" column="19" selection-start-line="28" selection-start-column="19" selection-end-line="28" selection-end-column="19" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="748">
-          <caret line="49" column="5" lean-forward="true" selection-start-line="49" selection-start-column="5" selection-end-line="49" selection-end-column="5" />
+        <state relative-caret-position="296">
+          <caret line="161" column="35" selection-start-line="161" selection-start-column="35" selection-end-line="161" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="384">
+          <caret line="99" column="5" lean-forward="true" selection-start-line="99" selection-start-column="5" selection-end-line="99" selection-end-column="5" />
+        </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="362">
+          <caret line="340" column="35" selection-start-line="340" selection-start-column="35" selection-end-line="340" selection-end-column="35" />
+          <folding>
+            <element signature="method#addInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPersonInPg#0;class#PgInPgPersonRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-606">
+          <caret line="76" column="20" lean-forward="true" selection-start-line="76" selection-start-column="20" selection-end-line="76" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="65" column="35" selection-start-line="65" selection-start-column="35" selection-end-line="65" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="101" column="35" selection-start-line="101" selection-start-column="35" selection-end-line="101" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="84" column="35" selection-start-line="84" selection-start-column="35" selection-end-line="84" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="59" lean-forward="true" selection-start-line="59" selection-end-line="59" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="60" column="1" lean-forward="true" selection-start-line="60" selection-start-column="1" selection-end-line="60" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="145" column="35" selection-start-line="145" selection-start-column="35" selection-end-line="145" selection-end-column="35" />
+        </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="274">
+          <caret line="350" column="35" selection-start-line="350" selection-start-column="35" selection-end-line="350" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="121" column="39" selection-start-line="121" selection-start-column="39" selection-end-line="121" selection-end-column="39" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="28" column="8" lean-forward="true" selection-start-line="28" selection-start-column="8" selection-end-line="28" selection-end-column="8" />
+        <state relative-caret-position="340">
+          <caret line="103" selection-start-line="103" selection-end-line="103" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="226" column="35" selection-start-line="226" selection-start-column="35" selection-end-line="226" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="203" column="35" selection-start-line="203" selection-start-column="35" selection-end-line="203" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="241" column="35" selection-start-line="241" selection-start-column="35" selection-end-line="241" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="225" column="1" lean-forward="true" selection-start-line="225" selection-start-column="1" selection-end-line="225" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="176" column="5" lean-forward="true" selection-start-line="176" selection-start-column="5" selection-end-line="176" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="178" column="35" lean-forward="true" selection-start-line="178" selection-start-column="35" selection-end-line="178" selection-end-column="35" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="516">
-          <caret line="94" column="53" selection-start-line="94" selection-start-column="53" selection-end-line="94" selection-end-column="53" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="814">
-          <caret line="52" column="9" lean-forward="true" selection-start-line="52" selection-start-column="9" selection-end-line="52" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="182">
-          <caret line="58" column="12" lean-forward="true" selection-start-line="58" selection-start-column="12" selection-end-line="58" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="34" lean-forward="true" selection-start-line="34" selection-end-line="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="32" lean-forward="true" selection-start-line="32" selection-end-line="32" />
-          <folding>
-            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
-            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="185">
-          <caret line="63" column="13" selection-start-line="63" selection-start-column="13" selection-end-line="63" selection-end-column="13" />
-          <folding>
-            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
-            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
-            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="e#6319#6324#0" />
-            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
-          </folding>
+          <caret line="240" lean-forward="true" selection-start-line="240" selection-end-line="240" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
-          <caret line="58" column="28" lean-forward="true" selection-start-line="58" selection-start-column="28" selection-end-line="58" selection-end-column="28" />
-          <folding>
-            <element signature="method#addTempHumData#0;class#PgTempHumRs#0" />
-          </folding>
+        <state relative-caret-position="340">
+          <caret line="148" column="34" selection-start-line="148" selection-start-column="34" selection-end-line="148" selection-end-column="34" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
+        <state relative-caret-position="458">
+          <caret line="99" column="35" selection-start-line="99" selection-start-column="35" selection-end-line="99" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+        <state relative-caret-position="384">
+          <caret line="145" column="32" lean-forward="true" selection-start-line="145" selection-start-column="32" selection-end-line="145" selection-end-column="32" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="414">
-          <caret line="22" column="46" lean-forward="true" selection-start-line="22" selection-start-column="46" selection-end-line="22" selection-end-column="46" />
-        </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="396">
-          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" column="83" selection-start-line="11" selection-start-column="83" selection-end-line="11" selection-end-column="83" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="26">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
-          <folding>
-            <element signature="method#getPgInPgStatusByPerson#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNumByName#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNum#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPersonListByDay#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPgStatusByPgInPgPerson#0;class#PgInPgStatusManager#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="44">
-          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-12">
-          <caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="87" lean-forward="true" selection-start-line="87" selection-end-line="87" />
-          <folding>
-            <element signature="method#getConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#addConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#deleteConstructionType#0;class#PgConstructionTypeRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
-          <folding>
-            <element signature="method#getConstructionTypeByType#0;class#PgConstructionTypeManager#0" />
-            <element signature="method#getAllConstructionTypeDto#0;class#PgConstructionTypeManager#0" />
-          </folding>
-        </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="145">
-          <caret line="258" column="9" lean-forward="true" selection-start-line="258" selection-start-column="9" selection-end-line="258" selection-end-column="9" />
-          <folding>
-            <element signature="method#getMonthInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayInPgStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgOverViewRs#0" />
-            <element signature="method#getAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getMonthAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayAlarmStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgOverViewRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="103">
-          <caret line="105" column="50" lean-forward="true" selection-start-line="105" selection-start-column="50" selection-end-line="105" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateBasicDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="99">
-          <caret line="125" selection-start-line="125" selection-end-line="125" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="190">
-          <caret line="24" column="35" lean-forward="true" selection-start-line="24" selection-start-column="35" selection-end-line="24" selection-end-column="35" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="436">
-          <caret line="24" lean-forward="true" selection-start-line="24" selection-end-line="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" lean-forward="true" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="300">
-          <caret line="34" column="31" lean-forward="true" selection-start-line="34" selection-start-column="31" selection-end-line="34" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="42" column="13" lean-forward="true" selection-start-line="42" selection-start-column="13" selection-end-line="42" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="120" column="72" lean-forward="true" selection-start-line="120" selection-start-column="72" selection-end-line="120" selection-end-column="72" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="293">
-          <caret line="58" column="73" lean-forward="true" selection-start-line="58" selection-start-column="73" selection-end-line="58" selection-end-column="73" />
-          <folding>
-            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
-            <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
-          </folding>
-        </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="307">
-          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
+        <state relative-caret-position="758">
+          <caret line="130" column="5" lean-forward="true" selection-start-line="130" selection-start-column="5" selection-end-line="130" selection-end-column="5" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1170">
-          <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
+        <state relative-caret-position="494">
+          <caret line="86" column="62" lean-forward="true" selection-start-line="86" selection-start-column="62" selection-end-line="86" selection-end-column="62" />
           <folding>
-            <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-            <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+            <element signature="method#getAllDevice#0;class#PgDeviceManager#0" />
+            <element signature="method#getAllDev#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="195" column="28" lean-forward="true" selection-start-line="195" selection-start-column="28" selection-end-line="195" selection-end-column="28" />
+        <state relative-caret-position="166">
+          <caret line="174" column="13" lean-forward="true" selection-start-line="174" selection-start-column="13" selection-end-line="174" selection-end-column="13" />
           <folding>
-            <element signature="method#getAlarmByTypeAndTime#0;class#PgAlarmManager#0" />
-            <element signature="method#getAlarmNum#0;class#PgAlarmManager#0" />
             <element signature="method#getDayAlarmStatistic#0;class#PgAlarmManager#0" />
+            <element signature="method#getAlarmList#0;class#PgAlarmManager#0" />
             <element signature="method#createDTO#0;class#PgAlarmManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="364">
+          <caret line="46" column="56" lean-forward="true" selection-start-line="46" selection-start-column="56" selection-end-line="46" selection-end-column="56" />
+          <folding>
+            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
+            <element signature="method#getPgDev#0;class#PgDeviceRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
+            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+        <state relative-caret-position="396">
+          <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
           <folding>
             <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
             <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -1365,52 +1331,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="239">
-          <caret line="21" column="33" lean-forward="true" selection-start-line="21" selection-start-column="33" selection-end-line="21" selection-end-column="33" />
-        </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="352">
-          <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-        </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="99">
-          <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-          </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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-          <folding>
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-            <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>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
index c436c93..e913155 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
@@ -132,7 +132,10 @@
             this.setAlarmType("");
         else
             this.setAlarmType(pgAlarm.getAlarmTypeId().getAlarmType());
-        this.setAlarmValue(pgAlarm.getAlarmValue());
+        if(pgAlarm.getAlarmValue()==null)
+            this.setAlarmValue("");
+        else
+            this.setAlarmValue(pgAlarm.getAlarmValue());
         if (pgAlarm.getAlarmDate() != null)
             this.setAlarmDate(sdf.format(pgAlarm.getAlarmDate()));
         else
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
index a43965c..565cb41 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -159,11 +159,21 @@
     }
 
     //获取历史报警消息列表
-    public List<PgAlarmDto> getAllAlarm(String alarmType,String startDay,String endDay,String isNew,int page,int rows) {
-        try {
+    public  Map<String, Object> getAllAlarm(String alarmType,String partition,String startDay,String endDay,String isNew,int page,int rows) {
 
+        Map<String, Object> resultMap = new HashMap<>();
+        String msg="";
+
+        try {
             Criteria criteria = createCriteria(PgAlarm.class);
 
+            if (StringUtils.isNotBlank(partition)) {
+                DetachedCriteria inCriteria = DetachedCriteria.forClass(PgDevice.class);
+                inCriteria.add(Restrictions.eq("partition", partition));
+                inCriteria.setProjection(Property.forName("id"));
+                criteria.add(Property.forName("alarmDevId").in(inCriteria));
+            }
+
             if (StringUtils.isNotBlank(alarmType)&&!alarmType.contains("全部")&&pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
                 criteria.add(Restrictions.eq("alarmTypeId", pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)));
 
@@ -190,8 +200,16 @@
             for (PgAlarm pgAlarm : pgAlarmList) {
                 pgAlarmDtoList.add(new PgAlarmDto(pgAlarm));
             }
-
-            return pgAlarmDtoList;
+            if(pgAlarmDtoList==null||pgAlarmDtoList.size()==0) {
+                resultMap.put("msg", "没有报警信息");
+                resultMap.put("code","0");
+            }else {
+                resultMap.put("code","200");
+                resultMap.put("msg", "报警信息获取成功");
+            }
+            resultMap.put("count",pg.getTotalCount());
+            resultMap.put("result",pgAlarmDtoList);
+            return resultMap;
         }
         catch(Exception ex){
             ex.printStackTrace();
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index 7547560..654f49e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -24,11 +24,11 @@
 
         Criteria criteria = createCriteria(PgDevice.class);
 
-        if(road!=null)
+        if(StringUtils.isNotBlank(road))
             criteria.add(Restrictions.eq("road",road));
-        if(partition!=null)
+        if(StringUtils.isNotBlank(partition))
             criteria.add(Restrictions.eq("partition",partition));
-        if(devType!=null)
+        if(StringUtils.isNotBlank(devType))
             criteria.add(Restrictions.eq("devType",devType));
 
         criteria.add(Restrictions.eq("active", 1));
@@ -43,6 +43,29 @@
         return pgDeviceDtoList;
     }
 
+    public List<PgDeviceDto> getAllDev(String road,String partition,String devType) {
+
+        Criteria criteria = createCriteria(PgDevice.class);
+
+        if(StringUtils.isNotBlank(road))
+            criteria.add(Restrictions.eq("road",road));
+        if(StringUtils.isNotBlank(partition))
+            criteria.add(Restrictions.eq("partition",partition));
+        if(StringUtils.isNotBlank(devType))
+            criteria.add(Restrictions.like("devType","%"+devType+"%"));
+
+        criteria.add(Restrictions.eq("active", 1));
+        criteria.addOrder(Order.desc("id"));
+        List<PgDevice> pgDeviceList = criteria.list();
+
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
+        for (PgDevice pgDevice : pgDeviceList) {
+            pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
+        }
+
+        return pgDeviceDtoList;
+    }
+
     //根据名字获取当前设备
     public PgDevice getDeviceByAssetCode(String assetCode) {
         Criteria criteria=createCriteria(PgDevice.class);
@@ -56,9 +79,9 @@
     }
 
     //根据类型获取设备列表
-    public List<PgDeviceDto> getDeviceByDevTypee(String devType) {
+    public List<PgDeviceDto> getDeviceByDevType(String devType) {
         Criteria criteria=createCriteria(PgDevice.class);
-        criteria.add(Restrictions.eq("devType",devType));
+        criteria.add(Restrictions.like("devType","%"+devType+"%"));
 
         List<PgDevice> pgDeviceList=criteria.list();
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
@@ -106,7 +129,7 @@
         criteria.add(Restrictions.eq("partition",partition));
 
         List<PgDevice> pgDeviceList=criteria.list();
-        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<PgDeviceDto>();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
 
         for (PgDevice pgDevice : pgDeviceList) {
             pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
index 3a3bccd..595730e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
@@ -1,10 +1,13 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.devTable.domain.PgAlarmType;
 import com.casic.PgInterface.devTable.domain.PgPartition;
 import com.casic.PgInterface.devTable.domain.PgRoad;
 import com.casic.PgInterface.devTable.domain.PipeGallery;
 import com.casic.PgInterface.devTable.dto.PgPartitionDto;
+import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
@@ -12,7 +15,9 @@
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Created by yxw on 2017/11/4.
@@ -21,7 +26,8 @@
 public class PgPartitionManager extends HibernateEntityDao<PgPartition> {
 
     @Resource
-    PgRoadManager pgRoadManager;
+    private PgRoadManager pgRoadManager;
+
 
     public PgPartition getPartitionByParName(String parName) {
         Criteria criteria = getSession().createCriteria(PgPartition.class);
@@ -99,4 +105,5 @@
         return pgPartitionDtoList;
     }
 
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
index f216360..a6928f1 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
@@ -5,6 +5,7 @@
 public class PgPlanResultRe {
 
     private String taskKey;
+    private List<String> pileAcuList;
     private List<PgPlanResult> pgPlanResultList;
 
     public String getTaskKey() {
@@ -15,6 +16,14 @@
         this.taskKey = taskKey;
     }
 
+    public List<String> getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(List<String> pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+
     public List<PgPlanResult> getPgPlanResultList() {
         return pgPlanResultList;
     }
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
index 71ea765..47eea07 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
@@ -54,9 +54,7 @@
 
         List<PgLineHole> pgLineHoleList=criteria.list();
         List<PgLineHoleDTO> pgLineHoleDTOList=new ArrayList<>();
-        if(pgLineHoleList==null||pgLineHoleList.size()==0)
-            return null;
-        else
+        if(pgLineHoleList!=null&&pgLineHoleList.size()!=0)
             pgLineHoleDTOList=PgLineHoleDTO.ConvertToDTOList(pgLineHoleList,pgPileAcuManager,pgRoadManager);
         return pgLineHoleDTOList;
     }
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
index 0fd9e1f..841a386 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
@@ -1,12 +1,15 @@
 package com.casic.PgInterface.intelPlan.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.devTable.domain.PgPartition;
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
 import com.casic.PgInterface.intelPlan.domain.PgLineHole;
 import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
 import com.casic.PgInterface.intelPlan.domain.PgSection;
 import com.casic.PgInterface.intelPlan.dto.PgPlanResult;
 import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
 import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -22,6 +25,9 @@
     @Resource
     private PgLineHoleManager pgLineHoleManager;
 
+    @Resource
+    private PgRoadManager pgRoadManager;
+
     public PgPileAcu getPgPileAcuByCode(String acuCode){
         List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
 
@@ -58,7 +64,9 @@
         for(PgPlanTask pgPlanTask:pgPlanTaskList){
             List<PgPlanResult> pgPlanResultList=getPgPlanResultByPlantask(pgPlanTask);
             PgPlanResultRe pgPlanResultRe=new PgPlanResultRe();
+
             pgPlanResultRe.setTaskKey(pgPlanTask.getTaskKey());
+            pgPlanResultRe.setPileAcuList(pgPlanTask.getPileAcuList());
             pgPlanResultRe.setPgPlanResultList(pgPlanResultList);
 
             pgPlanResultReList.add(pgPlanResultRe);
@@ -142,4 +150,57 @@
         return length;
     }
 
+    private PgPileAcu getPgPileAcuByAcuCode(String acuCode){
+        List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
+
+        if(pgPileAcuList==null||pgPileAcuList.size()==0)
+            return null;
+        else
+            return pgPileAcuList.get(0);
+    }
+
+    public List<PgAcuTask> getACUTask(String pileAcuList){
+        String[] acuArray=pileAcuList.split(",");
+        List<PgAcuTask> pgAcuTaskList=new ArrayList<>();
+
+        for(String acu:acuArray){
+            PgPileAcu pgPileAcu=this.getPgPileAcuByCode(acu);
+            String roadName=pgRoadManager.get(pgPileAcu.getRoadId()).getRoadName();
+
+            if(!containRoad(roadName,pgAcuTaskList))
+            {
+                PgAcuTask pgAcuTask=new PgAcuTask();
+                pgAcuTask.setRoadName(roadName);
+                pgAcuTask.setPileAcuList(acu);
+                pgAcuTaskList.add(pgAcuTask);
+            }
+            else{
+                PgAcuTask pgAcuTask=getIndexRoad(roadName,pgAcuTaskList);
+                if(pgAcuTask!=null)
+                    pgAcuTask.setPileAcuList(pgAcuTask.getPileAcuList()+","+acu);
+            }
+        }
+
+        return pgAcuTaskList;
+    }
+
+    private boolean containRoad(String roadName,List<PgAcuTask> pgAcuTaskList){
+        if(pgAcuTaskList==null||pgAcuTaskList.size()==0) return false;
+        for(PgAcuTask pgAcuTask:pgAcuTaskList){
+            if(pgAcuTask.getRoadName().equals(roadName))
+                return true;
+        }
+
+        return false;
+    }
+
+    private PgAcuTask getIndexRoad(String roadName, List<PgAcuTask> pgAcuTaskList){
+        for(PgAcuTask pgAcuTask:pgAcuTaskList){
+            if(pgAcuTask.getRoadName().equals(roadName))
+                return pgAcuTask;
+        }
+
+        return null;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java
new file mode 100644
index 0000000..323f7ef
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java
@@ -0,0 +1,25 @@
+package com.casic.PgInterface.reservePlan.dto;
+
+import java.util.List;
+
+public class PgAcuTask {
+
+    private String roadName;//道路
+    private String pileAcuList;//acu分区
+
+    public String getRoadName() {
+        return roadName;
+    }
+
+    public void setRoadName(String roadName) {
+        this.roadName = roadName;
+    }
+
+    public String getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(String pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
index c25e926..c7d7693 100644
--- a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
@@ -70,9 +70,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(Long.valueOf(inPgPersonId));
         PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("hostName",pgInPgPerson.getAssetCode());
-//        PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode());
-//        long maxId = pgTagPositionManager.getMaxId(pgTagMac.getTagMac());
-//        PGTagPosition pgTagPosition = pgTagPositionManager.get(maxId);
+
         PGTagPosition pgTagPosition = tagmacRun.GetTagStatus(pgTagMac);
         boolean bExist = false;
         bExist = pgTagPositionManager.findTagPosition(pgTagPosition.getPositionUpdatetime(),pgTagPosition.getHostId());
@@ -104,8 +102,7 @@
         PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(Long.valueOf(inPgPersonId));
         PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pgInPgPersonId",pgInPgPerson);
         System.out.println("time:"+pgInPgStatus.getInTime());
-//        PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pgInPgPersonId",inPgPersonId);
-//        PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode());
+
         PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("hostName",pgInPgPerson.getAssetCode());
 
         Map<Object,Object> mapPosition = new HashMap<>();
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
index 082ba5d..3eed00a 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
@@ -48,6 +48,7 @@
     public Map<String, Object> linkDevice(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         PgDeviceDto pgDeviceDto = null;
         try {
@@ -62,6 +63,7 @@
                     else {
                         pgDeviceDto = new PgDeviceDto(pgDevice);
                         msg = "报警关联设备获取成功";
+                        code="200";
                     }
                 }
             }
@@ -71,6 +73,7 @@
             e.printStackTrace();
             msg = "获取关联设备失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceDto);
 
@@ -86,6 +89,7 @@
     public Map<String, Object> linkPartitionCamera(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
         try {
@@ -106,6 +110,7 @@
 
                         pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(partition,position);
                         msg = "关联设备获取成功";
+                        code="200";
                     }
                 }
             }
@@ -115,6 +120,7 @@
             e.printStackTrace();
             msg = "分区设备关联失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceDtoList);
         return resultMap;
@@ -129,6 +135,7 @@
     public Map<String, Object> linkReservePlan(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgReservePlanDto> pgReservePlanDtoList=new ArrayList<>();
         try{
@@ -139,10 +146,12 @@
                 else {
                     pgReservePlanDtoList = pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
 
-                    if(pgReservePlanDtoList==null||pgReservePlanDtoList.size()==0)
-                        msg="不存在关联的报警预案";
-                    else
+                    if (pgReservePlanDtoList == null || pgReservePlanDtoList.size() == 0)
+                        msg = "不存在关联的报警预案";
+                    else {
                         msg = "关联预案获取成功";
+                        code="200";
+                    }
                 }
             }
             else
@@ -153,6 +162,7 @@
             e.printStackTrace();
             msg="预案关联失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgReservePlanDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
index 0ddbc4d..0ce886b 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
@@ -41,25 +41,19 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getAlarmList(@FormParam("alarmType") String alarmType,
                                             @FormParam("startDay") String startDay,
+                                            @FormParam("partition") String partition,
                                             @FormParam("endDay") String endDay,
                                             @FormParam("isNew") String isNew,
                                             @FormParam("page") int page,
                                             @FormParam("rows") int rows) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
         try {
-            pgAlarmDtoList = pgAlarmManager.getAllAlarm(alarmType,startDay,endDay,isNew,page,rows);
-            if (pgAlarmDtoList==null||pgAlarmDtoList.size() == 0)
-                msg = "没有报警信息";
-            else
-                msg = "报警信息获取成功";
+            resultMap = pgAlarmManager.getAllAlarm(alarmType,partition,startDay,endDay,isNew,page,rows);
+
         } catch (Exception e) {
             e.printStackTrace();
-            msg = "报警信息获取失败";
         }
-        resultMap.put("msg", msg);
-        resultMap.put("result", pgAlarmDtoList);
         return resultMap;
     }
 
@@ -71,9 +65,10 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> clearAlarmList(@FormParam("id") String id) throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        String result = "false";
+        String result = "";
+        String code="0";
 
         try {
             PgAlarm pgAlarm = new PgAlarm();
@@ -86,12 +81,14 @@
                 pgAlarmManager.save(pgAlarm);
                 msg = "报警信息清除成功";
                 result = "true";
+                code = "200";
             }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警信息清除失败";
             result = "false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
@@ -106,21 +103,26 @@
     public Map<String, Object> getAlarmByTypeOrTime(@FormParam("alarmType") String alarmType,
                                                     @FormParam("startTime") String startTime,
                                                     @FormParam("endTime") String endTime) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
-        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<PgAlarmDto>();
+        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
         try {
             pgAlarmDtoList = pgAlarmManager.getAlarmByTypeAndTime(alarmType, startTime, endTime);
             if (pgAlarmDtoList == null || pgAlarmDtoList.size() == 0)
                 msg = "报警信息不存在";
             else
+            {
                 msg = "报警信息获取成功";
+                code="200";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警信息获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
index 29ce8a4..ed0bf34 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
@@ -39,8 +39,8 @@
     public Map<String, Object> getAlarmRule(@FormParam("devType") String devType) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
-        System.out.println("devType:"+devType);
         List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<>();
         try {
             pgAlarmRuleDtoList = pgAlarmRuleManager.getAlarmRuleDto(devType);
@@ -52,6 +52,7 @@
             e.printStackTrace();
             msg = "报警阈值信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmRuleDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
index 24ab894..abef1b1 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
@@ -39,16 +39,21 @@
                                                      @FormParam("endDate") String endDate)throws Exception{
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
+
         List<PgAlarmTjDto> pgAlarmTjDtoList=null;
         try{
             pgAlarmTjDtoList=pgAlarmTjManager.getAlarmTjResultByType(startDate,endDate);
             msg="获取成功";
+            code="200";
         }
         catch(Exception ex) {
             msg = "统计失败";
         }
-        resultMap.put("result",pgAlarmTjDtoList);
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
+        resultMap.put("result",pgAlarmTjDtoList);
+
         return resultMap;
     }
 
@@ -61,23 +66,27 @@
     public Map<String, Object> getAlarmByTime(@FormParam("startTime") String startTime,
                                               @FormParam("endTime") String endTime,
                                               @FormParam("statisticType") String statisticType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code = "0";
 
-        List<PgAlarmTjDto> pgAlarmTjDtoList = new ArrayList<PgAlarmTjDto>();
+        List<PgAlarmTjDto> pgAlarmTjDtoList = new ArrayList<>();
         try {
             pgAlarmTjDtoList = pgAlarmTjManager.getAlarmByTime(startTime, endTime, statisticType);
             if(pgAlarmTjDtoList==null)
                 msg="报警统计信息获取失败";
-            else
-                msg="报警统计信息获取成功";
+            else {
+                msg = "报警统计信息获取成功";
+                code="200";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警统计信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmTjDtoList);
         return resultMap;
     }
 
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
index 28bc811..b6278a9 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
@@ -30,7 +30,6 @@
     @Resource
     private PgAlarmTypeManager pgAlarmTypeManager;
 
-
     /**
      * 获取报警类型
      */
@@ -38,19 +37,24 @@
     @Path("getAlarmType")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getAlarmTypeList()throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
-        List<PgAlarmTypeDto> pgAlarmTypeDtoList=new ArrayList<PgAlarmTypeDto>();
+        String code="";
+
+        List<PgAlarmTypeDto> pgAlarmTypeDtoList=new ArrayList<>();
         try {
             pgAlarmTypeDtoList = pgAlarmTypeManager.getAllAlarmTypeDto();
             if(pgAlarmTypeDtoList.size()==0)
                 msg="没有报警类型信息";
-            else
-                msg="报警类型信息获取成功";
+            else {
+                code="200";
+                msg = "报警类型信息获取成功";
+            }
         }catch(Exception e){
             e.printStackTrace();
             msg="报警类型信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAlarmTypeDtoList);
         return resultMap;
@@ -66,6 +70,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
@@ -83,6 +88,7 @@
                 logger.info("成功保存");
                 result = "true";
                 msg = "保存成功";
+                code="200";
             }
         } catch (Exception e) {
             result = "false";
@@ -90,6 +96,7 @@
             e.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -106,6 +113,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try{
             if(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
@@ -119,6 +127,7 @@
                 pgAlarmTypeManager.save(pgAlarmType);
                 result = "true";
                 msg = "编辑成功";
+                code="200";
             }
         }
         catch(Exception e)
@@ -128,6 +137,7 @@
             e.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("result",result);
         resultMap.put("msg",msg);
 
@@ -146,6 +156,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
         String result="false";
+        String code="0";
 
         try {
             PgAlarmType pgAlarmType=pgAlarmTypeManager.get(Long.valueOf(id));
@@ -157,6 +168,7 @@
             {
                 pgAlarmType.setActive(0);
                 pgAlarmTypeManager.save(pgAlarmType);
+                code="200";
                 msg="报警类型删除成功";
                 result="true";
             }
@@ -165,6 +177,7 @@
             msg="报警类型删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
index 4533e1a..85940bb 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
@@ -33,12 +33,15 @@
                                                  @FormParam("inSpectionPlace") String inSpectionPlace){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
         List<PgAssetPlanDto> pgAssetPlanDtoList=new ArrayList<>();
         try{
             pgAssetPlanDtoList=pgAssetPlanManager.getPgAssetPlanDtoList(startDay,endDay,inSpectionPlace);
-            if(pgAssetPlanDtoList!=null&&pgAssetPlanDtoList.size()!=0)
-                msg="巡检信息获取成功";
+            if(pgAssetPlanDtoList!=null&&pgAssetPlanDtoList.size()!=0) {
+                code="200";
+                msg = "巡检信息获取成功";
+            }
             else
                 msg="不存在巡检信息";
         }
@@ -47,6 +50,7 @@
             msg="巡检信息获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAssetPlanDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
index 47ef9d1..5cbdfcb 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
@@ -30,12 +30,15 @@
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
         String result="";
+        String code="0";
 
         List<PgAssetPlanStatic> pgAssetPlanStaticList = null;
         try{
             pgAssetPlanStaticList=pgAssetPlanManager.getPgAssetPlanStaticLisByTime(startTime,endTime,staticType);
-            if(pgAssetPlanStaticList!=null&&pgAssetPlanStaticList.size()!=0)
-                msg="巡检统计信息获取成功";
+            if(pgAssetPlanStaticList!=null&&pgAssetPlanStaticList.size()!=0) {
+                code = "200";
+                msg = "巡检统计信息获取成功";
+            }
             else
                 msg="统计信息获取失败";
         }
@@ -44,6 +47,7 @@
             msg="统计失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAssetPlanStaticList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
index 26f5d6a..503bfe3 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
@@ -40,6 +40,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="";
 
         try{
             PgAuthority pgAuthority=new PgAuthority();
@@ -50,6 +51,7 @@
 
             pgAuthorityManager.save(pgAuthority);
             msg="用户权限保存成功";
+            code="200";
             result="true";
         }
         catch(Exception e) {
@@ -57,6 +59,7 @@
             msg = "新增权限失败";
             result = "false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -65,22 +68,25 @@
 
     /*
        *编辑角权限信息
-        */
+    */
     @POST
     @Path("editAuthority")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> editAuthority(@FormParam("id") String id,
                                        @FormParam("authority") String authority,
                                        @FormParam("concent") String concent) throws Exception{
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
+
         try {
             PgAuthority pgAuthority=pgAuthorityManager.get(Long.valueOf(id));
             pgAuthority.setAuthority(authority);
             pgAuthority.setConcent(concent);
 
             pgAuthorityManager.save(pgAuthority);
+            code="200";
             msg="权限保存成功";
             result="true";
         }
@@ -90,7 +96,7 @@
             msg="权限编辑失败";
             result="false";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -105,9 +111,10 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> deleteAuthority(@FormParam("id") String id)throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
-        String result="false";
+        String result="";
+        String code="0";
 
         try {
             PgAuthority pgAuthority= pgAuthorityManager.get(Long.valueOf(id));
@@ -119,6 +126,7 @@
             {
                 pgAuthority.setActive(0);
                 pgAuthorityManager.save(pgAuthority);
+                code="200";
                 msg="删除权限成功";
                 result="true";
             }
@@ -127,37 +135,40 @@
             msg="删除权限失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
     }
 
     /*
-* 获取权限信息
- */
+    * 获取权限信息
+    */
     @POST
     @Path("getAuthorityList")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> getAuthorityList() {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgAuthorityDto> pgAuthorityDtoList = new ArrayList<PgAuthorityDto>();
         try {
             pgAuthorityDtoList = pgAuthorityManager.getAuthorityList();
             if (pgAuthorityDtoList == null)
                 msg = "不存在权限信息";
-            else
+            else {
+                code = "200";
                 msg = "权限信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "权限信息获取是失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAuthorityDtoList);
         return resultMap;
     }
 
 
-
-
 }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
index a9ef521..a74ecc7 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
@@ -45,6 +45,7 @@
                                                @FormParam("endDate") String endDate)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgHistoryDataDto> pgHistoryDataDtoList=new ArrayList<>();
 
         try {
@@ -55,13 +56,16 @@
                 pgHistoryDataDtoList=pgCh4Manager.getAllCH4Data(pgDevice,startDate,endDate);
                 if(pgHistoryDataDtoList==null)
                     msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+                else {
+                    code = "200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgHistoryDataDtoList);
         return resultMap;
@@ -75,8 +79,9 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getNewestCh4InfoByDev(@FormParam("assetCode") String assetCode)throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
+        String code="0";
         PgCh4Dto pgCh4Dto=new PgCh4Dto(null);
 
         try {
@@ -87,13 +92,17 @@
                 pgCh4Dto=pgCh4Manager.getNewestCH4Data(pgDevice);
                 if(pgCh4Dto==null)
                     msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgCh4Dto);
         return resultMap;
@@ -111,6 +120,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
@@ -127,6 +137,7 @@
                 pgCh4.setPgDeviceId(pgDevice);
 
                 pgCh4Manager.save(pgCh4);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -135,7 +146,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
index a7eac39..dfc8ca5 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
@@ -43,23 +43,27 @@
                                                       @FormParam("endDate") String endDate)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgHistoryDataDto> pgHistoryDataDtoList=new ArrayList<>();
 
         try {
             PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
                 msg="设备不存在";
-            else{
-                pgHistoryDataDtoList=pgCoManager.getAllCoData(pgDevice, startDate, endDate);
-                if(pgHistoryDataDtoList==null)
-                    msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+            else {
+                pgHistoryDataDtoList = pgCoManager.getAllCoData(pgDevice, startDate, endDate);
+                if (pgHistoryDataDtoList == null)
+                    msg = "没有满足要求的数据";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgHistoryDataDtoList);
         return resultMap;
@@ -75,6 +79,7 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         PgCoDto pgCoDto=new PgCoDto(null);
 
         try {
@@ -85,13 +90,16 @@
                 pgCoDto=pgCoManager.getNewestCoData(pgDevice);
                 if(pgCoDto==null)
                     msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgCoDto);
         return resultMap;
@@ -110,6 +118,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         try {
@@ -126,6 +135,7 @@
 
                 pgCoManager.save(pgCo);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
         } catch (Exception e) {
@@ -133,7 +143,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
index b4b826e..9af98a3 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
@@ -60,6 +60,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         try {
 
@@ -80,8 +81,8 @@
                 pgConstruction.setPgConstructionTypeId(pgConstructionType.getId());
                 pgConstruction.setActive(1);
                 pgConstruction.setParName(parName);
-                logger.info("保存成功");
                 pgConstructionManager.save(pgConstruction);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -90,6 +91,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("success", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -116,6 +118,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
@@ -140,6 +143,7 @@
                 pgConstruction.setParName(parName);
 
                 pgConstructionManager.save(pgConstruction);
+                code="200";
                 result = "true";
                 msg = "编辑成功";
             }
@@ -150,7 +154,7 @@
             e.printStackTrace();
 
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -167,6 +171,8 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
+
         try {
             PgConstruction pgConstruction = pgConstructionManager.get(Long.valueOf(id));
             if (pgConstruction == null)
@@ -177,6 +183,7 @@
             {
                 pgConstruction.setActive(0);
                 pgConstructionManager.save(pgConstruction);
+                code="200";
                 result = "true";
                 msg = "成功删除信息";
             }
@@ -185,6 +192,7 @@
             result = "false";
             msg = "删除失败";
         }
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -204,9 +212,11 @@
                                                   @FormParam("rows") int rows)throws Exception{
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
         List<PgConstructionDto> pgConstructionDtoList=new ArrayList<>();
         try{
             pgConstructionDtoList=pgConstructionManager.getPgContructionDto(cs_name,cs_type,startTime,endTime,page,rows);
+            code="200";
             msg="信息获取成功";
         }
         catch(Exception e)
@@ -214,6 +224,7 @@
             e.printStackTrace();
             msg="查询失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
 
@@ -231,18 +242,22 @@
                                                               @FormParam("statisticType") String statisticType) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgConstructionStiatistic> pgConstructionStiatisticList=new ArrayList<>();
         try {
             pgConstructionStiatisticList = pgConstructionManager.getConstructionByTimeAndStatus(startTime, endTime, statisticType);
             if(pgConstructionStiatisticList==null)
                 msg="施工统计信息获取失败";
-            else
-                msg="施工统计信息获取成功";
+            else {
+                code="200";
+                msg = "施工统计信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "施工统计信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgConstructionStiatisticList);
         return resultMap;
@@ -257,6 +272,7 @@
     public Map<String, Object> getConstructionByType(@FormParam("statisticType") String statisticType){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
         List<PgConstructionStiatistic> pgConstructionStiatisticList=new ArrayList<>();
 
         try{
@@ -268,6 +284,7 @@
                 resultMap.put("result",null);
             }
             else {
+                code="200";
                 msg = "统计信息获取成功";
                 resultMap.put("result", pgConstructionStiatisticList);
             }
@@ -278,6 +295,7 @@
             msg="统计失败";
             resultMap.put("result",null);
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         return resultMap;
     }
@@ -291,9 +309,11 @@
     public Map<String, Object> getConstructionToday() throws Exception{
         Map<String,Object> resultMap=new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgConstructionDto> pgConstructionDtoList=new ArrayList<PgConstructionDto>();
         try {
             pgConstructionDtoList = pgConstructionManager.getConstructionToday();
+            code="200";
             msg = "当天施工信息获取成功";
         }
         catch(Exception e)
@@ -301,7 +321,7 @@
             e.printStackTrace();
             msg="获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
         return resultMap;
@@ -316,6 +336,7 @@
     public Map<String, Object> getConstructionDev(@FormParam("id") String id) throws Exception{
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
         List<PgDeviceDto> pgDeviceDtoList =new ArrayList<>();
         try{
@@ -325,14 +346,17 @@
 
             if(pgDeviceDtoList==null)
                 msg="信息获取失败";
-            else
-                msg="信息获取成功";
+            else {
+                code="200";
+                msg = "信息获取成功";
+            }
         }
         catch(Exception e)
         {
             e.printStackTrace();
-            msg="设备信息获取成功";
+            msg="信息获取是被";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgDeviceDtoList);
 
@@ -346,17 +370,21 @@
     @Path("getConstruction")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getConstruction() throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
-        List<PgConstructionDto> pgConstructionDtoList=new ArrayList<PgConstructionDto>();
+        String code="0";
+
+        List<PgConstructionDto> pgConstructionDtoList=new ArrayList<>();
 
         try{
             pgConstructionDtoList=pgConstructionManager.getPgConstructionList();
             if(pgConstructionDtoList==null||pgConstructionDtoList.size()==0)
                 msg="不存在施工记录";
-            else
-                msg="施工信息获取成功";
+            else {
+                code = "200";
+                msg = "施工信息获取成功";
+            }
         }
         catch(Exception e)
         {
@@ -364,6 +392,7 @@
             msg="施工信息获取失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java
index fd3d53e..2019502 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java
@@ -39,12 +39,12 @@
         try {
             pgConstructionTypeDtoList = pgConstructionTypeManager.getAllConstructionTypeDto();
             if (pgConstructionTypeDtoList.size() == 0)
-                msg = "没有项目类型信息";
+                msg = "获取失败";
             else
-                msg = "项目类型获取成功";
+                msg = "获取成功";
         } catch (Exception e) {
             e.printStackTrace();
-            msg = "项目类型信息获取失败";
+            msg = "获取失败";
         }
         resultMap.put("msg", msg);
         resultMap.put("result", pgConstructionTypeDtoList);
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
index 90d001c..037a399 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
@@ -51,6 +51,7 @@
 
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if (StringUtils.isBlank(construct_doc)||StringUtils.isBlank(doc_name))
@@ -65,6 +66,7 @@
             pgCsDocument.setActive(1);
             pgCsDocumentManager.save(pgCsDocument);
 
+            code="200";
             result = "true";
             msg = "保存成功";
 
@@ -74,6 +76,7 @@
             ex.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("success", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -90,6 +93,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             PgCsDocument pgCsDocument = pgCsDocumentManager.get(Long.valueOf(id));
@@ -103,6 +107,7 @@
 
                 pgCsDocumentManager.save(pgCsDocument);
 
+                code="200";
                 result = "true";
                 msg = "编辑成功";
             }
@@ -112,6 +117,7 @@
             msg = "编辑失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -125,9 +131,9 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
         String result="";
+        String code="0";
 
         try{
-
             PgCsDocument pgCsDocument = pgCsDocumentManager.get(Long.valueOf(id));
             if(pgCsDocument==null)
             {
@@ -137,6 +143,7 @@
             else{
                 pgCsDocument.setActive(0);
                 pgCsDocumentManager.save(pgCsDocument);
+                code="200";
                 result="true";
                 msg="删除成功";
             }
@@ -147,7 +154,7 @@
             msg="预案删除失败";
             result="false";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -168,18 +175,21 @@
 
         String msg="";
         String result="";
+        String code="0";
 
         try {
             pgCsDocumentDtoList = pgCsDocumentManager.getAllDocData(cs_name);
-            if (pgCsDocumentDtoList != null)
+            if (pgCsDocumentDtoList != null) {
+                code="200";
                 msg = "获取数据成功";
+            }
             else
                 msg = "没有满足条件的数据";
         }catch (Exception e){
             e.printStackTrace();
             msg = "获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgCsDocumentDtoList);
         return resultMap;
@@ -192,20 +202,22 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
 
         String msg = "";
+        String code="0";
         ResponseEntity<byte[]> path = null;
         try {
             PgCsDocument pgCsDocument = pgCsDocumentManager.get(Long.valueOf(id));
             path = pgCsDocumentManager.downloadFile(pgCsDocument);
             if (path == null)
                 msg = "不存在该文档";
-            else
+            else {
+                code = "200";
                 msg = "下载成功";
-
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "下载失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", path.getBody());
         resultMap.put("msg", msg);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
index 94c5c84..ffc8b95 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
@@ -41,22 +41,24 @@
     public Map<String, Object> getPgDeviceByDevType(@FormParam("devType") String devType) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
         try {
-            pgDeviceDtoList = pgDeviceManager.getDeviceByDevTypee(devType);
+            pgDeviceDtoList = pgDeviceManager.getDeviceByDevType(devType);
             if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0){
                 msg="不存在满足要求的数据";
-                resultMap.put("result",null);
             }
             else{
-                resultMap.put("result", pgDeviceDtoList);
+                code="200";
                 msg = "获取成功";
             }
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", pgDeviceDtoList);
         return resultMap;
     }
 
@@ -69,25 +71,26 @@
     public Map<String, Object> getPgDeviceByAssetCode(@FormParam("assetCode") String assetCode) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         PgDeviceDto pgDeviceDto=null;
         try {
             PgDevice pgDevice = pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
             {
                 msg="不存在设备信息";
-                resultMap.put("result",null);
             }
             else {
                 pgDeviceDto = new PgDeviceDto(pgDevice);
                 msg = "获取成功";
-                resultMap.put("result", pgDeviceDto);
+                code="200";
             }
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", pgDeviceDto);
         return resultMap;
     }
 
@@ -102,27 +105,61 @@
                                              @FormParam("devType") String devType)throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
         try {
             pgDeviceDtoList = pgDeviceManager.getAllDevice(road,partition,devType);
             if(pgDeviceDtoList.size()==0) {
                 msg = "没有找到设备信息";
-                resultMap.put("result",null);
             }
             else {
                 msg = "设备信息获取成功";
-                resultMap.put("result", pgDeviceDtoList);
+                code="200";
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result", pgDeviceDtoList);
         return resultMap;
     }
 
     /**
+     * 显示设备列表
+     */
+    @POST
+    @Path("getPgDev")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String, Object> getPgDev(@FormParam("road") String road,
+                                             @FormParam("partition") String partition,
+                                             @FormParam("devType") String devType)throws Exception {
+        Map<String, Object> resultMap = new HashMap<>();
+        String msg="";
+        String code="0";
+        List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
+        try {
+            pgDeviceDtoList = pgDeviceManager.getAllDev(road,partition,devType);
+            if(pgDeviceDtoList.size()==0) {
+                msg = "没有找到设备信息";
+            }
+            else {
+                code="200";
+                msg = "设备信息获取成功";
+            }
+        }catch(Exception e){
+            e.printStackTrace();
+            msg="设备信息获取失败";
+        }
+        resultMap.put("code",code);
+        resultMap.put("msg",msg);
+        resultMap.put("result", pgDeviceDtoList);
+        return resultMap;
+    }
+
+
+    /**
      * 新增设备
      */
     @POST
@@ -145,6 +182,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if (pgDeviceManager.getDeviceByAssetCode(assetCode)!=null) {
@@ -169,6 +207,7 @@
 
                 pgDeviceManager.save(pgDevice);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
 
@@ -177,10 +216,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -208,14 +246,9 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
-            /*
-            if (pgDeviceManager.getDeviceByAssetCode(assetCode)!=null) {
-                result = "false";
-                msg = "已存在同名设备";
-            } else {
-            */
             PgDevice pgDevice = pgDeviceManager.get(Long.valueOf(id));
             pgDevice.setPipeGallery(pipeGallery);
             pgDevice.setPartition(partition);
@@ -233,14 +266,14 @@
 
             pgDeviceManager.save(pgDevice);
             result = "true";
+            code="200";
             msg = "编辑成功";
-            //}
         } catch (Exception e) {
             result = "false";
             msg = "编辑失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("result",result);
         resultMap.put("msg",msg);
         return resultMap;
@@ -256,7 +289,8 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
-        String result="false";
+        String result="";
+        String code="0";
 
         try {
             PgDevice pgDevice=pgDeviceManager.get(Long.valueOf(id));
@@ -268,6 +302,7 @@
             {
                 pgDevice.setActive(0);
                 pgDeviceManager.save(pgDevice);
+                code="200";
                 msg="设备删除成功";
                 result="true";
             }
@@ -276,6 +311,7 @@
             msg="设备删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -291,18 +327,18 @@
     {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         PgDeviceDto pgDeviceDto=null;
 
         try{
             PgDevice pgDevice=pgDeviceManager.getDeviceBydevCode(devCode);
             if(pgDevice==null) {
                 msg = "设备信息获取失败";
-                resultMap.put("result",null);
             }
             else{
                 pgDeviceDto = new PgDeviceDto(pgDevice);
                 msg = "设备信息获取成功";
-                resultMap.put("result",pgDeviceDto);
+                code="200";
             }
         }
         catch(Exception ex)
@@ -310,8 +346,9 @@
             ex.printStackTrace();
             msg="设备状态获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgDeviceDto);
         return resultMap;
     }
 
@@ -324,17 +361,17 @@
     public Map<String,Object> getDeviceByPartition(@FormParam("partition") String partition) throws Exception{
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<PgDeviceDto>();
 
         try{
             pgDeviceDtoList=pgDeviceManager.getPgDeviceDtoListByPartition(partition);
             if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0) {
                 msg = "设备信息获取失败";
-                resultMap.put("result",null);
             }
             else {
+                code="200";
                 msg = "设备信息获取成功";
-                resultMap.put("result",pgDeviceDtoList);
             }
         }
         catch(Exception e)
@@ -342,8 +379,9 @@
             e.printStackTrace();
             msg="设备信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgDeviceDtoList);
         return resultMap;
     }
 
@@ -353,17 +391,16 @@
     public Map<String,Object> getDeviceByOldDAssetCodeCode(@FormParam("assetCode") String assetCode) throws Exception{
         Map<String, Object> resultMap = new HashMap<>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
 
         try{
             pgDeviceDtoList=pgDeviceManager.getDeviceByOldDAssetCodeCode(assetCode);
-            if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0) {
-                msg = "设备信息获取失败";;
-                resultMap.put("result",null);
-            }
+            if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0)
+                msg = "设备信息获取失败";
             else {
                 msg = "设备信息获取成功";
-                resultMap.put("result",pgDeviceDtoList);
+                code="200";
             }
         }
         catch(Exception e)
@@ -372,8 +409,9 @@
             msg="设备信息获取失败";
             resultMap.put("result",null);
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgDeviceDtoList);
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java
index 421d249..f6f167d 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java
@@ -38,17 +38,21 @@
     public Map<String, Object> getDeviceTpeyList()throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgDeviceTypeDto> pgDeviceTypeDtoList=new ArrayList<PgDeviceTypeDto>();
         try {
             pgDeviceTypeDtoList = pgDeviceTypeManager.getAllDeviceType();
             if(pgDeviceTypeDtoList.size()==0)
                 msg="没有找到设备类型信息";
-            else
-                msg="设备类型信息获取成功";
+            else {
+                code="200";
+                msg = "设备类型信息获取成功";
+            }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备类型信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgDeviceTypeDtoList);
         return resultMap;
@@ -66,6 +70,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if (pgDeviceTypeManager.getDeviceTypeByDeType(devType)!=null) {
@@ -79,6 +84,7 @@
 
                 pgDeviceTypeManager.save(pgDeviceType);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
 
@@ -87,10 +93,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
index c276fb3..c789960 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
@@ -44,6 +44,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 
         try {
@@ -62,6 +63,7 @@
                 pgEquipment.setActive(1);
 
                 pgEquipmentManager.save(pgEquipment);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -70,9 +72,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -89,9 +91,10 @@
                                             @FormParam("ownerUnit") String ownerUnit,
                                             @FormParam("enterDate") String enterDate,
                                             @FormParam("curUser") String curUser) {
-        HashMap<String, Object> resultMap = new HashMap<String, Object>();
+        HashMap<String, Object> resultMap = new HashMap<>();
         String msg = "";
         String result = "";
+        String code="0";
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 
         try {
@@ -111,6 +114,7 @@
                 pgEquipment.setEnterDate(sdf.parse(enterDate));
 
                 pgEquipmentManager.save(pgEquipment);
+                code="200";
                 msg="编辑成功";
                 result="true";
             }
@@ -119,9 +123,9 @@
             result = "false";
             msg = "编辑失败";
         }
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -134,16 +138,19 @@
     public Map<String, Object> getEquipment(@FormParam("eqName") String eqName,
                                             @FormParam("eqCode") String eqCode,
                                             @FormParam("eqType") String eqType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        List<PgEquipmentDto> pgEquipmentDtoList=new ArrayList<PgEquipmentDto>();
+        String code="0";
+        List<PgEquipmentDto> pgEquipmentDtoList=new ArrayList<>();
 
         try{
             pgEquipmentDtoList=pgEquipmentManager.getEquipmentDtiList(eqName,eqCode,eqType);
             if(pgEquipmentDtoList==null||pgEquipmentDtoList.size()==0)
                 msg="不存在工器具记录";
-            else
-                msg="维获取成功";
+            else {
+                code = "200";
+                msg = "维获取成功";
+            }
         }
         catch(Exception e)
         {
@@ -166,6 +173,7 @@
         HashMap<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
         String result = "";
+        String code="";
 
         try {
             PgEquipment pgEquipment=pgEquipmentManager.get(Long.valueOf(id));
@@ -178,6 +186,7 @@
             {
                 pgEquipment.setActive(0);
                 pgEquipmentManager.save(pgEquipment);
+                code="200";
                 msg="删除成功";
                 result="true";
             }
@@ -186,6 +195,7 @@
             msg="设备信息获取失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -201,16 +211,19 @@
             throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=new ArrayList<PgDeviceTypeStatisticDto>();
 
         try {
             pgDeviceTypeStatisticDtoList=pgEquipmentManager.getDeviceStatisticByDevType(eqType);
 
+            code="200";
             msg = "获取成功";
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceTypeStatisticDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
index 05a9709..a90fd6c 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
@@ -4,9 +4,9 @@
 import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
 import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
 import com.casic.PgInterface.intelPlan.manager.PgPileAcuManager;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import com.casic.PgInterface.test.PlanData;
 import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.ModelAttribute;
 
 import javax.annotation.Resource;
 import javax.ws.rs.FormParam;
@@ -32,23 +32,25 @@
     public Map<String,Object> getPlanResult(@FormParam("planParamStr") String planParamStr){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
-        //List<PgPlanTask> pgPlanTaskList=pgPlanParams.getPgPlanTaskList();
         List<PgPlanTask> pgPlanTaskList=new PgPlanParams().getPgPlanParamsByString(planParamStr);
         List<PgPlanResultRe> pgPlanResultReList=new ArrayList<>();
 
-        try{
-                pgPlanResultReList=pgPileAcuManager.getPgPlanResultList(pgPlanTaskList);
-                if(pgPlanResultReList==null)
-                    msg="管线智能规划出错";
-                else
-                    msg="管线智能规划完成";
+        try {
+            pgPlanResultReList = pgPileAcuManager.getPgPlanResultList(pgPlanTaskList);
+            if (pgPlanResultReList == null)
+                msg = "管线智能规划出错";
+            else {
+                code="200";
+                msg = "管线智能规划完成";
+            }
         }
         catch(Exception ex){
             msg="智能规划出错";
             ex.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgPlanResultReList);
 
@@ -80,4 +82,30 @@
         return resultMap;
     }
 
+    @POST
+    @Path("getPlanTask")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getACUTask(@FormParam("pileAcuList") String pileAcuList){
+
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        String code="0";
+        List<PgAcuTask> pgAcuTaskList=new ArrayList<>();
+
+        try{
+            pgAcuTaskList=pgPileAcuManager.getACUTask(pileAcuList);
+            code="200";
+            msg="任务获取成功";
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            msg="任务获取失败";
+        }
+        resultMap.put("code",code);
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgAcuTaskList);
+
+        return resultMap;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
index ff85c61..66eec76 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
@@ -55,13 +55,13 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         try {
             PgInPgPerson pgInPgPerson = null;//pgInPgPersonManager.getPersonByUserName(userName);
             int iHostName = pgTagMacManager.getCount("select count(1) from PGTagMac where hostname = ?",assetCode);
-//            int iTagMac = pgTagMacManager.getCount("select count(1) from PGTagMac where tagmac = ?",assetCode.toUpperCase());
             if (0==iHostName)
             {
                 result = "false";
@@ -92,9 +92,8 @@
 
                 pgInPgStatusManager.save(pgInPgStatus);
 
-//                String syResult=pgInPgPersonManager.synchorizedInPgInfo(assetCode,userCode,userName,personType);
+                code="200";
                 result = "true";
-//                msg = "人员注册保存成功"+syResult;
                 msg = "人员注册保存成功";
             }
             else {
@@ -106,6 +105,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -120,6 +120,7 @@
     public Map<String, Object> getInPgPerson() throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<>();
         try {
@@ -127,11 +128,15 @@
             if (pgInPgInfoDtoList == null || pgInPgInfoDtoList.size() == 0)
                 msg = "没有找到入廊人员信息";
             else
+            {
+                code="200";
                 msg = "入廊人员信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "入廊人员信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
         return resultMap;
@@ -146,18 +151,22 @@
     public Map<String, Object> getInPgPersonInPg() throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
 
-        List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<PgInPgInfoDto>();
+        List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<>();
         try {
             pgInPgInfoDtoList = pgInPgPersonManager.getPgInPersonList(1);
             if (pgInPgInfoDtoList == null || pgInPgInfoDtoList.size() == 0)
                 msg = "没有找到入廊人员信息";
-            else
+            else {
+                code="200";
                 msg = "入廊人员信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "入廊人员信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
         return resultMap;
@@ -172,6 +181,7 @@
     public Map<String, Object> getInPgPersonByName(@FormParam("userName") String userName) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
 
         PgInPgPerson pgInPgPerson = null;
         PgInPgPersonDto pgInPgPersonDto=null;
@@ -184,12 +194,13 @@
                 pgInPgPersonDto=new PgInPgPersonDto(pgInPgPerson);
                 pgInPgPersonDtoList.add(pgInPgPersonDto);
                 msg = "人员信息获取成功";
+                code="200";
             }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "人员信息获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgPersonDtoList);
         return resultMap;
@@ -206,6 +217,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             PgInPgPerson pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName);
@@ -221,6 +233,7 @@
                     pgInPgPersonManager.save(pgInPgPerson);
                     result = "true";
                     msg = "编辑成功";
+                    code="200";
                 }
             }
         } catch (Exception e) {
@@ -228,9 +241,9 @@
             msg = "编辑失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -244,10 +257,12 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         int inPgNum=0;
         String msg = "";
+        String code="0";
 
         try{
             inPgNum=pgInPgStatusManager.getInPgNum();
 
+            code="200";
             msg="人员入廊次数获取成功";
         }
         catch(Exception e)
@@ -255,6 +270,7 @@
             e.printStackTrace();
             msg="人员入廊次数获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",inPgNum);
 
@@ -272,18 +288,22 @@
                                                    @FormParam("statisticType") String statisticType) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
 
         List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<PgInPgInfoDto>();
         try {
             pgInPgInfoDtoList = pgInPgPersonManager.getPgInPersonListByTime(startTime, endTime, statisticType);
             if(pgInPgInfoDtoList==null)
                 msg="入廊人员统计信息获取失败";
-            else
-                msg="入廊人员统计信息获取成功";
+            else {
+                code="200";
+                msg = "入廊人员统计信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "入廊人员统计信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
         return resultMap;
@@ -296,6 +316,7 @@
 
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
 
         try {
@@ -304,8 +325,10 @@
                 pgDeviceDtoList=pgDeviceManager.getPgCameraListByPosition("",apCodeStr);
                 if(pgDeviceDtoList==null)
                     msg="不存在关联摄像机";
-                else
-                    msg="关联摄像机获取成功";
+                else {
+                    code="200";
+                    msg = "关联摄像机获取成功";
+                }
             } else {
                 msg="请输入Ap编号";
             }
@@ -315,6 +338,7 @@
             msg="关联摄像机获取成功";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgDeviceDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java
index 507b3fe..b43f077 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java
@@ -34,6 +34,7 @@
 
         String result="";
         String msg="";
+        String code="";
         try{
             PgInPgStatus pgInPgStatus=new PgInPgStatus();
 
@@ -44,6 +45,7 @@
             pgInPgStatusManager.save(pgInPgStatus);
             msg="入廊时间提交成功";
             result="true";
+            code="200";
         }
         catch (Exception e){
             e.printStackTrace();
@@ -51,6 +53,7 @@
             result="false";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -66,6 +69,7 @@
 
         String result="";
         String msg="";
+        String code="0";
         try{
             PgInPgPerson pgInPgPerson=pgInPgPersonManager.getPgInPgPersonByAssetCode(assetCode);
 
@@ -79,6 +83,7 @@
             pgInPgStatusManager.save(pgInPgStatus);
 
             msg="出廊时间提交成功";
+            code="200";
             result="true";
         }
         catch (Exception e){
@@ -87,6 +92,7 @@
             result="false";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
index 9def330..9c0ba1f 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
@@ -33,17 +33,20 @@
                                             @FormParam("existNum") String existNum) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         String result="";
 
         try {
             pgIntelPlanManager.savePgIntelPlan(parName,lineName,maxNum,existNum);
             msg="规划数据保存成功";
+            code="200";
             result="true";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "规划数据保存失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
@@ -55,15 +58,18 @@
     public Map<String, Object> getIntelLineType() throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgIntelPlanTypeDto> pgIntelPlanTypeDtoList=new ArrayList<>();
         try {
             pgIntelPlanTypeDtoList=pgIntelPlanManager.getIntelPlanType();
+            code="200";
             msg="获取排线类型成功";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "获取排线类型失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgIntelPlanTypeDtoList);
         return resultMap;
@@ -76,6 +82,7 @@
                                             @FormParam("partitionStr") String partitionStr) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgIntelPlanDto> pgIntelPlanDtoList = new ArrayList<>();
 
@@ -83,8 +90,10 @@
             pgIntelPlanDtoList = pgIntelPlanManager.getPgIntelPlanListByPartion(lineName, partitionStr);
             if(pgIntelPlanDtoList==null||pgIntelPlanDtoList.size()==0)
                 msg="请输入正确的规划参数";
-            else
-                msg="规划数据获取成功";
+            else {
+                code="200";
+                msg = "规划数据获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "规划数据获取失败";
@@ -103,10 +112,12 @@
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
         String result="";
+        String code="0";
 
         try {
             boolean bl=pgIntelPlanManager.addLineUse(lineName,partitionStr,num);
             if(bl){
+                code="200";
                 msg="排线入廊成功";
                 result="true";
             }
@@ -119,6 +130,7 @@
             msg = "排线入廊失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
@@ -132,6 +144,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
         String result="";
+        String code="0";
 
         try {
             PgIntelPlan pgIntelPlan=pgIntelPlanManager.getPgIntelPlanByParNameAndLine(lineName,parName);
@@ -140,11 +153,13 @@
             pgIntelPlanManager.save(pgIntelPlan);
             msg="规划数据删除成功";
             result="true";
+            code="200";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "规划数据删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java b/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java
index 378af00..9c39523 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java
@@ -1,5 +1,6 @@
 package com.casic.PgInterface.rs;
 
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
 import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
 import com.casic.PgInterface.intelPlan.dto.PgLineHoleDTO;
 import com.casic.PgInterface.intelPlan.manager.PgLineHoleManager;
@@ -27,6 +28,9 @@
     @Resource
     private PgPileAcuManager pgPileAcuManager;
 
+    @Resource
+    private PgRoadManager pgRoadManager;
+
     @POST
     @Path("getPgLineAcuHole")
     @Produces(MediaType.APPLICATION_JSON)
@@ -34,23 +38,32 @@
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
         String result="";
+        String code="0";
         List<PgLineHoleDTO> pgLineHoleDTOList=new ArrayList<>();
 
         try {
             PgPileAcu pgPileAcu=pgPileAcuManager.getPgPileAcuByCode(acuCode);
             if(pgPileAcu==null){
                 msg="不存在分区";
-            }else{
-                pgLineHoleDTOList=pgLineHoleManager.getCurrentHoleByAcu(pgPileAcu.getId());
-                if(pgLineHoleDTOList!=null&&pgLineHoleDTOList.size()!=0)
-                    msg="获取成功";
-                else
-                    msg="未找到入廊数据";
+            }else {
+                pgLineHoleDTOList = pgLineHoleManager.getCurrentHoleByAcu(pgPileAcu.getId());
+                if (pgLineHoleDTOList != null && pgLineHoleDTOList.size() != 0)
+                {
+                    code="200";
+                    msg = "获取成功";
+                }
+                else {
+                    PgLineHoleDTO pgLineHoleDTO=new PgLineHoleDTO();
+                    pgLineHoleDTO.setRoad(pgRoadManager.get(pgPileAcu.getRoadId()).getRoadName());
+                    pgLineHoleDTOList.add(pgLineHoleDTO);
+                    msg = "未找到入廊数据";
+                }
             }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgLineHoleDTOList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgLogRs.java b/src/main/java/com/casic/PgInterface/rs/PgLogRs.java
index 39cff52..30db63b 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgLogRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgLogRs.java
@@ -45,6 +45,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         PgLog pgLog=new PgLog();
         try {
             PgUser pgUser = new PgUser();
@@ -60,14 +61,15 @@
             pgLogManager.save(pgLog);
             result = "true";
             msg = "保存成功";
-
+            code="200";
         } catch (Exception e) {
             result = "false";
             msg = "保存失败";
             e.printStackTrace();
         }
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -83,17 +85,21 @@
             throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgLogDto> pgLogDtoList = new ArrayList<PgLogDto>();
         try {
             pgLogDtoList = pgLogManager.getAllLogs(userName, startTime, endTime);
             if (pgLogDtoList == null || pgLogDtoList.size() == 0)
                 msg = "没有找到日志信息";
-            else
+            else {
+                code="200";
                 msg = "日志信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "日志信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgLogDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java
index 9fd0a5f..37b72f6 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java
@@ -36,19 +36,23 @@
         Map<String,Object> resultMap=new HashMap<>();
 
         String msg = "";
+        String code="0";
         List<PgMaintainType> pgMaintainTypeList=new ArrayList<>();
         try{
             pgMaintainTypeList=pgMaintainTypeManager.getMaintainType();
             if(pgMaintainTypeList!=null&&pgMaintainTypeList.size()!=0)
                 msg="不存在运维类别";
-            else
-                msg="运维类别获取成功";
+            else {
+                code="200";
+                msg = "运维类别获取成功";
+            }
         }
         catch(Exception ex)
         {
             ex.printStackTrace();
             msg="运维类别获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgMaintainTypeList);
 
@@ -65,10 +69,11 @@
         Map<String,Object> resultMap=new HashMap<>();
 
         String msg = "";
+        String code="0";
         List<PgMaintainTypeDto> pgMaintainTypeDtoList=new ArrayList<PgMaintainTypeDto>();
         try{
             pgMaintainTypeDtoList=pgMaintainTypeManager.getMaintainTypeModel(type);
-
+            code="200";
             msg="维护类型获取成功";
         }
         catch(Exception ex)
@@ -77,9 +82,9 @@
             msg="维护类型获取失败";
         }
 
-        resultMap.put("result",pgMaintainTypeDtoList);
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgMaintainTypeDtoList);
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java
index d735cc9..82ffca4 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java
@@ -33,12 +33,16 @@
                                                  @FormParam("endTime") String endTime){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
         List<PgMaintanceRecordHeadDto> pgMaintanceRecordHeadDtoList=new ArrayList<>();
         try{
             pgMaintanceRecordHeadDtoList=pgMaintanceRecordHeadManager.getPgMaintanceRecordHeadLsit(repairMan,startTime,endTime);
             if(pgMaintanceRecordHeadDtoList!=null&&pgMaintanceRecordHeadDtoList.size()!=0)
+            {
+                code="200";
                 msg="维护信息获取成功";
+            }
             else
                 msg="不存在维护信息";
         }
@@ -47,6 +51,7 @@
             msg="巡检信息获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgMaintanceRecordHeadDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java
index effc9df..9f46fc8 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java
@@ -32,12 +32,16 @@
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
         String result="";
+        String code="0";
 
         List<PgMaintanceRecordHeadStatic> pgMaintanceRecordHeadStaticList=new ArrayList<>();
         try{
             pgMaintanceRecordHeadStaticList=pgMaintanceRecordHeadManager.getPgMaintanceRecordHeadStaticLisByTime(startTime,endTime,staticType);
             if(pgMaintanceRecordHeadStaticList!=null&&pgMaintanceRecordHeadStaticList.size()!=0)
+            {
+                code="200";
                 msg="维护统计信息获取成功";
+            }
             else
                 msg="维护统计失败";
         }
@@ -46,7 +50,7 @@
             ex.printStackTrace();
             msg="统计失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgMaintanceRecordHeadStaticList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java b/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java
index 3a67bf3..6a5f4dc 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java
@@ -39,27 +39,31 @@
     @Path("getO2InfoByDevAndDate")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getO2InfoByDevAndDate(@FormParam("assetCode") String assetCode,
-                                                      @FormParam("startDate") String startDate,
-                                                      @FormParam("endDate") String endDate)throws Exception {
+                                                     @FormParam("startDate") String startDate,
+                                                     @FormParam("endDate") String endDate)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgHistoryDataDto> pgHistoryDataDtoList=new ArrayList<>();
 
         try {
             PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
                 msg="设备不存在";
-            else{
-                pgHistoryDataDtoList=pgO2Manager.getAllO2Data(pgDevice, startDate, endDate);
-                if(pgHistoryDataDtoList==null)
-                    msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+            else {
+                pgHistoryDataDtoList = pgO2Manager.getAllO2Data(pgDevice, startDate, endDate);
+                if (pgHistoryDataDtoList == null)
+                    msg = "没有满足要求的数据";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgHistoryDataDtoList);
         return resultMap;
@@ -75,23 +79,27 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         PgO2Dto pgO2Dto=new PgO2Dto(null);
 
         try {
             PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
                 msg="设备不存在";
-            else{
-                pgO2Dto=pgO2Manager.getNewestO2Data(pgDevice);
-                if(pgO2Dto==null)
-                    msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+            else {
+                pgO2Dto = pgO2Manager.getNewestO2Data(pgDevice);
+                if (pgO2Dto == null)
+                    msg = "没有满足要求的数据";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgO2Dto);
         return resultMap;
@@ -104,11 +112,12 @@
     @Path("addO2Data")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> addO2Data(@FormParam("devCode") String devCode,
-                                          @FormParam("upTime") String upTime,
-                                          @FormParam("o2") String o2)throws Exception {
+                                         @FormParam("upTime") String upTime,
+                                         @FormParam("o2") String o2)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
@@ -125,6 +134,7 @@
                 pgO2.setPgDeviceId(pgDevice);
 
                 pgO2Manager.save(pgO2);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -133,9 +143,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java b/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java
index 6217cde..70b3b41 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java
@@ -30,8 +30,6 @@
 public class PgOverViewRs {
 
     @Resource
-    private PgInPgPersonManager pgInPgPersonManager;
-    @Resource
     private PgInPgStatusManager pgInPgStatusManager;
     @Resource
     private PgAlarmManager pgAlarmManager;
@@ -46,18 +44,21 @@
     @Path("getPersonNumInPgByMonth")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<Object, String> getMonthInPgPersonNum() throws Exception {
-        Map<Object, String> resultMap = new HashMap<Object, String>();
+        Map<Object, String> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         int inNum = 0;
 
         try {
             inNum = pgInPgStatusManager.getMonthInPgPersonNum();
+            code="200";
             msg = "本月入廊人员次数获取成功";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "本月入廊人员次数获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", String.valueOf(inNum));
 
@@ -73,15 +74,18 @@
     public Map<Object, String> getWeekInPgPersonNum() throws Exception {
         Map<Object, String> resultMap = new HashMap<Object, String>();
         String msg = "";
+        String code="0";
         int inNum = 0;
         try {
             inNum = pgInPgStatusManager.getWeekInPgPersonNum();
+            code="200";
             msg = "本周入廊人员次数获取成功";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "本周入廊人员次数获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", String.valueOf(inNum));
 
@@ -97,19 +101,22 @@
     public Map<String, Object> getDayInPgStatistic() throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<>();
         try {
             pgInPgInfoDtoList = pgInPgStatusManager.getPgInPersonListByDay();
             if (pgInPgInfoDtoList == null)
                 msg = "信息获取失败";
-            else
+            else {
+                code="200";
                 msg = "信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "信息获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
         return resultMap;
@@ -124,18 +131,23 @@
     public Map<String, Object> getTodayInPgInfo() throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
 
         List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<PgInPgInfoDto>();
         try {
             pgInPgInfoDtoList = pgInPgStatusManager.getTodayInPgInfo();
             if(pgInPgInfoDtoList!=null||pgInPgInfoDtoList.size()!=0)
+            {
+                code="200";
                 msg = "信息获取成功";
+            }
             else
                 msg="当天没有入廊人员信息";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
 
@@ -149,18 +161,22 @@
     public Map<String, Object> getAlarmNum(@FormParam("isDevFault") String isDevFault) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         int num = 0;
 
         try {
             if(isDevFault!=null){
                 num = pgAlarmManager.getAlarmNum(isDevFault);
-                msg = "报警数量获取成功";}
+                msg = "报警数量获取成功";
+                code="200";
+            }
             else
                 msg="请输入统计参数";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警数量统计失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", num);
 
@@ -176,16 +192,18 @@
     public Map<Object, String> getMonthAlarmNum(@FormParam("isDevFault") String isDevFault) throws Exception {
         Map<Object, String> resultMap = new HashMap<Object, String>();
         String msg = "";
+        String code="0";
         int inNum = 0;
 
         try {
-                inNum = pgAlarmManager.getMonthAlarmNum(isDevFault);
-                msg = "报警次数获取成功";
+            inNum = pgAlarmManager.getMonthAlarmNum(isDevFault);
+            code="200";
+            msg = "报警次数获取成功";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警次数获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", String.valueOf(inNum));
 
@@ -201,15 +219,17 @@
     public Map<Object, String> getWeekAlarmNum(@FormParam("isDevFault") String isDevFault) throws Exception {
         Map<Object, String> resultMap = new HashMap<Object, String>();
         String msg = "";
+        String code="0";
         int inNum = 0;
         try {
             inNum = pgAlarmManager.getWeekAlarmNum(isDevFault);
+            code="200";
             msg = "报警次数获取成功";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警次数获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", String.valueOf(inNum));
 
@@ -225,14 +245,17 @@
     public Map<String, Object> getDayAlarmStatistic() throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgAlarmTjDto> pgAlarmTjDtoList = new ArrayList<PgAlarmTjDto>();
         try {
             pgAlarmTjDtoList = pgAlarmManager.getDayAlarmStatistic();
             if (pgAlarmTjDtoList == null)
                 msg = "信息获取失败";
-            else
+            else {
+                code="200";
                 msg = "信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "信息获取失败";
@@ -252,9 +275,11 @@
     public Map<String, Object> getAlarmList(@FormParam("isDevFault") String isDevFault) throws Exception{
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         List<PgAlarmDto> pgAlarmDtoList=new ArrayList<>();
         try{
             pgAlarmDtoList=pgAlarmManager.getAlarmList(isDevFault);
+            code="200";
             msg="信息获取成功";
         }
         catch(Exception e)
@@ -262,6 +287,7 @@
             e.printStackTrace();
             msg="信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAlarmDtoList);
 
@@ -278,17 +304,19 @@
     public Map<String,Object> getConstructionNum() throws Exception{
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgConstructionTypeNumStatisticDto> pgConstructionTypeNumDtoList=new ArrayList<PgConstructionTypeNumStatisticDto>();
         try{
             pgConstructionTypeNumDtoList=pgConstructionManager.getConstructionNum();
             msg="施工数量获取成功";
+            code="200";
         }
         catch(Exception e)
         {
             e.printStackTrace();
             msg="施工数量统计";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionTypeNumDtoList);
 
@@ -302,21 +330,25 @@
     @Path("getConstructionToday")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> getConstructionToday() throws Exception{
-        Map<String,Object > resultMap = new HashMap<String,Object>();
+        Map<String,Object > resultMap = new HashMap<>();
         String msg = "";
-        List<PgConstructionDto> pgConstructionDtoList=new ArrayList<PgConstructionDto>();
+        String code="0";
+        List<PgConstructionDto> pgConstructionDtoList=new ArrayList<>();
         try {
             pgConstructionDtoList = pgConstructionManager.getConstructionToday();
-            if (pgConstructionDtoList == null&&pgConstructionDtoList.size()==0)
+            if (pgConstructionDtoList == null && pgConstructionDtoList.size() == 0)
                 msg = "不存在施工信息";
-            else
+            else {
+                code="200";
                 msg = "施工信息获取成功";
+            }
         }
         catch(Exception e)
         {
             e.printStackTrace();
             msg="施工信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java b/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java
index d3c10d4..31ffcfc 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java
@@ -48,6 +48,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 
         try {
@@ -66,9 +67,9 @@
                 pgPartition.setMaterial(material);
                 pgPartition.setActive(1);
 
-                logger.info("成功保存");
                 pgPartitionManager.save(pgPartition);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
         } catch (Exception e) {
@@ -76,9 +77,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
         return resultMap;
     }
     /*
@@ -100,6 +101,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         PgPartition partition = new PgPartition();
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
@@ -122,6 +124,7 @@
 
                 pgPartitionManager.save(pgPartition);
                 result = "true";
+                code="200";
                 msg = "编辑成功";
             }
 
@@ -131,8 +134,10 @@
             e.printStackTrace();
         }
 
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
+
         return resultMap;
     }
 
@@ -147,7 +152,8 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
-        String result="false";
+        String result="";
+        String code="0";
 
         try {
             PgPartition pgPartition=pgPartitionManager.get(Long.valueOf(id));
@@ -161,12 +167,14 @@
                 pgPartitionManager.save(pgPartition);
                 msg="分区删除成功";
                 result="true";
+                code="200";
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="分区删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -181,14 +189,17 @@
     public Map<String, Object> getPartition() throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgPartitionDto> pgPartitionDtoList = new ArrayList<PgPartitionDto>();
         try {
             pgPartitionDtoList = pgPartitionManager.getPgPartitionDtoList();
+            code="200";
             msg = "获取成功";
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgPartitionDtoList);
         return resultMap;
@@ -203,14 +214,17 @@
     public Map<String, Object> getPartitionListByName(@FormParam("parName") String parName) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgPartitionDto> pgPartitionDtoList = new ArrayList<PgPartitionDto>();
         try {
             pgPartitionDtoList = pgPartitionManager.getPartitionByName(parName);
+            code="200";
             msg = "获取成功";
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgPartitionDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java b/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java
index 883adf9..cf81b72 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java
@@ -37,6 +37,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
         PgRoad pgRoad=pgRoadManager.getPgRoadByName(road);
         try {
             PgPileAcu pgPileAcu=new PgPileAcu();
@@ -49,6 +50,7 @@
             pgPileAcu.setActive(true);
 
             pgPileAcuManager.save(pgPileAcu);
+            code="200";
             result="true";
             msg="保存成功";
         } catch (Exception e) {
@@ -56,9 +58,10 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
+
         return resultMap;
     }
 
@@ -73,6 +76,7 @@
 
         String result="";
         String msg="";
+        String code="0";
         try{
             PgPileAcu pgPileAcu=pgPileAcuManager.get(id);
             if(pgPileAcu==null){
@@ -83,7 +87,7 @@
             {
                 pgPileAcu.setActive(false);
                 pgPileAcuManager.save(pgPileAcu);
-
+                code="200";
                 result="true";
                 msg="桩号删除成功";
             }
@@ -94,8 +98,9 @@
             ex.printStackTrace();
         }
 
-        resultMap.put("result",result);
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
+        resultMap.put("result",result);
 
         return resultMap;
     }

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 25ded8a..283d7ab 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,20 +7,56 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" 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/construction/manager/PgCsDocumentManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/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/manager/PgAlarmManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/~$说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/~$说明20191207.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.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$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/接口说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明20191207.docx" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
@@ -51,7 +87,7 @@
         <counts>
           <entry key="class" value="4" />
           <entry key="iml" value="2" />
-          <entry key="java" value="707" />
+          <entry key="java" value="820" />
           <entry key="properties" value="14" />
           <entry key="xml" value="7" />
         </counts>
@@ -60,7 +96,7 @@
         <counts>
           <entry key="CLASS" value="4" />
           <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="707" />
+          <entry key="JAVA" value="820" />
           <entry key="Properties" value="14" />
           <entry key="XML" value="7" />
         </counts>
@@ -68,32 +104,32 @@
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
           <entry key="dummy" value="38" />
-          <entry key="java" value="30161" />
+          <entry key="java" value="40859" />
           <entry key="properties" value="100" />
-          <entry key="txt" value="176" />
+          <entry key="txt" value="186" />
           <entry key="xml" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="30161" />
-          <entry key="PLAIN_TEXT" value="214" />
+          <entry key="JAVA" value="40859" />
+          <entry key="PLAIN_TEXT" value="224" />
           <entry key="Properties" value="100" />
           <entry key="XML" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="48" />
+          <entry key="project.closed" value="51" />
           <entry key="project.open.time.1" value="5" />
           <entry key="project.open.time.12" value="2" />
           <entry key="project.open.time.13" value="1" />
           <entry key="project.open.time.15" value="1" />
           <entry key="project.open.time.16" value="1" />
           <entry key="project.open.time.17" value="1" />
-          <entry key="project.open.time.2" value="1" />
+          <entry key="project.open.time.2" value="2" />
           <entry key="project.open.time.20" value="1" />
-          <entry key="project.open.time.23" value="1" />
+          <entry key="project.open.time.23" value="2" />
           <entry key="project.open.time.24" value="2" />
           <entry key="project.open.time.251" value="1" />
           <entry key="project.open.time.27" value="2" />
@@ -106,8 +142,8 @@
           <entry key="project.open.time.36" value="1" />
           <entry key="project.open.time.37" value="1" />
           <entry key="project.open.time.39" value="2" />
-          <entry key="project.open.time.4" value="2" />
-          <entry key="project.open.time.40" value="1" />
+          <entry key="project.open.time.4" value="3" />
+          <entry key="project.open.time.40" value="2" />
           <entry key="project.open.time.41" value="2" />
           <entry key="project.open.time.42" value="2" />
           <entry key="project.open.time.43" value="2" />
@@ -122,23 +158,25 @@
           <entry key="project.open.time.6" value="3" />
           <entry key="project.open.time.63" value="2" />
           <entry key="project.open.time.64" value="1" />
+          <entry key="project.open.time.66" value="1" />
           <entry key="project.open.time.71" value="2" />
+          <entry key="project.open.time.74" value="1" />
           <entry key="project.open.time.76" value="1" />
           <entry key="project.open.time.8" value="2" />
           <entry key="project.open.time.9" value="1" />
           <entry key="project.open.time.97" value="1" />
-          <entry key="project.opened" value="78" />
+          <entry key="project.opened" value="84" />
         </counts>
       </usages-collector>
     </session>
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+            <state relative-caret-position="396">
+              <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
               <folding>
                 <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
                 <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -147,73 +185,6 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <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="99">
-              <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-              <folding>
-                <element signature="imports" expanded="true" />
-                <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-1170">
-              <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state>
-              <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
-              <folding>
-                <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-                <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="true">
-        <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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-              <folding>
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-                <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>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <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="352">
-              <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -225,18 +196,9 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>inCriteria</find>
-      <find>getPgPlanResulList</find>
-      <find>getPileAcuListByPileAcuStr</find>
-      <find>distinct</find>
-      <find>order</find>
-      <find>canPlanLine</find>
-      <find>isExistLine</find>
-      <find>getPlanResult</find>
       <find>pgPipeLine</find>
       <find>getPipeLineBylineName</find>
       <find>StringU</find>
-      <find>getAllAlarm</find>
       <find>getAlarmList</find>
       <find>getPgInPersonListByDay</find>
       <find>getDayInPgStatistic</find>
@@ -254,7 +216,16 @@
       <find>getPgContructionByNameOrType</find>
       <find>&quot;&quot;,&quot;&quot;,</find>
       <find>getPgContructionDtoByNameOrType</find>
+      <find>addConstruction</find>
+      <find>getPgLineAcuHole</find>
+      <find>getPlanResult</find>
       <find>getConstruction</find>
+      <find>addPipeLine</find>
+      <find>未找到入廊数据</find>
+      <find>getCurrentHoleByAcu</find>
+      <find>getAllAlarm</find>
+      <find>getPgDeviceDtoListByPartition</find>
+      <find>getPgDeviceByDevType</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -263,57 +234,57 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlan.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileHoleManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/planData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/PlanData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
       </list>
     </option>
   </component>
@@ -359,7 +330,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -421,53 +391,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="dto" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="manager" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -479,29 +402,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="rs" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -516,6 +416,7 @@
         </subPane>
       </pane>
       <pane id="Scope" />
+      <pane id="PackagesPane" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -710,7 +611,13 @@
       <workItem from="1574902733573" duration="1829000" />
       <workItem from="1574998240004" duration="7016000" />
       <workItem from="1575247959683" duration="6997000" />
-      <workItem from="1575704345590" duration="40473000" />
+      <workItem from="1575704345590" duration="69381000" />
+      <workItem from="1575869479666" duration="721000" />
+      <workItem from="1575947104878" duration="6101000" />
+      <workItem from="1576128264436" duration="3347000" />
+      <workItem from="1576208571543" duration="22000" />
+      <workItem from="1576227513917" duration="862000" />
+      <workItem from="1576293721220" duration="18246000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -817,11 +724,18 @@
       <option name="project" value="LOCAL" />
       <updated>1575775489149</updated>
     </task>
-    <option name="localTasksCounter" value="16" />
+    <task id="LOCAL-00016" summary="整改施工信息">
+      <created>1575791780774</created>
+      <option name="number" value="00016" />
+      <option name="presentableId" value="LOCAL-00016" />
+      <option name="project" value="LOCAL" />
+      <updated>1575791780774</updated>
+    </task>
+    <option name="localTasksCounter" value="17" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="452131000" />
+    <option name="totallyTimeSpent" value="510338000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -834,9 +748,8 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
-    <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.24205749" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2647504" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -847,7 +760,7 @@
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.3295082" />
       <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.4819672" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.65737706" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.3295082" />
@@ -939,7 +852,8 @@
     <MESSAGE value="重新设计智能规划部分" />
     <MESSAGE value="完成智能规划对接" />
     <MESSAGE value="修改报警统计" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改报警统计" />
+    <MESSAGE value="整改施工信息" />
+    <option name="LAST_COMMIT_MESSAGE" value="整改施工信息" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -951,16 +865,10 @@
           <option name="timeStamp" value="3" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java</url>
-          <line>69</line>
+          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java</url>
+          <line>40</line>
           <properties />
-          <option name="timeStamp" value="21" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java</url>
-          <line>96</line>
-          <properties />
-          <option name="timeStamp" value="38" />
+          <option name="timeStamp" value="122" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
@@ -970,394 +878,452 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <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="2068">
-          <caret line="154" column="35" selection-start-line="154" selection-start-column="35" selection-end-line="154" selection-end-column="35" />
-        </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="3300">
-          <caret line="297" column="22" selection-start-line="297" selection-start-column="22" selection-end-line="297" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/StringUtils.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
-          <caret line="13" column="48" lean-forward="true" selection-start-line="13" selection-start-column="48" selection-end-line="13" selection-end-column="48" />
+          <caret line="11" column="5" selection-start-line="11" selection-start-column="5" selection-end-line="11" selection-end-column="5" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="78" lean-forward="true" selection-start-line="78" selection-end-line="78" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="616">
-          <caret line="41" column="1" selection-start-line="41" selection-start-column="1" selection-end-line="41" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="110">
-          <caret line="12" column="23" selection-start-line="12" selection-start-column="23" selection-end-line="12" selection-end-column="23" />
+        <state relative-caret-position="516">
+          <caret line="114" column="12" selection-start-line="114" selection-start-column="12" selection-end-line="114" selection-end-column="12" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="164">
-          <caret line="56" lean-forward="true" selection-start-line="56" selection-end-line="56" />
+        <state relative-caret-position="418">
+          <caret line="33" column="44" selection-start-line="33" selection-start-column="44" selection-end-line="33" selection-end-column="44" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="258">
-          <caret line="27" column="12" lean-forward="true" selection-start-line="27" selection-start-column="12" selection-end-line="27" selection-end-column="12" />
+        <state relative-caret-position="132">
+          <caret line="11" column="20" lean-forward="true" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="20" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.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="-12">
-          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        <state relative-caret-position="516">
+          <caret line="142" column="54" selection-start-line="142" selection-start-column="54" selection-end-line="142" selection-end-column="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="858">
-          <caret line="55" column="27" lean-forward="true" selection-start-line="55" selection-start-column="27" selection-end-line="55" selection-end-column="27" />
+        <state relative-caret-position="66">
+          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="58">
+          <caret line="18" column="28" selection-start-line="18" selection-start-column="19" selection-end-line="18" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="305">
+          <caret line="24" column="31" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="714">
+          <caret line="58" column="5" lean-forward="true" selection-start-line="58" selection-start-column="5" selection-end-line="58" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="924">
+          <caret line="134" column="92" selection-start-line="134" selection-start-column="92" selection-end-line="134" selection-end-column="92" />
+          <folding>
+            <element signature="method#linkDevice#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkPartitionCamera#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkReservePlan#0;class#PgAlarmLinkRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1066">
+          <caret line="90" lean-forward="true" selection-start-line="90" selection-end-line="90" />
+          <folding>
+            <element signature="method#getTjResultByAlarmType#0;class#PgAlarmTjRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="946">
+          <caret line="148" column="11" lean-forward="true" selection-start-line="148" selection-start-column="11" selection-end-line="148" selection-end-column="11" />
+          <folding>
+            <element signature="method#getAlarmTypeList#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#addAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#editAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#deleteAlarmType#0;class#PgAlarmTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="208">
+          <caret line="46" column="23" lean-forward="true" selection-start-line="46" selection-start-column="23" selection-end-line="46" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="113" column="9" lean-forward="true" selection-start-line="113" selection-start-column="9" selection-end-line="113" selection-end-column="9" />
+          <folding>
+            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
+            <element signature="method#getNewestCh4InfoByDev#0;class#PgCh4Rs#0" />
+            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="145" column="6" lean-forward="true" selection-start-line="145" selection-start-column="6" selection-end-line="145" selection-end-column="6" />
+          <folding>
+            <element signature="method#addAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#editAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#deleteAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#getAuthorityList#0;class#PgAuthorityRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="58" column="1" lean-forward="true" selection-start-line="58" selection-start-column="1" selection-end-line="58" selection-end-column="1" />
+          <folding>
+            <element signature="method#getPgAssetPlanList#0;class#PgAssetPlanRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="370">
+          <caret line="371" column="66" selection-start-line="371" selection-start-column="66" selection-end-line="371" selection-end-column="66" />
+          <folding>
+            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#searchConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionDev#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="139" column="13" lean-forward="true" selection-start-line="139" selection-start-column="13" selection-end-line="139" selection-end-column="13" />
+          <folding>
+            <element signature="method#getCoInfoByDevAndDate#0;class#PgCoRs#0" />
+            <element signature="method#getNewestCoInfoByDev#0;class#PgCoRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="540">
+          <caret line="223" column="5" lean-forward="true" selection-start-line="223" selection-start-column="5" selection-end-line="223" selection-end-column="5" />
+          <folding>
+            <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="682">
+          <caret line="100" lean-forward="true" selection-start-line="100" selection-end-line="100" />
+          <folding>
+            <element signature="method#getDeviceTpeyList#0;class#PgDeviceTypeRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="377">
+          <caret line="225" column="35" selection-start-line="225" selection-start-column="35" selection-end-line="225" selection-end-column="35" />
+          <folding>
+            <element signature="method#addEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#addEquipment#1;class#PgEquipmentRs#0" />
+            <element signature="method#getEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#deleteEquipment#0;class#PgEquipmentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="406">
+          <caret line="109" lean-forward="true" selection-start-line="109" selection-end-line="109" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="154">
+          <caret line="28" column="19" selection-start-line="28" selection-start-column="19" selection-end-line="28" selection-end-column="19" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="748">
-          <caret line="49" column="5" lean-forward="true" selection-start-line="49" selection-start-column="5" selection-end-line="49" selection-end-column="5" />
+        <state relative-caret-position="296">
+          <caret line="161" column="35" selection-start-line="161" selection-start-column="35" selection-end-line="161" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="384">
+          <caret line="99" column="5" lean-forward="true" selection-start-line="99" selection-start-column="5" selection-end-line="99" selection-end-column="5" />
+        </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="362">
+          <caret line="340" column="35" selection-start-line="340" selection-start-column="35" selection-end-line="340" selection-end-column="35" />
+          <folding>
+            <element signature="method#addInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPersonInPg#0;class#PgInPgPersonRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-606">
+          <caret line="76" column="20" lean-forward="true" selection-start-line="76" selection-start-column="20" selection-end-line="76" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="65" column="35" selection-start-line="65" selection-start-column="35" selection-end-line="65" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="101" column="35" selection-start-line="101" selection-start-column="35" selection-end-line="101" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="84" column="35" selection-start-line="84" selection-start-column="35" selection-end-line="84" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="59" lean-forward="true" selection-start-line="59" selection-end-line="59" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="60" column="1" lean-forward="true" selection-start-line="60" selection-start-column="1" selection-end-line="60" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="145" column="35" selection-start-line="145" selection-start-column="35" selection-end-line="145" selection-end-column="35" />
+        </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="274">
+          <caret line="350" column="35" selection-start-line="350" selection-start-column="35" selection-end-line="350" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="121" column="39" selection-start-line="121" selection-start-column="39" selection-end-line="121" selection-end-column="39" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="28" column="8" lean-forward="true" selection-start-line="28" selection-start-column="8" selection-end-line="28" selection-end-column="8" />
+        <state relative-caret-position="340">
+          <caret line="103" selection-start-line="103" selection-end-line="103" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="226" column="35" selection-start-line="226" selection-start-column="35" selection-end-line="226" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="203" column="35" selection-start-line="203" selection-start-column="35" selection-end-line="203" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="241" column="35" selection-start-line="241" selection-start-column="35" selection-end-line="241" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="225" column="1" lean-forward="true" selection-start-line="225" selection-start-column="1" selection-end-line="225" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="176" column="5" lean-forward="true" selection-start-line="176" selection-start-column="5" selection-end-line="176" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="178" column="35" lean-forward="true" selection-start-line="178" selection-start-column="35" selection-end-line="178" selection-end-column="35" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="516">
-          <caret line="94" column="53" selection-start-line="94" selection-start-column="53" selection-end-line="94" selection-end-column="53" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="814">
-          <caret line="52" column="9" lean-forward="true" selection-start-line="52" selection-start-column="9" selection-end-line="52" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="182">
-          <caret line="58" column="12" lean-forward="true" selection-start-line="58" selection-start-column="12" selection-end-line="58" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="34" lean-forward="true" selection-start-line="34" selection-end-line="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="32" lean-forward="true" selection-start-line="32" selection-end-line="32" />
-          <folding>
-            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
-            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="185">
-          <caret line="63" column="13" selection-start-line="63" selection-start-column="13" selection-end-line="63" selection-end-column="13" />
-          <folding>
-            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
-            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
-            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="e#6319#6324#0" />
-            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
-          </folding>
+          <caret line="240" lean-forward="true" selection-start-line="240" selection-end-line="240" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
-          <caret line="58" column="28" lean-forward="true" selection-start-line="58" selection-start-column="28" selection-end-line="58" selection-end-column="28" />
-          <folding>
-            <element signature="method#addTempHumData#0;class#PgTempHumRs#0" />
-          </folding>
+        <state relative-caret-position="340">
+          <caret line="148" column="34" selection-start-line="148" selection-start-column="34" selection-end-line="148" selection-end-column="34" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
+        <state relative-caret-position="458">
+          <caret line="99" column="35" selection-start-line="99" selection-start-column="35" selection-end-line="99" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+        <state relative-caret-position="384">
+          <caret line="145" column="32" lean-forward="true" selection-start-line="145" selection-start-column="32" selection-end-line="145" selection-end-column="32" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="414">
-          <caret line="22" column="46" lean-forward="true" selection-start-line="22" selection-start-column="46" selection-end-line="22" selection-end-column="46" />
-        </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="396">
-          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" column="83" selection-start-line="11" selection-start-column="83" selection-end-line="11" selection-end-column="83" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="26">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
-          <folding>
-            <element signature="method#getPgInPgStatusByPerson#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNumByName#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNum#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPersonListByDay#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPgStatusByPgInPgPerson#0;class#PgInPgStatusManager#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="44">
-          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-12">
-          <caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="87" lean-forward="true" selection-start-line="87" selection-end-line="87" />
-          <folding>
-            <element signature="method#getConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#addConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#deleteConstructionType#0;class#PgConstructionTypeRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
-          <folding>
-            <element signature="method#getConstructionTypeByType#0;class#PgConstructionTypeManager#0" />
-            <element signature="method#getAllConstructionTypeDto#0;class#PgConstructionTypeManager#0" />
-          </folding>
-        </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="145">
-          <caret line="258" column="9" lean-forward="true" selection-start-line="258" selection-start-column="9" selection-end-line="258" selection-end-column="9" />
-          <folding>
-            <element signature="method#getMonthInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayInPgStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgOverViewRs#0" />
-            <element signature="method#getAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getMonthAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayAlarmStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgOverViewRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="103">
-          <caret line="105" column="50" lean-forward="true" selection-start-line="105" selection-start-column="50" selection-end-line="105" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateBasicDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="99">
-          <caret line="125" selection-start-line="125" selection-end-line="125" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="190">
-          <caret line="24" column="35" lean-forward="true" selection-start-line="24" selection-start-column="35" selection-end-line="24" selection-end-column="35" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="436">
-          <caret line="24" lean-forward="true" selection-start-line="24" selection-end-line="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" lean-forward="true" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="300">
-          <caret line="34" column="31" lean-forward="true" selection-start-line="34" selection-start-column="31" selection-end-line="34" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="42" column="13" lean-forward="true" selection-start-line="42" selection-start-column="13" selection-end-line="42" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="120" column="72" lean-forward="true" selection-start-line="120" selection-start-column="72" selection-end-line="120" selection-end-column="72" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="293">
-          <caret line="58" column="73" lean-forward="true" selection-start-line="58" selection-start-column="73" selection-end-line="58" selection-end-column="73" />
-          <folding>
-            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
-            <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
-          </folding>
-        </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="307">
-          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
+        <state relative-caret-position="758">
+          <caret line="130" column="5" lean-forward="true" selection-start-line="130" selection-start-column="5" selection-end-line="130" selection-end-column="5" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1170">
-          <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
+        <state relative-caret-position="494">
+          <caret line="86" column="62" lean-forward="true" selection-start-line="86" selection-start-column="62" selection-end-line="86" selection-end-column="62" />
           <folding>
-            <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-            <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+            <element signature="method#getAllDevice#0;class#PgDeviceManager#0" />
+            <element signature="method#getAllDev#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="195" column="28" lean-forward="true" selection-start-line="195" selection-start-column="28" selection-end-line="195" selection-end-column="28" />
+        <state relative-caret-position="166">
+          <caret line="174" column="13" lean-forward="true" selection-start-line="174" selection-start-column="13" selection-end-line="174" selection-end-column="13" />
           <folding>
-            <element signature="method#getAlarmByTypeAndTime#0;class#PgAlarmManager#0" />
-            <element signature="method#getAlarmNum#0;class#PgAlarmManager#0" />
             <element signature="method#getDayAlarmStatistic#0;class#PgAlarmManager#0" />
+            <element signature="method#getAlarmList#0;class#PgAlarmManager#0" />
             <element signature="method#createDTO#0;class#PgAlarmManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="364">
+          <caret line="46" column="56" lean-forward="true" selection-start-line="46" selection-start-column="56" selection-end-line="46" selection-end-column="56" />
+          <folding>
+            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
+            <element signature="method#getPgDev#0;class#PgDeviceRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
+            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+        <state relative-caret-position="396">
+          <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
           <folding>
             <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
             <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -1365,52 +1331,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="239">
-          <caret line="21" column="33" lean-forward="true" selection-start-line="21" selection-start-column="33" selection-end-line="21" selection-end-column="33" />
-        </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="352">
-          <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-        </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="99">
-          <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-          </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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-          <folding>
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-            <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>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
index c436c93..e913155 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
@@ -132,7 +132,10 @@
             this.setAlarmType("");
         else
             this.setAlarmType(pgAlarm.getAlarmTypeId().getAlarmType());
-        this.setAlarmValue(pgAlarm.getAlarmValue());
+        if(pgAlarm.getAlarmValue()==null)
+            this.setAlarmValue("");
+        else
+            this.setAlarmValue(pgAlarm.getAlarmValue());
         if (pgAlarm.getAlarmDate() != null)
             this.setAlarmDate(sdf.format(pgAlarm.getAlarmDate()));
         else
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
index a43965c..565cb41 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -159,11 +159,21 @@
     }
 
     //获取历史报警消息列表
-    public List<PgAlarmDto> getAllAlarm(String alarmType,String startDay,String endDay,String isNew,int page,int rows) {
-        try {
+    public  Map<String, Object> getAllAlarm(String alarmType,String partition,String startDay,String endDay,String isNew,int page,int rows) {
 
+        Map<String, Object> resultMap = new HashMap<>();
+        String msg="";
+
+        try {
             Criteria criteria = createCriteria(PgAlarm.class);
 
+            if (StringUtils.isNotBlank(partition)) {
+                DetachedCriteria inCriteria = DetachedCriteria.forClass(PgDevice.class);
+                inCriteria.add(Restrictions.eq("partition", partition));
+                inCriteria.setProjection(Property.forName("id"));
+                criteria.add(Property.forName("alarmDevId").in(inCriteria));
+            }
+
             if (StringUtils.isNotBlank(alarmType)&&!alarmType.contains("全部")&&pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
                 criteria.add(Restrictions.eq("alarmTypeId", pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)));
 
@@ -190,8 +200,16 @@
             for (PgAlarm pgAlarm : pgAlarmList) {
                 pgAlarmDtoList.add(new PgAlarmDto(pgAlarm));
             }
-
-            return pgAlarmDtoList;
+            if(pgAlarmDtoList==null||pgAlarmDtoList.size()==0) {
+                resultMap.put("msg", "没有报警信息");
+                resultMap.put("code","0");
+            }else {
+                resultMap.put("code","200");
+                resultMap.put("msg", "报警信息获取成功");
+            }
+            resultMap.put("count",pg.getTotalCount());
+            resultMap.put("result",pgAlarmDtoList);
+            return resultMap;
         }
         catch(Exception ex){
             ex.printStackTrace();
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index 7547560..654f49e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -24,11 +24,11 @@
 
         Criteria criteria = createCriteria(PgDevice.class);
 
-        if(road!=null)
+        if(StringUtils.isNotBlank(road))
             criteria.add(Restrictions.eq("road",road));
-        if(partition!=null)
+        if(StringUtils.isNotBlank(partition))
             criteria.add(Restrictions.eq("partition",partition));
-        if(devType!=null)
+        if(StringUtils.isNotBlank(devType))
             criteria.add(Restrictions.eq("devType",devType));
 
         criteria.add(Restrictions.eq("active", 1));
@@ -43,6 +43,29 @@
         return pgDeviceDtoList;
     }
 
+    public List<PgDeviceDto> getAllDev(String road,String partition,String devType) {
+
+        Criteria criteria = createCriteria(PgDevice.class);
+
+        if(StringUtils.isNotBlank(road))
+            criteria.add(Restrictions.eq("road",road));
+        if(StringUtils.isNotBlank(partition))
+            criteria.add(Restrictions.eq("partition",partition));
+        if(StringUtils.isNotBlank(devType))
+            criteria.add(Restrictions.like("devType","%"+devType+"%"));
+
+        criteria.add(Restrictions.eq("active", 1));
+        criteria.addOrder(Order.desc("id"));
+        List<PgDevice> pgDeviceList = criteria.list();
+
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
+        for (PgDevice pgDevice : pgDeviceList) {
+            pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
+        }
+
+        return pgDeviceDtoList;
+    }
+
     //根据名字获取当前设备
     public PgDevice getDeviceByAssetCode(String assetCode) {
         Criteria criteria=createCriteria(PgDevice.class);
@@ -56,9 +79,9 @@
     }
 
     //根据类型获取设备列表
-    public List<PgDeviceDto> getDeviceByDevTypee(String devType) {
+    public List<PgDeviceDto> getDeviceByDevType(String devType) {
         Criteria criteria=createCriteria(PgDevice.class);
-        criteria.add(Restrictions.eq("devType",devType));
+        criteria.add(Restrictions.like("devType","%"+devType+"%"));
 
         List<PgDevice> pgDeviceList=criteria.list();
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
@@ -106,7 +129,7 @@
         criteria.add(Restrictions.eq("partition",partition));
 
         List<PgDevice> pgDeviceList=criteria.list();
-        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<PgDeviceDto>();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
 
         for (PgDevice pgDevice : pgDeviceList) {
             pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
index 3a3bccd..595730e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
@@ -1,10 +1,13 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.devTable.domain.PgAlarmType;
 import com.casic.PgInterface.devTable.domain.PgPartition;
 import com.casic.PgInterface.devTable.domain.PgRoad;
 import com.casic.PgInterface.devTable.domain.PipeGallery;
 import com.casic.PgInterface.devTable.dto.PgPartitionDto;
+import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
@@ -12,7 +15,9 @@
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Created by yxw on 2017/11/4.
@@ -21,7 +26,8 @@
 public class PgPartitionManager extends HibernateEntityDao<PgPartition> {
 
     @Resource
-    PgRoadManager pgRoadManager;
+    private PgRoadManager pgRoadManager;
+
 
     public PgPartition getPartitionByParName(String parName) {
         Criteria criteria = getSession().createCriteria(PgPartition.class);
@@ -99,4 +105,5 @@
         return pgPartitionDtoList;
     }
 
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
index f216360..a6928f1 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
@@ -5,6 +5,7 @@
 public class PgPlanResultRe {
 
     private String taskKey;
+    private List<String> pileAcuList;
     private List<PgPlanResult> pgPlanResultList;
 
     public String getTaskKey() {
@@ -15,6 +16,14 @@
         this.taskKey = taskKey;
     }
 
+    public List<String> getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(List<String> pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+
     public List<PgPlanResult> getPgPlanResultList() {
         return pgPlanResultList;
     }
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
index 71ea765..47eea07 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
@@ -54,9 +54,7 @@
 
         List<PgLineHole> pgLineHoleList=criteria.list();
         List<PgLineHoleDTO> pgLineHoleDTOList=new ArrayList<>();
-        if(pgLineHoleList==null||pgLineHoleList.size()==0)
-            return null;
-        else
+        if(pgLineHoleList!=null&&pgLineHoleList.size()!=0)
             pgLineHoleDTOList=PgLineHoleDTO.ConvertToDTOList(pgLineHoleList,pgPileAcuManager,pgRoadManager);
         return pgLineHoleDTOList;
     }
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
index 0fd9e1f..841a386 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
@@ -1,12 +1,15 @@
 package com.casic.PgInterface.intelPlan.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.devTable.domain.PgPartition;
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
 import com.casic.PgInterface.intelPlan.domain.PgLineHole;
 import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
 import com.casic.PgInterface.intelPlan.domain.PgSection;
 import com.casic.PgInterface.intelPlan.dto.PgPlanResult;
 import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
 import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -22,6 +25,9 @@
     @Resource
     private PgLineHoleManager pgLineHoleManager;
 
+    @Resource
+    private PgRoadManager pgRoadManager;
+
     public PgPileAcu getPgPileAcuByCode(String acuCode){
         List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
 
@@ -58,7 +64,9 @@
         for(PgPlanTask pgPlanTask:pgPlanTaskList){
             List<PgPlanResult> pgPlanResultList=getPgPlanResultByPlantask(pgPlanTask);
             PgPlanResultRe pgPlanResultRe=new PgPlanResultRe();
+
             pgPlanResultRe.setTaskKey(pgPlanTask.getTaskKey());
+            pgPlanResultRe.setPileAcuList(pgPlanTask.getPileAcuList());
             pgPlanResultRe.setPgPlanResultList(pgPlanResultList);
 
             pgPlanResultReList.add(pgPlanResultRe);
@@ -142,4 +150,57 @@
         return length;
     }
 
+    private PgPileAcu getPgPileAcuByAcuCode(String acuCode){
+        List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
+
+        if(pgPileAcuList==null||pgPileAcuList.size()==0)
+            return null;
+        else
+            return pgPileAcuList.get(0);
+    }
+
+    public List<PgAcuTask> getACUTask(String pileAcuList){
+        String[] acuArray=pileAcuList.split(",");
+        List<PgAcuTask> pgAcuTaskList=new ArrayList<>();
+
+        for(String acu:acuArray){
+            PgPileAcu pgPileAcu=this.getPgPileAcuByCode(acu);
+            String roadName=pgRoadManager.get(pgPileAcu.getRoadId()).getRoadName();
+
+            if(!containRoad(roadName,pgAcuTaskList))
+            {
+                PgAcuTask pgAcuTask=new PgAcuTask();
+                pgAcuTask.setRoadName(roadName);
+                pgAcuTask.setPileAcuList(acu);
+                pgAcuTaskList.add(pgAcuTask);
+            }
+            else{
+                PgAcuTask pgAcuTask=getIndexRoad(roadName,pgAcuTaskList);
+                if(pgAcuTask!=null)
+                    pgAcuTask.setPileAcuList(pgAcuTask.getPileAcuList()+","+acu);
+            }
+        }
+
+        return pgAcuTaskList;
+    }
+
+    private boolean containRoad(String roadName,List<PgAcuTask> pgAcuTaskList){
+        if(pgAcuTaskList==null||pgAcuTaskList.size()==0) return false;
+        for(PgAcuTask pgAcuTask:pgAcuTaskList){
+            if(pgAcuTask.getRoadName().equals(roadName))
+                return true;
+        }
+
+        return false;
+    }
+
+    private PgAcuTask getIndexRoad(String roadName, List<PgAcuTask> pgAcuTaskList){
+        for(PgAcuTask pgAcuTask:pgAcuTaskList){
+            if(pgAcuTask.getRoadName().equals(roadName))
+                return pgAcuTask;
+        }
+
+        return null;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java
new file mode 100644
index 0000000..323f7ef
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java
@@ -0,0 +1,25 @@
+package com.casic.PgInterface.reservePlan.dto;
+
+import java.util.List;
+
+public class PgAcuTask {
+
+    private String roadName;//道路
+    private String pileAcuList;//acu分区
+
+    public String getRoadName() {
+        return roadName;
+    }
+
+    public void setRoadName(String roadName) {
+        this.roadName = roadName;
+    }
+
+    public String getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(String pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
index c25e926..c7d7693 100644
--- a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
@@ -70,9 +70,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(Long.valueOf(inPgPersonId));
         PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("hostName",pgInPgPerson.getAssetCode());
-//        PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode());
-//        long maxId = pgTagPositionManager.getMaxId(pgTagMac.getTagMac());
-//        PGTagPosition pgTagPosition = pgTagPositionManager.get(maxId);
+
         PGTagPosition pgTagPosition = tagmacRun.GetTagStatus(pgTagMac);
         boolean bExist = false;
         bExist = pgTagPositionManager.findTagPosition(pgTagPosition.getPositionUpdatetime(),pgTagPosition.getHostId());
@@ -104,8 +102,7 @@
         PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(Long.valueOf(inPgPersonId));
         PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pgInPgPersonId",pgInPgPerson);
         System.out.println("time:"+pgInPgStatus.getInTime());
-//        PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pgInPgPersonId",inPgPersonId);
-//        PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode());
+
         PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("hostName",pgInPgPerson.getAssetCode());
 
         Map<Object,Object> mapPosition = new HashMap<>();
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
index 082ba5d..3eed00a 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
@@ -48,6 +48,7 @@
     public Map<String, Object> linkDevice(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         PgDeviceDto pgDeviceDto = null;
         try {
@@ -62,6 +63,7 @@
                     else {
                         pgDeviceDto = new PgDeviceDto(pgDevice);
                         msg = "报警关联设备获取成功";
+                        code="200";
                     }
                 }
             }
@@ -71,6 +73,7 @@
             e.printStackTrace();
             msg = "获取关联设备失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceDto);
 
@@ -86,6 +89,7 @@
     public Map<String, Object> linkPartitionCamera(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
         try {
@@ -106,6 +110,7 @@
 
                         pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(partition,position);
                         msg = "关联设备获取成功";
+                        code="200";
                     }
                 }
             }
@@ -115,6 +120,7 @@
             e.printStackTrace();
             msg = "分区设备关联失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceDtoList);
         return resultMap;
@@ -129,6 +135,7 @@
     public Map<String, Object> linkReservePlan(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgReservePlanDto> pgReservePlanDtoList=new ArrayList<>();
         try{
@@ -139,10 +146,12 @@
                 else {
                     pgReservePlanDtoList = pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
 
-                    if(pgReservePlanDtoList==null||pgReservePlanDtoList.size()==0)
-                        msg="不存在关联的报警预案";
-                    else
+                    if (pgReservePlanDtoList == null || pgReservePlanDtoList.size() == 0)
+                        msg = "不存在关联的报警预案";
+                    else {
                         msg = "关联预案获取成功";
+                        code="200";
+                    }
                 }
             }
             else
@@ -153,6 +162,7 @@
             e.printStackTrace();
             msg="预案关联失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgReservePlanDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
index 0ddbc4d..0ce886b 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
@@ -41,25 +41,19 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getAlarmList(@FormParam("alarmType") String alarmType,
                                             @FormParam("startDay") String startDay,
+                                            @FormParam("partition") String partition,
                                             @FormParam("endDay") String endDay,
                                             @FormParam("isNew") String isNew,
                                             @FormParam("page") int page,
                                             @FormParam("rows") int rows) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
         try {
-            pgAlarmDtoList = pgAlarmManager.getAllAlarm(alarmType,startDay,endDay,isNew,page,rows);
-            if (pgAlarmDtoList==null||pgAlarmDtoList.size() == 0)
-                msg = "没有报警信息";
-            else
-                msg = "报警信息获取成功";
+            resultMap = pgAlarmManager.getAllAlarm(alarmType,partition,startDay,endDay,isNew,page,rows);
+
         } catch (Exception e) {
             e.printStackTrace();
-            msg = "报警信息获取失败";
         }
-        resultMap.put("msg", msg);
-        resultMap.put("result", pgAlarmDtoList);
         return resultMap;
     }
 
@@ -71,9 +65,10 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> clearAlarmList(@FormParam("id") String id) throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        String result = "false";
+        String result = "";
+        String code="0";
 
         try {
             PgAlarm pgAlarm = new PgAlarm();
@@ -86,12 +81,14 @@
                 pgAlarmManager.save(pgAlarm);
                 msg = "报警信息清除成功";
                 result = "true";
+                code = "200";
             }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警信息清除失败";
             result = "false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
@@ -106,21 +103,26 @@
     public Map<String, Object> getAlarmByTypeOrTime(@FormParam("alarmType") String alarmType,
                                                     @FormParam("startTime") String startTime,
                                                     @FormParam("endTime") String endTime) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
-        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<PgAlarmDto>();
+        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
         try {
             pgAlarmDtoList = pgAlarmManager.getAlarmByTypeAndTime(alarmType, startTime, endTime);
             if (pgAlarmDtoList == null || pgAlarmDtoList.size() == 0)
                 msg = "报警信息不存在";
             else
+            {
                 msg = "报警信息获取成功";
+                code="200";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警信息获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
index 29ce8a4..ed0bf34 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
@@ -39,8 +39,8 @@
     public Map<String, Object> getAlarmRule(@FormParam("devType") String devType) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
-        System.out.println("devType:"+devType);
         List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<>();
         try {
             pgAlarmRuleDtoList = pgAlarmRuleManager.getAlarmRuleDto(devType);
@@ -52,6 +52,7 @@
             e.printStackTrace();
             msg = "报警阈值信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmRuleDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
index 24ab894..abef1b1 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
@@ -39,16 +39,21 @@
                                                      @FormParam("endDate") String endDate)throws Exception{
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
+
         List<PgAlarmTjDto> pgAlarmTjDtoList=null;
         try{
             pgAlarmTjDtoList=pgAlarmTjManager.getAlarmTjResultByType(startDate,endDate);
             msg="获取成功";
+            code="200";
         }
         catch(Exception ex) {
             msg = "统计失败";
         }
-        resultMap.put("result",pgAlarmTjDtoList);
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
+        resultMap.put("result",pgAlarmTjDtoList);
+
         return resultMap;
     }
 
@@ -61,23 +66,27 @@
     public Map<String, Object> getAlarmByTime(@FormParam("startTime") String startTime,
                                               @FormParam("endTime") String endTime,
                                               @FormParam("statisticType") String statisticType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code = "0";
 
-        List<PgAlarmTjDto> pgAlarmTjDtoList = new ArrayList<PgAlarmTjDto>();
+        List<PgAlarmTjDto> pgAlarmTjDtoList = new ArrayList<>();
         try {
             pgAlarmTjDtoList = pgAlarmTjManager.getAlarmByTime(startTime, endTime, statisticType);
             if(pgAlarmTjDtoList==null)
                 msg="报警统计信息获取失败";
-            else
-                msg="报警统计信息获取成功";
+            else {
+                msg = "报警统计信息获取成功";
+                code="200";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警统计信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmTjDtoList);
         return resultMap;
     }
 
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
index 28bc811..b6278a9 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
@@ -30,7 +30,6 @@
     @Resource
     private PgAlarmTypeManager pgAlarmTypeManager;
 
-
     /**
      * 获取报警类型
      */
@@ -38,19 +37,24 @@
     @Path("getAlarmType")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getAlarmTypeList()throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
-        List<PgAlarmTypeDto> pgAlarmTypeDtoList=new ArrayList<PgAlarmTypeDto>();
+        String code="";
+
+        List<PgAlarmTypeDto> pgAlarmTypeDtoList=new ArrayList<>();
         try {
             pgAlarmTypeDtoList = pgAlarmTypeManager.getAllAlarmTypeDto();
             if(pgAlarmTypeDtoList.size()==0)
                 msg="没有报警类型信息";
-            else
-                msg="报警类型信息获取成功";
+            else {
+                code="200";
+                msg = "报警类型信息获取成功";
+            }
         }catch(Exception e){
             e.printStackTrace();
             msg="报警类型信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAlarmTypeDtoList);
         return resultMap;
@@ -66,6 +70,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
@@ -83,6 +88,7 @@
                 logger.info("成功保存");
                 result = "true";
                 msg = "保存成功";
+                code="200";
             }
         } catch (Exception e) {
             result = "false";
@@ -90,6 +96,7 @@
             e.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -106,6 +113,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try{
             if(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
@@ -119,6 +127,7 @@
                 pgAlarmTypeManager.save(pgAlarmType);
                 result = "true";
                 msg = "编辑成功";
+                code="200";
             }
         }
         catch(Exception e)
@@ -128,6 +137,7 @@
             e.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("result",result);
         resultMap.put("msg",msg);
 
@@ -146,6 +156,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
         String result="false";
+        String code="0";
 
         try {
             PgAlarmType pgAlarmType=pgAlarmTypeManager.get(Long.valueOf(id));
@@ -157,6 +168,7 @@
             {
                 pgAlarmType.setActive(0);
                 pgAlarmTypeManager.save(pgAlarmType);
+                code="200";
                 msg="报警类型删除成功";
                 result="true";
             }
@@ -165,6 +177,7 @@
             msg="报警类型删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
index 4533e1a..85940bb 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
@@ -33,12 +33,15 @@
                                                  @FormParam("inSpectionPlace") String inSpectionPlace){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
         List<PgAssetPlanDto> pgAssetPlanDtoList=new ArrayList<>();
         try{
             pgAssetPlanDtoList=pgAssetPlanManager.getPgAssetPlanDtoList(startDay,endDay,inSpectionPlace);
-            if(pgAssetPlanDtoList!=null&&pgAssetPlanDtoList.size()!=0)
-                msg="巡检信息获取成功";
+            if(pgAssetPlanDtoList!=null&&pgAssetPlanDtoList.size()!=0) {
+                code="200";
+                msg = "巡检信息获取成功";
+            }
             else
                 msg="不存在巡检信息";
         }
@@ -47,6 +50,7 @@
             msg="巡检信息获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAssetPlanDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
index 47ef9d1..5cbdfcb 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
@@ -30,12 +30,15 @@
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
         String result="";
+        String code="0";
 
         List<PgAssetPlanStatic> pgAssetPlanStaticList = null;
         try{
             pgAssetPlanStaticList=pgAssetPlanManager.getPgAssetPlanStaticLisByTime(startTime,endTime,staticType);
-            if(pgAssetPlanStaticList!=null&&pgAssetPlanStaticList.size()!=0)
-                msg="巡检统计信息获取成功";
+            if(pgAssetPlanStaticList!=null&&pgAssetPlanStaticList.size()!=0) {
+                code = "200";
+                msg = "巡检统计信息获取成功";
+            }
             else
                 msg="统计信息获取失败";
         }
@@ -44,6 +47,7 @@
             msg="统计失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAssetPlanStaticList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
index 26f5d6a..503bfe3 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
@@ -40,6 +40,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="";
 
         try{
             PgAuthority pgAuthority=new PgAuthority();
@@ -50,6 +51,7 @@
 
             pgAuthorityManager.save(pgAuthority);
             msg="用户权限保存成功";
+            code="200";
             result="true";
         }
         catch(Exception e) {
@@ -57,6 +59,7 @@
             msg = "新增权限失败";
             result = "false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -65,22 +68,25 @@
 
     /*
        *编辑角权限信息
-        */
+    */
     @POST
     @Path("editAuthority")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> editAuthority(@FormParam("id") String id,
                                        @FormParam("authority") String authority,
                                        @FormParam("concent") String concent) throws Exception{
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
+
         try {
             PgAuthority pgAuthority=pgAuthorityManager.get(Long.valueOf(id));
             pgAuthority.setAuthority(authority);
             pgAuthority.setConcent(concent);
 
             pgAuthorityManager.save(pgAuthority);
+            code="200";
             msg="权限保存成功";
             result="true";
         }
@@ -90,7 +96,7 @@
             msg="权限编辑失败";
             result="false";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -105,9 +111,10 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> deleteAuthority(@FormParam("id") String id)throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
-        String result="false";
+        String result="";
+        String code="0";
 
         try {
             PgAuthority pgAuthority= pgAuthorityManager.get(Long.valueOf(id));
@@ -119,6 +126,7 @@
             {
                 pgAuthority.setActive(0);
                 pgAuthorityManager.save(pgAuthority);
+                code="200";
                 msg="删除权限成功";
                 result="true";
             }
@@ -127,37 +135,40 @@
             msg="删除权限失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
     }
 
     /*
-* 获取权限信息
- */
+    * 获取权限信息
+    */
     @POST
     @Path("getAuthorityList")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> getAuthorityList() {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgAuthorityDto> pgAuthorityDtoList = new ArrayList<PgAuthorityDto>();
         try {
             pgAuthorityDtoList = pgAuthorityManager.getAuthorityList();
             if (pgAuthorityDtoList == null)
                 msg = "不存在权限信息";
-            else
+            else {
+                code = "200";
                 msg = "权限信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "权限信息获取是失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAuthorityDtoList);
         return resultMap;
     }
 
 
-
-
 }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
index a9ef521..a74ecc7 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
@@ -45,6 +45,7 @@
                                                @FormParam("endDate") String endDate)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgHistoryDataDto> pgHistoryDataDtoList=new ArrayList<>();
 
         try {
@@ -55,13 +56,16 @@
                 pgHistoryDataDtoList=pgCh4Manager.getAllCH4Data(pgDevice,startDate,endDate);
                 if(pgHistoryDataDtoList==null)
                     msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+                else {
+                    code = "200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgHistoryDataDtoList);
         return resultMap;
@@ -75,8 +79,9 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getNewestCh4InfoByDev(@FormParam("assetCode") String assetCode)throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
+        String code="0";
         PgCh4Dto pgCh4Dto=new PgCh4Dto(null);
 
         try {
@@ -87,13 +92,17 @@
                 pgCh4Dto=pgCh4Manager.getNewestCH4Data(pgDevice);
                 if(pgCh4Dto==null)
                     msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgCh4Dto);
         return resultMap;
@@ -111,6 +120,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
@@ -127,6 +137,7 @@
                 pgCh4.setPgDeviceId(pgDevice);
 
                 pgCh4Manager.save(pgCh4);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -135,7 +146,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
index a7eac39..dfc8ca5 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
@@ -43,23 +43,27 @@
                                                       @FormParam("endDate") String endDate)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgHistoryDataDto> pgHistoryDataDtoList=new ArrayList<>();
 
         try {
             PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
                 msg="设备不存在";
-            else{
-                pgHistoryDataDtoList=pgCoManager.getAllCoData(pgDevice, startDate, endDate);
-                if(pgHistoryDataDtoList==null)
-                    msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+            else {
+                pgHistoryDataDtoList = pgCoManager.getAllCoData(pgDevice, startDate, endDate);
+                if (pgHistoryDataDtoList == null)
+                    msg = "没有满足要求的数据";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgHistoryDataDtoList);
         return resultMap;
@@ -75,6 +79,7 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         PgCoDto pgCoDto=new PgCoDto(null);
 
         try {
@@ -85,13 +90,16 @@
                 pgCoDto=pgCoManager.getNewestCoData(pgDevice);
                 if(pgCoDto==null)
                     msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgCoDto);
         return resultMap;
@@ -110,6 +118,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         try {
@@ -126,6 +135,7 @@
 
                 pgCoManager.save(pgCo);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
         } catch (Exception e) {
@@ -133,7 +143,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
index b4b826e..9af98a3 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
@@ -60,6 +60,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         try {
 
@@ -80,8 +81,8 @@
                 pgConstruction.setPgConstructionTypeId(pgConstructionType.getId());
                 pgConstruction.setActive(1);
                 pgConstruction.setParName(parName);
-                logger.info("保存成功");
                 pgConstructionManager.save(pgConstruction);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -90,6 +91,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("success", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -116,6 +118,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
@@ -140,6 +143,7 @@
                 pgConstruction.setParName(parName);
 
                 pgConstructionManager.save(pgConstruction);
+                code="200";
                 result = "true";
                 msg = "编辑成功";
             }
@@ -150,7 +154,7 @@
             e.printStackTrace();
 
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -167,6 +171,8 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
+
         try {
             PgConstruction pgConstruction = pgConstructionManager.get(Long.valueOf(id));
             if (pgConstruction == null)
@@ -177,6 +183,7 @@
             {
                 pgConstruction.setActive(0);
                 pgConstructionManager.save(pgConstruction);
+                code="200";
                 result = "true";
                 msg = "成功删除信息";
             }
@@ -185,6 +192,7 @@
             result = "false";
             msg = "删除失败";
         }
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -204,9 +212,11 @@
                                                   @FormParam("rows") int rows)throws Exception{
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
         List<PgConstructionDto> pgConstructionDtoList=new ArrayList<>();
         try{
             pgConstructionDtoList=pgConstructionManager.getPgContructionDto(cs_name,cs_type,startTime,endTime,page,rows);
+            code="200";
             msg="信息获取成功";
         }
         catch(Exception e)
@@ -214,6 +224,7 @@
             e.printStackTrace();
             msg="查询失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
 
@@ -231,18 +242,22 @@
                                                               @FormParam("statisticType") String statisticType) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgConstructionStiatistic> pgConstructionStiatisticList=new ArrayList<>();
         try {
             pgConstructionStiatisticList = pgConstructionManager.getConstructionByTimeAndStatus(startTime, endTime, statisticType);
             if(pgConstructionStiatisticList==null)
                 msg="施工统计信息获取失败";
-            else
-                msg="施工统计信息获取成功";
+            else {
+                code="200";
+                msg = "施工统计信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "施工统计信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgConstructionStiatisticList);
         return resultMap;
@@ -257,6 +272,7 @@
     public Map<String, Object> getConstructionByType(@FormParam("statisticType") String statisticType){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
         List<PgConstructionStiatistic> pgConstructionStiatisticList=new ArrayList<>();
 
         try{
@@ -268,6 +284,7 @@
                 resultMap.put("result",null);
             }
             else {
+                code="200";
                 msg = "统计信息获取成功";
                 resultMap.put("result", pgConstructionStiatisticList);
             }
@@ -278,6 +295,7 @@
             msg="统计失败";
             resultMap.put("result",null);
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         return resultMap;
     }
@@ -291,9 +309,11 @@
     public Map<String, Object> getConstructionToday() throws Exception{
         Map<String,Object> resultMap=new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgConstructionDto> pgConstructionDtoList=new ArrayList<PgConstructionDto>();
         try {
             pgConstructionDtoList = pgConstructionManager.getConstructionToday();
+            code="200";
             msg = "当天施工信息获取成功";
         }
         catch(Exception e)
@@ -301,7 +321,7 @@
             e.printStackTrace();
             msg="获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
         return resultMap;
@@ -316,6 +336,7 @@
     public Map<String, Object> getConstructionDev(@FormParam("id") String id) throws Exception{
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
         List<PgDeviceDto> pgDeviceDtoList =new ArrayList<>();
         try{
@@ -325,14 +346,17 @@
 
             if(pgDeviceDtoList==null)
                 msg="信息获取失败";
-            else
-                msg="信息获取成功";
+            else {
+                code="200";
+                msg = "信息获取成功";
+            }
         }
         catch(Exception e)
         {
             e.printStackTrace();
-            msg="设备信息获取成功";
+            msg="信息获取是被";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgDeviceDtoList);
 
@@ -346,17 +370,21 @@
     @Path("getConstruction")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getConstruction() throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
-        List<PgConstructionDto> pgConstructionDtoList=new ArrayList<PgConstructionDto>();
+        String code="0";
+
+        List<PgConstructionDto> pgConstructionDtoList=new ArrayList<>();
 
         try{
             pgConstructionDtoList=pgConstructionManager.getPgConstructionList();
             if(pgConstructionDtoList==null||pgConstructionDtoList.size()==0)
                 msg="不存在施工记录";
-            else
-                msg="施工信息获取成功";
+            else {
+                code = "200";
+                msg = "施工信息获取成功";
+            }
         }
         catch(Exception e)
         {
@@ -364,6 +392,7 @@
             msg="施工信息获取失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java
index fd3d53e..2019502 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java
@@ -39,12 +39,12 @@
         try {
             pgConstructionTypeDtoList = pgConstructionTypeManager.getAllConstructionTypeDto();
             if (pgConstructionTypeDtoList.size() == 0)
-                msg = "没有项目类型信息";
+                msg = "获取失败";
             else
-                msg = "项目类型获取成功";
+                msg = "获取成功";
         } catch (Exception e) {
             e.printStackTrace();
-            msg = "项目类型信息获取失败";
+            msg = "获取失败";
         }
         resultMap.put("msg", msg);
         resultMap.put("result", pgConstructionTypeDtoList);
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
index 90d001c..037a399 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
@@ -51,6 +51,7 @@
 
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if (StringUtils.isBlank(construct_doc)||StringUtils.isBlank(doc_name))
@@ -65,6 +66,7 @@
             pgCsDocument.setActive(1);
             pgCsDocumentManager.save(pgCsDocument);
 
+            code="200";
             result = "true";
             msg = "保存成功";
 
@@ -74,6 +76,7 @@
             ex.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("success", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -90,6 +93,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             PgCsDocument pgCsDocument = pgCsDocumentManager.get(Long.valueOf(id));
@@ -103,6 +107,7 @@
 
                 pgCsDocumentManager.save(pgCsDocument);
 
+                code="200";
                 result = "true";
                 msg = "编辑成功";
             }
@@ -112,6 +117,7 @@
             msg = "编辑失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -125,9 +131,9 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
         String result="";
+        String code="0";
 
         try{
-
             PgCsDocument pgCsDocument = pgCsDocumentManager.get(Long.valueOf(id));
             if(pgCsDocument==null)
             {
@@ -137,6 +143,7 @@
             else{
                 pgCsDocument.setActive(0);
                 pgCsDocumentManager.save(pgCsDocument);
+                code="200";
                 result="true";
                 msg="删除成功";
             }
@@ -147,7 +154,7 @@
             msg="预案删除失败";
             result="false";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -168,18 +175,21 @@
 
         String msg="";
         String result="";
+        String code="0";
 
         try {
             pgCsDocumentDtoList = pgCsDocumentManager.getAllDocData(cs_name);
-            if (pgCsDocumentDtoList != null)
+            if (pgCsDocumentDtoList != null) {
+                code="200";
                 msg = "获取数据成功";
+            }
             else
                 msg = "没有满足条件的数据";
         }catch (Exception e){
             e.printStackTrace();
             msg = "获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgCsDocumentDtoList);
         return resultMap;
@@ -192,20 +202,22 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
 
         String msg = "";
+        String code="0";
         ResponseEntity<byte[]> path = null;
         try {
             PgCsDocument pgCsDocument = pgCsDocumentManager.get(Long.valueOf(id));
             path = pgCsDocumentManager.downloadFile(pgCsDocument);
             if (path == null)
                 msg = "不存在该文档";
-            else
+            else {
+                code = "200";
                 msg = "下载成功";
-
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "下载失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", path.getBody());
         resultMap.put("msg", msg);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
index 94c5c84..ffc8b95 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
@@ -41,22 +41,24 @@
     public Map<String, Object> getPgDeviceByDevType(@FormParam("devType") String devType) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
         try {
-            pgDeviceDtoList = pgDeviceManager.getDeviceByDevTypee(devType);
+            pgDeviceDtoList = pgDeviceManager.getDeviceByDevType(devType);
             if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0){
                 msg="不存在满足要求的数据";
-                resultMap.put("result",null);
             }
             else{
-                resultMap.put("result", pgDeviceDtoList);
+                code="200";
                 msg = "获取成功";
             }
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", pgDeviceDtoList);
         return resultMap;
     }
 
@@ -69,25 +71,26 @@
     public Map<String, Object> getPgDeviceByAssetCode(@FormParam("assetCode") String assetCode) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         PgDeviceDto pgDeviceDto=null;
         try {
             PgDevice pgDevice = pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
             {
                 msg="不存在设备信息";
-                resultMap.put("result",null);
             }
             else {
                 pgDeviceDto = new PgDeviceDto(pgDevice);
                 msg = "获取成功";
-                resultMap.put("result", pgDeviceDto);
+                code="200";
             }
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", pgDeviceDto);
         return resultMap;
     }
 
@@ -102,27 +105,61 @@
                                              @FormParam("devType") String devType)throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
         try {
             pgDeviceDtoList = pgDeviceManager.getAllDevice(road,partition,devType);
             if(pgDeviceDtoList.size()==0) {
                 msg = "没有找到设备信息";
-                resultMap.put("result",null);
             }
             else {
                 msg = "设备信息获取成功";
-                resultMap.put("result", pgDeviceDtoList);
+                code="200";
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result", pgDeviceDtoList);
         return resultMap;
     }
 
     /**
+     * 显示设备列表
+     */
+    @POST
+    @Path("getPgDev")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String, Object> getPgDev(@FormParam("road") String road,
+                                             @FormParam("partition") String partition,
+                                             @FormParam("devType") String devType)throws Exception {
+        Map<String, Object> resultMap = new HashMap<>();
+        String msg="";
+        String code="0";
+        List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
+        try {
+            pgDeviceDtoList = pgDeviceManager.getAllDev(road,partition,devType);
+            if(pgDeviceDtoList.size()==0) {
+                msg = "没有找到设备信息";
+            }
+            else {
+                code="200";
+                msg = "设备信息获取成功";
+            }
+        }catch(Exception e){
+            e.printStackTrace();
+            msg="设备信息获取失败";
+        }
+        resultMap.put("code",code);
+        resultMap.put("msg",msg);
+        resultMap.put("result", pgDeviceDtoList);
+        return resultMap;
+    }
+
+
+    /**
      * 新增设备
      */
     @POST
@@ -145,6 +182,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if (pgDeviceManager.getDeviceByAssetCode(assetCode)!=null) {
@@ -169,6 +207,7 @@
 
                 pgDeviceManager.save(pgDevice);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
 
@@ -177,10 +216,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -208,14 +246,9 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
-            /*
-            if (pgDeviceManager.getDeviceByAssetCode(assetCode)!=null) {
-                result = "false";
-                msg = "已存在同名设备";
-            } else {
-            */
             PgDevice pgDevice = pgDeviceManager.get(Long.valueOf(id));
             pgDevice.setPipeGallery(pipeGallery);
             pgDevice.setPartition(partition);
@@ -233,14 +266,14 @@
 
             pgDeviceManager.save(pgDevice);
             result = "true";
+            code="200";
             msg = "编辑成功";
-            //}
         } catch (Exception e) {
             result = "false";
             msg = "编辑失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("result",result);
         resultMap.put("msg",msg);
         return resultMap;
@@ -256,7 +289,8 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
-        String result="false";
+        String result="";
+        String code="0";
 
         try {
             PgDevice pgDevice=pgDeviceManager.get(Long.valueOf(id));
@@ -268,6 +302,7 @@
             {
                 pgDevice.setActive(0);
                 pgDeviceManager.save(pgDevice);
+                code="200";
                 msg="设备删除成功";
                 result="true";
             }
@@ -276,6 +311,7 @@
             msg="设备删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -291,18 +327,18 @@
     {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         PgDeviceDto pgDeviceDto=null;
 
         try{
             PgDevice pgDevice=pgDeviceManager.getDeviceBydevCode(devCode);
             if(pgDevice==null) {
                 msg = "设备信息获取失败";
-                resultMap.put("result",null);
             }
             else{
                 pgDeviceDto = new PgDeviceDto(pgDevice);
                 msg = "设备信息获取成功";
-                resultMap.put("result",pgDeviceDto);
+                code="200";
             }
         }
         catch(Exception ex)
@@ -310,8 +346,9 @@
             ex.printStackTrace();
             msg="设备状态获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgDeviceDto);
         return resultMap;
     }
 
@@ -324,17 +361,17 @@
     public Map<String,Object> getDeviceByPartition(@FormParam("partition") String partition) throws Exception{
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<PgDeviceDto>();
 
         try{
             pgDeviceDtoList=pgDeviceManager.getPgDeviceDtoListByPartition(partition);
             if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0) {
                 msg = "设备信息获取失败";
-                resultMap.put("result",null);
             }
             else {
+                code="200";
                 msg = "设备信息获取成功";
-                resultMap.put("result",pgDeviceDtoList);
             }
         }
         catch(Exception e)
@@ -342,8 +379,9 @@
             e.printStackTrace();
             msg="设备信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgDeviceDtoList);
         return resultMap;
     }
 
@@ -353,17 +391,16 @@
     public Map<String,Object> getDeviceByOldDAssetCodeCode(@FormParam("assetCode") String assetCode) throws Exception{
         Map<String, Object> resultMap = new HashMap<>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
 
         try{
             pgDeviceDtoList=pgDeviceManager.getDeviceByOldDAssetCodeCode(assetCode);
-            if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0) {
-                msg = "设备信息获取失败";;
-                resultMap.put("result",null);
-            }
+            if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0)
+                msg = "设备信息获取失败";
             else {
                 msg = "设备信息获取成功";
-                resultMap.put("result",pgDeviceDtoList);
+                code="200";
             }
         }
         catch(Exception e)
@@ -372,8 +409,9 @@
             msg="设备信息获取失败";
             resultMap.put("result",null);
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgDeviceDtoList);
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java
index 421d249..f6f167d 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java
@@ -38,17 +38,21 @@
     public Map<String, Object> getDeviceTpeyList()throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgDeviceTypeDto> pgDeviceTypeDtoList=new ArrayList<PgDeviceTypeDto>();
         try {
             pgDeviceTypeDtoList = pgDeviceTypeManager.getAllDeviceType();
             if(pgDeviceTypeDtoList.size()==0)
                 msg="没有找到设备类型信息";
-            else
-                msg="设备类型信息获取成功";
+            else {
+                code="200";
+                msg = "设备类型信息获取成功";
+            }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备类型信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgDeviceTypeDtoList);
         return resultMap;
@@ -66,6 +70,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if (pgDeviceTypeManager.getDeviceTypeByDeType(devType)!=null) {
@@ -79,6 +84,7 @@
 
                 pgDeviceTypeManager.save(pgDeviceType);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
 
@@ -87,10 +93,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
index c276fb3..c789960 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
@@ -44,6 +44,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 
         try {
@@ -62,6 +63,7 @@
                 pgEquipment.setActive(1);
 
                 pgEquipmentManager.save(pgEquipment);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -70,9 +72,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -89,9 +91,10 @@
                                             @FormParam("ownerUnit") String ownerUnit,
                                             @FormParam("enterDate") String enterDate,
                                             @FormParam("curUser") String curUser) {
-        HashMap<String, Object> resultMap = new HashMap<String, Object>();
+        HashMap<String, Object> resultMap = new HashMap<>();
         String msg = "";
         String result = "";
+        String code="0";
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 
         try {
@@ -111,6 +114,7 @@
                 pgEquipment.setEnterDate(sdf.parse(enterDate));
 
                 pgEquipmentManager.save(pgEquipment);
+                code="200";
                 msg="编辑成功";
                 result="true";
             }
@@ -119,9 +123,9 @@
             result = "false";
             msg = "编辑失败";
         }
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -134,16 +138,19 @@
     public Map<String, Object> getEquipment(@FormParam("eqName") String eqName,
                                             @FormParam("eqCode") String eqCode,
                                             @FormParam("eqType") String eqType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        List<PgEquipmentDto> pgEquipmentDtoList=new ArrayList<PgEquipmentDto>();
+        String code="0";
+        List<PgEquipmentDto> pgEquipmentDtoList=new ArrayList<>();
 
         try{
             pgEquipmentDtoList=pgEquipmentManager.getEquipmentDtiList(eqName,eqCode,eqType);
             if(pgEquipmentDtoList==null||pgEquipmentDtoList.size()==0)
                 msg="不存在工器具记录";
-            else
-                msg="维获取成功";
+            else {
+                code = "200";
+                msg = "维获取成功";
+            }
         }
         catch(Exception e)
         {
@@ -166,6 +173,7 @@
         HashMap<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
         String result = "";
+        String code="";
 
         try {
             PgEquipment pgEquipment=pgEquipmentManager.get(Long.valueOf(id));
@@ -178,6 +186,7 @@
             {
                 pgEquipment.setActive(0);
                 pgEquipmentManager.save(pgEquipment);
+                code="200";
                 msg="删除成功";
                 result="true";
             }
@@ -186,6 +195,7 @@
             msg="设备信息获取失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -201,16 +211,19 @@
             throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=new ArrayList<PgDeviceTypeStatisticDto>();
 
         try {
             pgDeviceTypeStatisticDtoList=pgEquipmentManager.getDeviceStatisticByDevType(eqType);
 
+            code="200";
             msg = "获取成功";
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceTypeStatisticDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
index 05a9709..a90fd6c 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
@@ -4,9 +4,9 @@
 import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
 import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
 import com.casic.PgInterface.intelPlan.manager.PgPileAcuManager;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import com.casic.PgInterface.test.PlanData;
 import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.ModelAttribute;
 
 import javax.annotation.Resource;
 import javax.ws.rs.FormParam;
@@ -32,23 +32,25 @@
     public Map<String,Object> getPlanResult(@FormParam("planParamStr") String planParamStr){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
-        //List<PgPlanTask> pgPlanTaskList=pgPlanParams.getPgPlanTaskList();
         List<PgPlanTask> pgPlanTaskList=new PgPlanParams().getPgPlanParamsByString(planParamStr);
         List<PgPlanResultRe> pgPlanResultReList=new ArrayList<>();
 
-        try{
-                pgPlanResultReList=pgPileAcuManager.getPgPlanResultList(pgPlanTaskList);
-                if(pgPlanResultReList==null)
-                    msg="管线智能规划出错";
-                else
-                    msg="管线智能规划完成";
+        try {
+            pgPlanResultReList = pgPileAcuManager.getPgPlanResultList(pgPlanTaskList);
+            if (pgPlanResultReList == null)
+                msg = "管线智能规划出错";
+            else {
+                code="200";
+                msg = "管线智能规划完成";
+            }
         }
         catch(Exception ex){
             msg="智能规划出错";
             ex.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgPlanResultReList);
 
@@ -80,4 +82,30 @@
         return resultMap;
     }
 
+    @POST
+    @Path("getPlanTask")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getACUTask(@FormParam("pileAcuList") String pileAcuList){
+
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        String code="0";
+        List<PgAcuTask> pgAcuTaskList=new ArrayList<>();
+
+        try{
+            pgAcuTaskList=pgPileAcuManager.getACUTask(pileAcuList);
+            code="200";
+            msg="任务获取成功";
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            msg="任务获取失败";
+        }
+        resultMap.put("code",code);
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgAcuTaskList);
+
+        return resultMap;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
index ff85c61..66eec76 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
@@ -55,13 +55,13 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         try {
             PgInPgPerson pgInPgPerson = null;//pgInPgPersonManager.getPersonByUserName(userName);
             int iHostName = pgTagMacManager.getCount("select count(1) from PGTagMac where hostname = ?",assetCode);
-//            int iTagMac = pgTagMacManager.getCount("select count(1) from PGTagMac where tagmac = ?",assetCode.toUpperCase());
             if (0==iHostName)
             {
                 result = "false";
@@ -92,9 +92,8 @@
 
                 pgInPgStatusManager.save(pgInPgStatus);
 
-//                String syResult=pgInPgPersonManager.synchorizedInPgInfo(assetCode,userCode,userName,personType);
+                code="200";
                 result = "true";
-//                msg = "人员注册保存成功"+syResult;
                 msg = "人员注册保存成功";
             }
             else {
@@ -106,6 +105,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -120,6 +120,7 @@
     public Map<String, Object> getInPgPerson() throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<>();
         try {
@@ -127,11 +128,15 @@
             if (pgInPgInfoDtoList == null || pgInPgInfoDtoList.size() == 0)
                 msg = "没有找到入廊人员信息";
             else
+            {
+                code="200";
                 msg = "入廊人员信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "入廊人员信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
         return resultMap;
@@ -146,18 +151,22 @@
     public Map<String, Object> getInPgPersonInPg() throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
 
-        List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<PgInPgInfoDto>();
+        List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<>();
         try {
             pgInPgInfoDtoList = pgInPgPersonManager.getPgInPersonList(1);
             if (pgInPgInfoDtoList == null || pgInPgInfoDtoList.size() == 0)
                 msg = "没有找到入廊人员信息";
-            else
+            else {
+                code="200";
                 msg = "入廊人员信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "入廊人员信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
         return resultMap;
@@ -172,6 +181,7 @@
     public Map<String, Object> getInPgPersonByName(@FormParam("userName") String userName) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
 
         PgInPgPerson pgInPgPerson = null;
         PgInPgPersonDto pgInPgPersonDto=null;
@@ -184,12 +194,13 @@
                 pgInPgPersonDto=new PgInPgPersonDto(pgInPgPerson);
                 pgInPgPersonDtoList.add(pgInPgPersonDto);
                 msg = "人员信息获取成功";
+                code="200";
             }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "人员信息获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgPersonDtoList);
         return resultMap;
@@ -206,6 +217,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             PgInPgPerson pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName);
@@ -221,6 +233,7 @@
                     pgInPgPersonManager.save(pgInPgPerson);
                     result = "true";
                     msg = "编辑成功";
+                    code="200";
                 }
             }
         } catch (Exception e) {
@@ -228,9 +241,9 @@
             msg = "编辑失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -244,10 +257,12 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         int inPgNum=0;
         String msg = "";
+        String code="0";
 
         try{
             inPgNum=pgInPgStatusManager.getInPgNum();
 
+            code="200";
             msg="人员入廊次数获取成功";
         }
         catch(Exception e)
@@ -255,6 +270,7 @@
             e.printStackTrace();
             msg="人员入廊次数获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",inPgNum);
 
@@ -272,18 +288,22 @@
                                                    @FormParam("statisticType") String statisticType) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
 
         List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<PgInPgInfoDto>();
         try {
             pgInPgInfoDtoList = pgInPgPersonManager.getPgInPersonListByTime(startTime, endTime, statisticType);
             if(pgInPgInfoDtoList==null)
                 msg="入廊人员统计信息获取失败";
-            else
-                msg="入廊人员统计信息获取成功";
+            else {
+                code="200";
+                msg = "入廊人员统计信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "入廊人员统计信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
         return resultMap;
@@ -296,6 +316,7 @@
 
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
 
         try {
@@ -304,8 +325,10 @@
                 pgDeviceDtoList=pgDeviceManager.getPgCameraListByPosition("",apCodeStr);
                 if(pgDeviceDtoList==null)
                     msg="不存在关联摄像机";
-                else
-                    msg="关联摄像机获取成功";
+                else {
+                    code="200";
+                    msg = "关联摄像机获取成功";
+                }
             } else {
                 msg="请输入Ap编号";
             }
@@ -315,6 +338,7 @@
             msg="关联摄像机获取成功";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgDeviceDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java
index 507b3fe..b43f077 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java
@@ -34,6 +34,7 @@
 
         String result="";
         String msg="";
+        String code="";
         try{
             PgInPgStatus pgInPgStatus=new PgInPgStatus();
 
@@ -44,6 +45,7 @@
             pgInPgStatusManager.save(pgInPgStatus);
             msg="入廊时间提交成功";
             result="true";
+            code="200";
         }
         catch (Exception e){
             e.printStackTrace();
@@ -51,6 +53,7 @@
             result="false";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -66,6 +69,7 @@
 
         String result="";
         String msg="";
+        String code="0";
         try{
             PgInPgPerson pgInPgPerson=pgInPgPersonManager.getPgInPgPersonByAssetCode(assetCode);
 
@@ -79,6 +83,7 @@
             pgInPgStatusManager.save(pgInPgStatus);
 
             msg="出廊时间提交成功";
+            code="200";
             result="true";
         }
         catch (Exception e){
@@ -87,6 +92,7 @@
             result="false";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
index 9def330..9c0ba1f 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
@@ -33,17 +33,20 @@
                                             @FormParam("existNum") String existNum) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         String result="";
 
         try {
             pgIntelPlanManager.savePgIntelPlan(parName,lineName,maxNum,existNum);
             msg="规划数据保存成功";
+            code="200";
             result="true";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "规划数据保存失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
@@ -55,15 +58,18 @@
     public Map<String, Object> getIntelLineType() throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgIntelPlanTypeDto> pgIntelPlanTypeDtoList=new ArrayList<>();
         try {
             pgIntelPlanTypeDtoList=pgIntelPlanManager.getIntelPlanType();
+            code="200";
             msg="获取排线类型成功";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "获取排线类型失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgIntelPlanTypeDtoList);
         return resultMap;
@@ -76,6 +82,7 @@
                                             @FormParam("partitionStr") String partitionStr) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgIntelPlanDto> pgIntelPlanDtoList = new ArrayList<>();
 
@@ -83,8 +90,10 @@
             pgIntelPlanDtoList = pgIntelPlanManager.getPgIntelPlanListByPartion(lineName, partitionStr);
             if(pgIntelPlanDtoList==null||pgIntelPlanDtoList.size()==0)
                 msg="请输入正确的规划参数";
-            else
-                msg="规划数据获取成功";
+            else {
+                code="200";
+                msg = "规划数据获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "规划数据获取失败";
@@ -103,10 +112,12 @@
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
         String result="";
+        String code="0";
 
         try {
             boolean bl=pgIntelPlanManager.addLineUse(lineName,partitionStr,num);
             if(bl){
+                code="200";
                 msg="排线入廊成功";
                 result="true";
             }
@@ -119,6 +130,7 @@
             msg = "排线入廊失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
@@ -132,6 +144,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
         String result="";
+        String code="0";
 
         try {
             PgIntelPlan pgIntelPlan=pgIntelPlanManager.getPgIntelPlanByParNameAndLine(lineName,parName);
@@ -140,11 +153,13 @@
             pgIntelPlanManager.save(pgIntelPlan);
             msg="规划数据删除成功";
             result="true";
+            code="200";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "规划数据删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java b/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java
index 378af00..9c39523 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java
@@ -1,5 +1,6 @@
 package com.casic.PgInterface.rs;
 
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
 import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
 import com.casic.PgInterface.intelPlan.dto.PgLineHoleDTO;
 import com.casic.PgInterface.intelPlan.manager.PgLineHoleManager;
@@ -27,6 +28,9 @@
     @Resource
     private PgPileAcuManager pgPileAcuManager;
 
+    @Resource
+    private PgRoadManager pgRoadManager;
+
     @POST
     @Path("getPgLineAcuHole")
     @Produces(MediaType.APPLICATION_JSON)
@@ -34,23 +38,32 @@
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
         String result="";
+        String code="0";
         List<PgLineHoleDTO> pgLineHoleDTOList=new ArrayList<>();
 
         try {
             PgPileAcu pgPileAcu=pgPileAcuManager.getPgPileAcuByCode(acuCode);
             if(pgPileAcu==null){
                 msg="不存在分区";
-            }else{
-                pgLineHoleDTOList=pgLineHoleManager.getCurrentHoleByAcu(pgPileAcu.getId());
-                if(pgLineHoleDTOList!=null&&pgLineHoleDTOList.size()!=0)
-                    msg="获取成功";
-                else
-                    msg="未找到入廊数据";
+            }else {
+                pgLineHoleDTOList = pgLineHoleManager.getCurrentHoleByAcu(pgPileAcu.getId());
+                if (pgLineHoleDTOList != null && pgLineHoleDTOList.size() != 0)
+                {
+                    code="200";
+                    msg = "获取成功";
+                }
+                else {
+                    PgLineHoleDTO pgLineHoleDTO=new PgLineHoleDTO();
+                    pgLineHoleDTO.setRoad(pgRoadManager.get(pgPileAcu.getRoadId()).getRoadName());
+                    pgLineHoleDTOList.add(pgLineHoleDTO);
+                    msg = "未找到入廊数据";
+                }
             }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgLineHoleDTOList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgLogRs.java b/src/main/java/com/casic/PgInterface/rs/PgLogRs.java
index 39cff52..30db63b 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgLogRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgLogRs.java
@@ -45,6 +45,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         PgLog pgLog=new PgLog();
         try {
             PgUser pgUser = new PgUser();
@@ -60,14 +61,15 @@
             pgLogManager.save(pgLog);
             result = "true";
             msg = "保存成功";
-
+            code="200";
         } catch (Exception e) {
             result = "false";
             msg = "保存失败";
             e.printStackTrace();
         }
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -83,17 +85,21 @@
             throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgLogDto> pgLogDtoList = new ArrayList<PgLogDto>();
         try {
             pgLogDtoList = pgLogManager.getAllLogs(userName, startTime, endTime);
             if (pgLogDtoList == null || pgLogDtoList.size() == 0)
                 msg = "没有找到日志信息";
-            else
+            else {
+                code="200";
                 msg = "日志信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "日志信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgLogDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java
index 9fd0a5f..37b72f6 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java
@@ -36,19 +36,23 @@
         Map<String,Object> resultMap=new HashMap<>();
 
         String msg = "";
+        String code="0";
         List<PgMaintainType> pgMaintainTypeList=new ArrayList<>();
         try{
             pgMaintainTypeList=pgMaintainTypeManager.getMaintainType();
             if(pgMaintainTypeList!=null&&pgMaintainTypeList.size()!=0)
                 msg="不存在运维类别";
-            else
-                msg="运维类别获取成功";
+            else {
+                code="200";
+                msg = "运维类别获取成功";
+            }
         }
         catch(Exception ex)
         {
             ex.printStackTrace();
             msg="运维类别获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgMaintainTypeList);
 
@@ -65,10 +69,11 @@
         Map<String,Object> resultMap=new HashMap<>();
 
         String msg = "";
+        String code="0";
         List<PgMaintainTypeDto> pgMaintainTypeDtoList=new ArrayList<PgMaintainTypeDto>();
         try{
             pgMaintainTypeDtoList=pgMaintainTypeManager.getMaintainTypeModel(type);
-
+            code="200";
             msg="维护类型获取成功";
         }
         catch(Exception ex)
@@ -77,9 +82,9 @@
             msg="维护类型获取失败";
         }
 
-        resultMap.put("result",pgMaintainTypeDtoList);
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgMaintainTypeDtoList);
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java
index d735cc9..82ffca4 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java
@@ -33,12 +33,16 @@
                                                  @FormParam("endTime") String endTime){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
         List<PgMaintanceRecordHeadDto> pgMaintanceRecordHeadDtoList=new ArrayList<>();
         try{
             pgMaintanceRecordHeadDtoList=pgMaintanceRecordHeadManager.getPgMaintanceRecordHeadLsit(repairMan,startTime,endTime);
             if(pgMaintanceRecordHeadDtoList!=null&&pgMaintanceRecordHeadDtoList.size()!=0)
+            {
+                code="200";
                 msg="维护信息获取成功";
+            }
             else
                 msg="不存在维护信息";
         }
@@ -47,6 +51,7 @@
             msg="巡检信息获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgMaintanceRecordHeadDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java
index effc9df..9f46fc8 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java
@@ -32,12 +32,16 @@
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
         String result="";
+        String code="0";
 
         List<PgMaintanceRecordHeadStatic> pgMaintanceRecordHeadStaticList=new ArrayList<>();
         try{
             pgMaintanceRecordHeadStaticList=pgMaintanceRecordHeadManager.getPgMaintanceRecordHeadStaticLisByTime(startTime,endTime,staticType);
             if(pgMaintanceRecordHeadStaticList!=null&&pgMaintanceRecordHeadStaticList.size()!=0)
+            {
+                code="200";
                 msg="维护统计信息获取成功";
+            }
             else
                 msg="维护统计失败";
         }
@@ -46,7 +50,7 @@
             ex.printStackTrace();
             msg="统计失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgMaintanceRecordHeadStaticList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java b/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java
index 3a67bf3..6a5f4dc 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java
@@ -39,27 +39,31 @@
     @Path("getO2InfoByDevAndDate")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getO2InfoByDevAndDate(@FormParam("assetCode") String assetCode,
-                                                      @FormParam("startDate") String startDate,
-                                                      @FormParam("endDate") String endDate)throws Exception {
+                                                     @FormParam("startDate") String startDate,
+                                                     @FormParam("endDate") String endDate)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgHistoryDataDto> pgHistoryDataDtoList=new ArrayList<>();
 
         try {
             PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
                 msg="设备不存在";
-            else{
-                pgHistoryDataDtoList=pgO2Manager.getAllO2Data(pgDevice, startDate, endDate);
-                if(pgHistoryDataDtoList==null)
-                    msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+            else {
+                pgHistoryDataDtoList = pgO2Manager.getAllO2Data(pgDevice, startDate, endDate);
+                if (pgHistoryDataDtoList == null)
+                    msg = "没有满足要求的数据";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgHistoryDataDtoList);
         return resultMap;
@@ -75,23 +79,27 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         PgO2Dto pgO2Dto=new PgO2Dto(null);
 
         try {
             PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
                 msg="设备不存在";
-            else{
-                pgO2Dto=pgO2Manager.getNewestO2Data(pgDevice);
-                if(pgO2Dto==null)
-                    msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+            else {
+                pgO2Dto = pgO2Manager.getNewestO2Data(pgDevice);
+                if (pgO2Dto == null)
+                    msg = "没有满足要求的数据";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgO2Dto);
         return resultMap;
@@ -104,11 +112,12 @@
     @Path("addO2Data")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> addO2Data(@FormParam("devCode") String devCode,
-                                          @FormParam("upTime") String upTime,
-                                          @FormParam("o2") String o2)throws Exception {
+                                         @FormParam("upTime") String upTime,
+                                         @FormParam("o2") String o2)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
@@ -125,6 +134,7 @@
                 pgO2.setPgDeviceId(pgDevice);
 
                 pgO2Manager.save(pgO2);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -133,9 +143,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java b/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java
index 6217cde..70b3b41 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java
@@ -30,8 +30,6 @@
 public class PgOverViewRs {
 
     @Resource
-    private PgInPgPersonManager pgInPgPersonManager;
-    @Resource
     private PgInPgStatusManager pgInPgStatusManager;
     @Resource
     private PgAlarmManager pgAlarmManager;
@@ -46,18 +44,21 @@
     @Path("getPersonNumInPgByMonth")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<Object, String> getMonthInPgPersonNum() throws Exception {
-        Map<Object, String> resultMap = new HashMap<Object, String>();
+        Map<Object, String> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         int inNum = 0;
 
         try {
             inNum = pgInPgStatusManager.getMonthInPgPersonNum();
+            code="200";
             msg = "本月入廊人员次数获取成功";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "本月入廊人员次数获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", String.valueOf(inNum));
 
@@ -73,15 +74,18 @@
     public Map<Object, String> getWeekInPgPersonNum() throws Exception {
         Map<Object, String> resultMap = new HashMap<Object, String>();
         String msg = "";
+        String code="0";
         int inNum = 0;
         try {
             inNum = pgInPgStatusManager.getWeekInPgPersonNum();
+            code="200";
             msg = "本周入廊人员次数获取成功";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "本周入廊人员次数获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", String.valueOf(inNum));
 
@@ -97,19 +101,22 @@
     public Map<String, Object> getDayInPgStatistic() throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<>();
         try {
             pgInPgInfoDtoList = pgInPgStatusManager.getPgInPersonListByDay();
             if (pgInPgInfoDtoList == null)
                 msg = "信息获取失败";
-            else
+            else {
+                code="200";
                 msg = "信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "信息获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
         return resultMap;
@@ -124,18 +131,23 @@
     public Map<String, Object> getTodayInPgInfo() throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
 
         List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<PgInPgInfoDto>();
         try {
             pgInPgInfoDtoList = pgInPgStatusManager.getTodayInPgInfo();
             if(pgInPgInfoDtoList!=null||pgInPgInfoDtoList.size()!=0)
+            {
+                code="200";
                 msg = "信息获取成功";
+            }
             else
                 msg="当天没有入廊人员信息";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
 
@@ -149,18 +161,22 @@
     public Map<String, Object> getAlarmNum(@FormParam("isDevFault") String isDevFault) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         int num = 0;
 
         try {
             if(isDevFault!=null){
                 num = pgAlarmManager.getAlarmNum(isDevFault);
-                msg = "报警数量获取成功";}
+                msg = "报警数量获取成功";
+                code="200";
+            }
             else
                 msg="请输入统计参数";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警数量统计失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", num);
 
@@ -176,16 +192,18 @@
     public Map<Object, String> getMonthAlarmNum(@FormParam("isDevFault") String isDevFault) throws Exception {
         Map<Object, String> resultMap = new HashMap<Object, String>();
         String msg = "";
+        String code="0";
         int inNum = 0;
 
         try {
-                inNum = pgAlarmManager.getMonthAlarmNum(isDevFault);
-                msg = "报警次数获取成功";
+            inNum = pgAlarmManager.getMonthAlarmNum(isDevFault);
+            code="200";
+            msg = "报警次数获取成功";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警次数获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", String.valueOf(inNum));
 
@@ -201,15 +219,17 @@
     public Map<Object, String> getWeekAlarmNum(@FormParam("isDevFault") String isDevFault) throws Exception {
         Map<Object, String> resultMap = new HashMap<Object, String>();
         String msg = "";
+        String code="0";
         int inNum = 0;
         try {
             inNum = pgAlarmManager.getWeekAlarmNum(isDevFault);
+            code="200";
             msg = "报警次数获取成功";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警次数获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", String.valueOf(inNum));
 
@@ -225,14 +245,17 @@
     public Map<String, Object> getDayAlarmStatistic() throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgAlarmTjDto> pgAlarmTjDtoList = new ArrayList<PgAlarmTjDto>();
         try {
             pgAlarmTjDtoList = pgAlarmManager.getDayAlarmStatistic();
             if (pgAlarmTjDtoList == null)
                 msg = "信息获取失败";
-            else
+            else {
+                code="200";
                 msg = "信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "信息获取失败";
@@ -252,9 +275,11 @@
     public Map<String, Object> getAlarmList(@FormParam("isDevFault") String isDevFault) throws Exception{
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         List<PgAlarmDto> pgAlarmDtoList=new ArrayList<>();
         try{
             pgAlarmDtoList=pgAlarmManager.getAlarmList(isDevFault);
+            code="200";
             msg="信息获取成功";
         }
         catch(Exception e)
@@ -262,6 +287,7 @@
             e.printStackTrace();
             msg="信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAlarmDtoList);
 
@@ -278,17 +304,19 @@
     public Map<String,Object> getConstructionNum() throws Exception{
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgConstructionTypeNumStatisticDto> pgConstructionTypeNumDtoList=new ArrayList<PgConstructionTypeNumStatisticDto>();
         try{
             pgConstructionTypeNumDtoList=pgConstructionManager.getConstructionNum();
             msg="施工数量获取成功";
+            code="200";
         }
         catch(Exception e)
         {
             e.printStackTrace();
             msg="施工数量统计";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionTypeNumDtoList);
 
@@ -302,21 +330,25 @@
     @Path("getConstructionToday")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> getConstructionToday() throws Exception{
-        Map<String,Object > resultMap = new HashMap<String,Object>();
+        Map<String,Object > resultMap = new HashMap<>();
         String msg = "";
-        List<PgConstructionDto> pgConstructionDtoList=new ArrayList<PgConstructionDto>();
+        String code="0";
+        List<PgConstructionDto> pgConstructionDtoList=new ArrayList<>();
         try {
             pgConstructionDtoList = pgConstructionManager.getConstructionToday();
-            if (pgConstructionDtoList == null&&pgConstructionDtoList.size()==0)
+            if (pgConstructionDtoList == null && pgConstructionDtoList.size() == 0)
                 msg = "不存在施工信息";
-            else
+            else {
+                code="200";
                 msg = "施工信息获取成功";
+            }
         }
         catch(Exception e)
         {
             e.printStackTrace();
             msg="施工信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java b/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java
index d3c10d4..31ffcfc 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java
@@ -48,6 +48,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 
         try {
@@ -66,9 +67,9 @@
                 pgPartition.setMaterial(material);
                 pgPartition.setActive(1);
 
-                logger.info("成功保存");
                 pgPartitionManager.save(pgPartition);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
         } catch (Exception e) {
@@ -76,9 +77,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
         return resultMap;
     }
     /*
@@ -100,6 +101,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         PgPartition partition = new PgPartition();
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
@@ -122,6 +124,7 @@
 
                 pgPartitionManager.save(pgPartition);
                 result = "true";
+                code="200";
                 msg = "编辑成功";
             }
 
@@ -131,8 +134,10 @@
             e.printStackTrace();
         }
 
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
+
         return resultMap;
     }
 
@@ -147,7 +152,8 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
-        String result="false";
+        String result="";
+        String code="0";
 
         try {
             PgPartition pgPartition=pgPartitionManager.get(Long.valueOf(id));
@@ -161,12 +167,14 @@
                 pgPartitionManager.save(pgPartition);
                 msg="分区删除成功";
                 result="true";
+                code="200";
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="分区删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -181,14 +189,17 @@
     public Map<String, Object> getPartition() throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgPartitionDto> pgPartitionDtoList = new ArrayList<PgPartitionDto>();
         try {
             pgPartitionDtoList = pgPartitionManager.getPgPartitionDtoList();
+            code="200";
             msg = "获取成功";
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgPartitionDtoList);
         return resultMap;
@@ -203,14 +214,17 @@
     public Map<String, Object> getPartitionListByName(@FormParam("parName") String parName) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgPartitionDto> pgPartitionDtoList = new ArrayList<PgPartitionDto>();
         try {
             pgPartitionDtoList = pgPartitionManager.getPartitionByName(parName);
+            code="200";
             msg = "获取成功";
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgPartitionDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java b/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java
index 883adf9..cf81b72 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java
@@ -37,6 +37,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
         PgRoad pgRoad=pgRoadManager.getPgRoadByName(road);
         try {
             PgPileAcu pgPileAcu=new PgPileAcu();
@@ -49,6 +50,7 @@
             pgPileAcu.setActive(true);
 
             pgPileAcuManager.save(pgPileAcu);
+            code="200";
             result="true";
             msg="保存成功";
         } catch (Exception e) {
@@ -56,9 +58,10 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
+
         return resultMap;
     }
 
@@ -73,6 +76,7 @@
 
         String result="";
         String msg="";
+        String code="0";
         try{
             PgPileAcu pgPileAcu=pgPileAcuManager.get(id);
             if(pgPileAcu==null){
@@ -83,7 +87,7 @@
             {
                 pgPileAcu.setActive(false);
                 pgPileAcuManager.save(pgPileAcu);
-
+                code="200";
                 result="true";
                 msg="桩号删除成功";
             }
@@ -94,8 +98,9 @@
             ex.printStackTrace();
         }
 
-        resultMap.put("result",result);
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
+        resultMap.put("result",result);
 
         return resultMap;
     }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPileRs.java b/src/main/java/com/casic/PgInterface/rs/PgPileRs.java
index cf62954..c9999ac 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgPileRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgPileRs.java
@@ -33,6 +33,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             PgPile pgPile=new PgPile();
@@ -40,6 +41,7 @@
             pgPile.setActive(true);
 
             pgPileManager.save(pgPile);
+            code="200";
             result="true";
             msg="保存成功";
         } catch (Exception e) {
@@ -47,9 +49,10 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
+
         return resultMap;
     }
 
@@ -64,9 +67,10 @@
         Map<String,Object> resultMap=new HashMap<>();
         List<PgPileDTO> pgPileDTOList=new ArrayList<>();
         String msg="";
+        String code="0";
         try{
             pgPileDTOList=pgPileManager.getPgPileDTOList();
-
+            code="200";
             msg="获取成功";
         }
         catch(Exception ex){
@@ -74,8 +78,9 @@
             msg="获取成失败";
             ex.printStackTrace();
         }
-        resultMap.put("result",pgPileDTOList);
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
+        resultMap.put("result",pgPileDTOList);
 
         return resultMap;
     }
@@ -91,6 +96,7 @@
 
         String result="";
         String msg="";
+        String code="0";
         try{
             PgPile pgPile=pgPileManager.get(id);
             if(pgPile==null){
@@ -101,7 +107,7 @@
             {
                 pgPile.setActive(false);
                 pgPileManager.save(pgPile);
-
+                code="200";
                 result="true";
                 msg="桩号删除成功";
             }
@@ -111,9 +117,9 @@
             msg="桩号删除失败";
             ex.printStackTrace();
         }
-
-        resultMap.put("result",result);
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
+        resultMap.put("result",result);
 
         return resultMap;
     }

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 25ded8a..283d7ab 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,20 +7,56 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" 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/construction/manager/PgCsDocumentManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/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/manager/PgAlarmManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/~$说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/~$说明20191207.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.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$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/接口说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明20191207.docx" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
@@ -51,7 +87,7 @@
         <counts>
           <entry key="class" value="4" />
           <entry key="iml" value="2" />
-          <entry key="java" value="707" />
+          <entry key="java" value="820" />
           <entry key="properties" value="14" />
           <entry key="xml" value="7" />
         </counts>
@@ -60,7 +96,7 @@
         <counts>
           <entry key="CLASS" value="4" />
           <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="707" />
+          <entry key="JAVA" value="820" />
           <entry key="Properties" value="14" />
           <entry key="XML" value="7" />
         </counts>
@@ -68,32 +104,32 @@
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
           <entry key="dummy" value="38" />
-          <entry key="java" value="30161" />
+          <entry key="java" value="40859" />
           <entry key="properties" value="100" />
-          <entry key="txt" value="176" />
+          <entry key="txt" value="186" />
           <entry key="xml" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="30161" />
-          <entry key="PLAIN_TEXT" value="214" />
+          <entry key="JAVA" value="40859" />
+          <entry key="PLAIN_TEXT" value="224" />
           <entry key="Properties" value="100" />
           <entry key="XML" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="48" />
+          <entry key="project.closed" value="51" />
           <entry key="project.open.time.1" value="5" />
           <entry key="project.open.time.12" value="2" />
           <entry key="project.open.time.13" value="1" />
           <entry key="project.open.time.15" value="1" />
           <entry key="project.open.time.16" value="1" />
           <entry key="project.open.time.17" value="1" />
-          <entry key="project.open.time.2" value="1" />
+          <entry key="project.open.time.2" value="2" />
           <entry key="project.open.time.20" value="1" />
-          <entry key="project.open.time.23" value="1" />
+          <entry key="project.open.time.23" value="2" />
           <entry key="project.open.time.24" value="2" />
           <entry key="project.open.time.251" value="1" />
           <entry key="project.open.time.27" value="2" />
@@ -106,8 +142,8 @@
           <entry key="project.open.time.36" value="1" />
           <entry key="project.open.time.37" value="1" />
           <entry key="project.open.time.39" value="2" />
-          <entry key="project.open.time.4" value="2" />
-          <entry key="project.open.time.40" value="1" />
+          <entry key="project.open.time.4" value="3" />
+          <entry key="project.open.time.40" value="2" />
           <entry key="project.open.time.41" value="2" />
           <entry key="project.open.time.42" value="2" />
           <entry key="project.open.time.43" value="2" />
@@ -122,23 +158,25 @@
           <entry key="project.open.time.6" value="3" />
           <entry key="project.open.time.63" value="2" />
           <entry key="project.open.time.64" value="1" />
+          <entry key="project.open.time.66" value="1" />
           <entry key="project.open.time.71" value="2" />
+          <entry key="project.open.time.74" value="1" />
           <entry key="project.open.time.76" value="1" />
           <entry key="project.open.time.8" value="2" />
           <entry key="project.open.time.9" value="1" />
           <entry key="project.open.time.97" value="1" />
-          <entry key="project.opened" value="78" />
+          <entry key="project.opened" value="84" />
         </counts>
       </usages-collector>
     </session>
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+            <state relative-caret-position="396">
+              <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
               <folding>
                 <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
                 <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -147,73 +185,6 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <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="99">
-              <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-              <folding>
-                <element signature="imports" expanded="true" />
-                <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-1170">
-              <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state>
-              <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
-              <folding>
-                <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-                <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="true">
-        <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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-              <folding>
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-                <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>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <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="352">
-              <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -225,18 +196,9 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>inCriteria</find>
-      <find>getPgPlanResulList</find>
-      <find>getPileAcuListByPileAcuStr</find>
-      <find>distinct</find>
-      <find>order</find>
-      <find>canPlanLine</find>
-      <find>isExistLine</find>
-      <find>getPlanResult</find>
       <find>pgPipeLine</find>
       <find>getPipeLineBylineName</find>
       <find>StringU</find>
-      <find>getAllAlarm</find>
       <find>getAlarmList</find>
       <find>getPgInPersonListByDay</find>
       <find>getDayInPgStatistic</find>
@@ -254,7 +216,16 @@
       <find>getPgContructionByNameOrType</find>
       <find>&quot;&quot;,&quot;&quot;,</find>
       <find>getPgContructionDtoByNameOrType</find>
+      <find>addConstruction</find>
+      <find>getPgLineAcuHole</find>
+      <find>getPlanResult</find>
       <find>getConstruction</find>
+      <find>addPipeLine</find>
+      <find>未找到入廊数据</find>
+      <find>getCurrentHoleByAcu</find>
+      <find>getAllAlarm</find>
+      <find>getPgDeviceDtoListByPartition</find>
+      <find>getPgDeviceByDevType</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -263,57 +234,57 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlan.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileHoleManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/planData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/PlanData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
       </list>
     </option>
   </component>
@@ -359,7 +330,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -421,53 +391,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="dto" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="manager" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -479,29 +402,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="rs" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -516,6 +416,7 @@
         </subPane>
       </pane>
       <pane id="Scope" />
+      <pane id="PackagesPane" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -710,7 +611,13 @@
       <workItem from="1574902733573" duration="1829000" />
       <workItem from="1574998240004" duration="7016000" />
       <workItem from="1575247959683" duration="6997000" />
-      <workItem from="1575704345590" duration="40473000" />
+      <workItem from="1575704345590" duration="69381000" />
+      <workItem from="1575869479666" duration="721000" />
+      <workItem from="1575947104878" duration="6101000" />
+      <workItem from="1576128264436" duration="3347000" />
+      <workItem from="1576208571543" duration="22000" />
+      <workItem from="1576227513917" duration="862000" />
+      <workItem from="1576293721220" duration="18246000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -817,11 +724,18 @@
       <option name="project" value="LOCAL" />
       <updated>1575775489149</updated>
     </task>
-    <option name="localTasksCounter" value="16" />
+    <task id="LOCAL-00016" summary="整改施工信息">
+      <created>1575791780774</created>
+      <option name="number" value="00016" />
+      <option name="presentableId" value="LOCAL-00016" />
+      <option name="project" value="LOCAL" />
+      <updated>1575791780774</updated>
+    </task>
+    <option name="localTasksCounter" value="17" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="452131000" />
+    <option name="totallyTimeSpent" value="510338000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -834,9 +748,8 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
-    <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.24205749" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2647504" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -847,7 +760,7 @@
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.3295082" />
       <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.4819672" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.65737706" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.3295082" />
@@ -939,7 +852,8 @@
     <MESSAGE value="重新设计智能规划部分" />
     <MESSAGE value="完成智能规划对接" />
     <MESSAGE value="修改报警统计" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改报警统计" />
+    <MESSAGE value="整改施工信息" />
+    <option name="LAST_COMMIT_MESSAGE" value="整改施工信息" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -951,16 +865,10 @@
           <option name="timeStamp" value="3" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java</url>
-          <line>69</line>
+          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java</url>
+          <line>40</line>
           <properties />
-          <option name="timeStamp" value="21" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java</url>
-          <line>96</line>
-          <properties />
-          <option name="timeStamp" value="38" />
+          <option name="timeStamp" value="122" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
@@ -970,394 +878,452 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <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="2068">
-          <caret line="154" column="35" selection-start-line="154" selection-start-column="35" selection-end-line="154" selection-end-column="35" />
-        </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="3300">
-          <caret line="297" column="22" selection-start-line="297" selection-start-column="22" selection-end-line="297" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/StringUtils.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
-          <caret line="13" column="48" lean-forward="true" selection-start-line="13" selection-start-column="48" selection-end-line="13" selection-end-column="48" />
+          <caret line="11" column="5" selection-start-line="11" selection-start-column="5" selection-end-line="11" selection-end-column="5" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="78" lean-forward="true" selection-start-line="78" selection-end-line="78" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="616">
-          <caret line="41" column="1" selection-start-line="41" selection-start-column="1" selection-end-line="41" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="110">
-          <caret line="12" column="23" selection-start-line="12" selection-start-column="23" selection-end-line="12" selection-end-column="23" />
+        <state relative-caret-position="516">
+          <caret line="114" column="12" selection-start-line="114" selection-start-column="12" selection-end-line="114" selection-end-column="12" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="164">
-          <caret line="56" lean-forward="true" selection-start-line="56" selection-end-line="56" />
+        <state relative-caret-position="418">
+          <caret line="33" column="44" selection-start-line="33" selection-start-column="44" selection-end-line="33" selection-end-column="44" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="258">
-          <caret line="27" column="12" lean-forward="true" selection-start-line="27" selection-start-column="12" selection-end-line="27" selection-end-column="12" />
+        <state relative-caret-position="132">
+          <caret line="11" column="20" lean-forward="true" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="20" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.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="-12">
-          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        <state relative-caret-position="516">
+          <caret line="142" column="54" selection-start-line="142" selection-start-column="54" selection-end-line="142" selection-end-column="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="858">
-          <caret line="55" column="27" lean-forward="true" selection-start-line="55" selection-start-column="27" selection-end-line="55" selection-end-column="27" />
+        <state relative-caret-position="66">
+          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="58">
+          <caret line="18" column="28" selection-start-line="18" selection-start-column="19" selection-end-line="18" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="305">
+          <caret line="24" column="31" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="714">
+          <caret line="58" column="5" lean-forward="true" selection-start-line="58" selection-start-column="5" selection-end-line="58" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="924">
+          <caret line="134" column="92" selection-start-line="134" selection-start-column="92" selection-end-line="134" selection-end-column="92" />
+          <folding>
+            <element signature="method#linkDevice#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkPartitionCamera#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkReservePlan#0;class#PgAlarmLinkRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1066">
+          <caret line="90" lean-forward="true" selection-start-line="90" selection-end-line="90" />
+          <folding>
+            <element signature="method#getTjResultByAlarmType#0;class#PgAlarmTjRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="946">
+          <caret line="148" column="11" lean-forward="true" selection-start-line="148" selection-start-column="11" selection-end-line="148" selection-end-column="11" />
+          <folding>
+            <element signature="method#getAlarmTypeList#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#addAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#editAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#deleteAlarmType#0;class#PgAlarmTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="208">
+          <caret line="46" column="23" lean-forward="true" selection-start-line="46" selection-start-column="23" selection-end-line="46" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="113" column="9" lean-forward="true" selection-start-line="113" selection-start-column="9" selection-end-line="113" selection-end-column="9" />
+          <folding>
+            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
+            <element signature="method#getNewestCh4InfoByDev#0;class#PgCh4Rs#0" />
+            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="145" column="6" lean-forward="true" selection-start-line="145" selection-start-column="6" selection-end-line="145" selection-end-column="6" />
+          <folding>
+            <element signature="method#addAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#editAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#deleteAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#getAuthorityList#0;class#PgAuthorityRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="58" column="1" lean-forward="true" selection-start-line="58" selection-start-column="1" selection-end-line="58" selection-end-column="1" />
+          <folding>
+            <element signature="method#getPgAssetPlanList#0;class#PgAssetPlanRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="370">
+          <caret line="371" column="66" selection-start-line="371" selection-start-column="66" selection-end-line="371" selection-end-column="66" />
+          <folding>
+            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#searchConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionDev#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="139" column="13" lean-forward="true" selection-start-line="139" selection-start-column="13" selection-end-line="139" selection-end-column="13" />
+          <folding>
+            <element signature="method#getCoInfoByDevAndDate#0;class#PgCoRs#0" />
+            <element signature="method#getNewestCoInfoByDev#0;class#PgCoRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="540">
+          <caret line="223" column="5" lean-forward="true" selection-start-line="223" selection-start-column="5" selection-end-line="223" selection-end-column="5" />
+          <folding>
+            <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="682">
+          <caret line="100" lean-forward="true" selection-start-line="100" selection-end-line="100" />
+          <folding>
+            <element signature="method#getDeviceTpeyList#0;class#PgDeviceTypeRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="377">
+          <caret line="225" column="35" selection-start-line="225" selection-start-column="35" selection-end-line="225" selection-end-column="35" />
+          <folding>
+            <element signature="method#addEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#addEquipment#1;class#PgEquipmentRs#0" />
+            <element signature="method#getEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#deleteEquipment#0;class#PgEquipmentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="406">
+          <caret line="109" lean-forward="true" selection-start-line="109" selection-end-line="109" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="154">
+          <caret line="28" column="19" selection-start-line="28" selection-start-column="19" selection-end-line="28" selection-end-column="19" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="748">
-          <caret line="49" column="5" lean-forward="true" selection-start-line="49" selection-start-column="5" selection-end-line="49" selection-end-column="5" />
+        <state relative-caret-position="296">
+          <caret line="161" column="35" selection-start-line="161" selection-start-column="35" selection-end-line="161" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="384">
+          <caret line="99" column="5" lean-forward="true" selection-start-line="99" selection-start-column="5" selection-end-line="99" selection-end-column="5" />
+        </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="362">
+          <caret line="340" column="35" selection-start-line="340" selection-start-column="35" selection-end-line="340" selection-end-column="35" />
+          <folding>
+            <element signature="method#addInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPersonInPg#0;class#PgInPgPersonRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-606">
+          <caret line="76" column="20" lean-forward="true" selection-start-line="76" selection-start-column="20" selection-end-line="76" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="65" column="35" selection-start-line="65" selection-start-column="35" selection-end-line="65" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="101" column="35" selection-start-line="101" selection-start-column="35" selection-end-line="101" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="84" column="35" selection-start-line="84" selection-start-column="35" selection-end-line="84" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="59" lean-forward="true" selection-start-line="59" selection-end-line="59" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="60" column="1" lean-forward="true" selection-start-line="60" selection-start-column="1" selection-end-line="60" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="145" column="35" selection-start-line="145" selection-start-column="35" selection-end-line="145" selection-end-column="35" />
+        </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="274">
+          <caret line="350" column="35" selection-start-line="350" selection-start-column="35" selection-end-line="350" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="121" column="39" selection-start-line="121" selection-start-column="39" selection-end-line="121" selection-end-column="39" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="28" column="8" lean-forward="true" selection-start-line="28" selection-start-column="8" selection-end-line="28" selection-end-column="8" />
+        <state relative-caret-position="340">
+          <caret line="103" selection-start-line="103" selection-end-line="103" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="226" column="35" selection-start-line="226" selection-start-column="35" selection-end-line="226" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="203" column="35" selection-start-line="203" selection-start-column="35" selection-end-line="203" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="241" column="35" selection-start-line="241" selection-start-column="35" selection-end-line="241" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="225" column="1" lean-forward="true" selection-start-line="225" selection-start-column="1" selection-end-line="225" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="176" column="5" lean-forward="true" selection-start-line="176" selection-start-column="5" selection-end-line="176" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="178" column="35" lean-forward="true" selection-start-line="178" selection-start-column="35" selection-end-line="178" selection-end-column="35" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="516">
-          <caret line="94" column="53" selection-start-line="94" selection-start-column="53" selection-end-line="94" selection-end-column="53" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="814">
-          <caret line="52" column="9" lean-forward="true" selection-start-line="52" selection-start-column="9" selection-end-line="52" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="182">
-          <caret line="58" column="12" lean-forward="true" selection-start-line="58" selection-start-column="12" selection-end-line="58" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="34" lean-forward="true" selection-start-line="34" selection-end-line="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="32" lean-forward="true" selection-start-line="32" selection-end-line="32" />
-          <folding>
-            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
-            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="185">
-          <caret line="63" column="13" selection-start-line="63" selection-start-column="13" selection-end-line="63" selection-end-column="13" />
-          <folding>
-            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
-            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
-            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="e#6319#6324#0" />
-            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
-          </folding>
+          <caret line="240" lean-forward="true" selection-start-line="240" selection-end-line="240" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
-          <caret line="58" column="28" lean-forward="true" selection-start-line="58" selection-start-column="28" selection-end-line="58" selection-end-column="28" />
-          <folding>
-            <element signature="method#addTempHumData#0;class#PgTempHumRs#0" />
-          </folding>
+        <state relative-caret-position="340">
+          <caret line="148" column="34" selection-start-line="148" selection-start-column="34" selection-end-line="148" selection-end-column="34" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
+        <state relative-caret-position="458">
+          <caret line="99" column="35" selection-start-line="99" selection-start-column="35" selection-end-line="99" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+        <state relative-caret-position="384">
+          <caret line="145" column="32" lean-forward="true" selection-start-line="145" selection-start-column="32" selection-end-line="145" selection-end-column="32" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="414">
-          <caret line="22" column="46" lean-forward="true" selection-start-line="22" selection-start-column="46" selection-end-line="22" selection-end-column="46" />
-        </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="396">
-          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" column="83" selection-start-line="11" selection-start-column="83" selection-end-line="11" selection-end-column="83" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="26">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
-          <folding>
-            <element signature="method#getPgInPgStatusByPerson#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNumByName#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNum#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPersonListByDay#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPgStatusByPgInPgPerson#0;class#PgInPgStatusManager#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="44">
-          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-12">
-          <caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="87" lean-forward="true" selection-start-line="87" selection-end-line="87" />
-          <folding>
-            <element signature="method#getConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#addConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#deleteConstructionType#0;class#PgConstructionTypeRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
-          <folding>
-            <element signature="method#getConstructionTypeByType#0;class#PgConstructionTypeManager#0" />
-            <element signature="method#getAllConstructionTypeDto#0;class#PgConstructionTypeManager#0" />
-          </folding>
-        </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="145">
-          <caret line="258" column="9" lean-forward="true" selection-start-line="258" selection-start-column="9" selection-end-line="258" selection-end-column="9" />
-          <folding>
-            <element signature="method#getMonthInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayInPgStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgOverViewRs#0" />
-            <element signature="method#getAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getMonthAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayAlarmStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgOverViewRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="103">
-          <caret line="105" column="50" lean-forward="true" selection-start-line="105" selection-start-column="50" selection-end-line="105" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateBasicDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="99">
-          <caret line="125" selection-start-line="125" selection-end-line="125" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="190">
-          <caret line="24" column="35" lean-forward="true" selection-start-line="24" selection-start-column="35" selection-end-line="24" selection-end-column="35" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="436">
-          <caret line="24" lean-forward="true" selection-start-line="24" selection-end-line="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" lean-forward="true" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="300">
-          <caret line="34" column="31" lean-forward="true" selection-start-line="34" selection-start-column="31" selection-end-line="34" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="42" column="13" lean-forward="true" selection-start-line="42" selection-start-column="13" selection-end-line="42" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="120" column="72" lean-forward="true" selection-start-line="120" selection-start-column="72" selection-end-line="120" selection-end-column="72" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="293">
-          <caret line="58" column="73" lean-forward="true" selection-start-line="58" selection-start-column="73" selection-end-line="58" selection-end-column="73" />
-          <folding>
-            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
-            <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
-          </folding>
-        </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="307">
-          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
+        <state relative-caret-position="758">
+          <caret line="130" column="5" lean-forward="true" selection-start-line="130" selection-start-column="5" selection-end-line="130" selection-end-column="5" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1170">
-          <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
+        <state relative-caret-position="494">
+          <caret line="86" column="62" lean-forward="true" selection-start-line="86" selection-start-column="62" selection-end-line="86" selection-end-column="62" />
           <folding>
-            <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-            <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+            <element signature="method#getAllDevice#0;class#PgDeviceManager#0" />
+            <element signature="method#getAllDev#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="195" column="28" lean-forward="true" selection-start-line="195" selection-start-column="28" selection-end-line="195" selection-end-column="28" />
+        <state relative-caret-position="166">
+          <caret line="174" column="13" lean-forward="true" selection-start-line="174" selection-start-column="13" selection-end-line="174" selection-end-column="13" />
           <folding>
-            <element signature="method#getAlarmByTypeAndTime#0;class#PgAlarmManager#0" />
-            <element signature="method#getAlarmNum#0;class#PgAlarmManager#0" />
             <element signature="method#getDayAlarmStatistic#0;class#PgAlarmManager#0" />
+            <element signature="method#getAlarmList#0;class#PgAlarmManager#0" />
             <element signature="method#createDTO#0;class#PgAlarmManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="364">
+          <caret line="46" column="56" lean-forward="true" selection-start-line="46" selection-start-column="56" selection-end-line="46" selection-end-column="56" />
+          <folding>
+            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
+            <element signature="method#getPgDev#0;class#PgDeviceRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
+            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+        <state relative-caret-position="396">
+          <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
           <folding>
             <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
             <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -1365,52 +1331,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="239">
-          <caret line="21" column="33" lean-forward="true" selection-start-line="21" selection-start-column="33" selection-end-line="21" selection-end-column="33" />
-        </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="352">
-          <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-        </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="99">
-          <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-          </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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-          <folding>
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-            <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>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
index c436c93..e913155 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
@@ -132,7 +132,10 @@
             this.setAlarmType("");
         else
             this.setAlarmType(pgAlarm.getAlarmTypeId().getAlarmType());
-        this.setAlarmValue(pgAlarm.getAlarmValue());
+        if(pgAlarm.getAlarmValue()==null)
+            this.setAlarmValue("");
+        else
+            this.setAlarmValue(pgAlarm.getAlarmValue());
         if (pgAlarm.getAlarmDate() != null)
             this.setAlarmDate(sdf.format(pgAlarm.getAlarmDate()));
         else
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
index a43965c..565cb41 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -159,11 +159,21 @@
     }
 
     //获取历史报警消息列表
-    public List<PgAlarmDto> getAllAlarm(String alarmType,String startDay,String endDay,String isNew,int page,int rows) {
-        try {
+    public  Map<String, Object> getAllAlarm(String alarmType,String partition,String startDay,String endDay,String isNew,int page,int rows) {
 
+        Map<String, Object> resultMap = new HashMap<>();
+        String msg="";
+
+        try {
             Criteria criteria = createCriteria(PgAlarm.class);
 
+            if (StringUtils.isNotBlank(partition)) {
+                DetachedCriteria inCriteria = DetachedCriteria.forClass(PgDevice.class);
+                inCriteria.add(Restrictions.eq("partition", partition));
+                inCriteria.setProjection(Property.forName("id"));
+                criteria.add(Property.forName("alarmDevId").in(inCriteria));
+            }
+
             if (StringUtils.isNotBlank(alarmType)&&!alarmType.contains("全部")&&pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
                 criteria.add(Restrictions.eq("alarmTypeId", pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)));
 
@@ -190,8 +200,16 @@
             for (PgAlarm pgAlarm : pgAlarmList) {
                 pgAlarmDtoList.add(new PgAlarmDto(pgAlarm));
             }
-
-            return pgAlarmDtoList;
+            if(pgAlarmDtoList==null||pgAlarmDtoList.size()==0) {
+                resultMap.put("msg", "没有报警信息");
+                resultMap.put("code","0");
+            }else {
+                resultMap.put("code","200");
+                resultMap.put("msg", "报警信息获取成功");
+            }
+            resultMap.put("count",pg.getTotalCount());
+            resultMap.put("result",pgAlarmDtoList);
+            return resultMap;
         }
         catch(Exception ex){
             ex.printStackTrace();
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index 7547560..654f49e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -24,11 +24,11 @@
 
         Criteria criteria = createCriteria(PgDevice.class);
 
-        if(road!=null)
+        if(StringUtils.isNotBlank(road))
             criteria.add(Restrictions.eq("road",road));
-        if(partition!=null)
+        if(StringUtils.isNotBlank(partition))
             criteria.add(Restrictions.eq("partition",partition));
-        if(devType!=null)
+        if(StringUtils.isNotBlank(devType))
             criteria.add(Restrictions.eq("devType",devType));
 
         criteria.add(Restrictions.eq("active", 1));
@@ -43,6 +43,29 @@
         return pgDeviceDtoList;
     }
 
+    public List<PgDeviceDto> getAllDev(String road,String partition,String devType) {
+
+        Criteria criteria = createCriteria(PgDevice.class);
+
+        if(StringUtils.isNotBlank(road))
+            criteria.add(Restrictions.eq("road",road));
+        if(StringUtils.isNotBlank(partition))
+            criteria.add(Restrictions.eq("partition",partition));
+        if(StringUtils.isNotBlank(devType))
+            criteria.add(Restrictions.like("devType","%"+devType+"%"));
+
+        criteria.add(Restrictions.eq("active", 1));
+        criteria.addOrder(Order.desc("id"));
+        List<PgDevice> pgDeviceList = criteria.list();
+
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
+        for (PgDevice pgDevice : pgDeviceList) {
+            pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
+        }
+
+        return pgDeviceDtoList;
+    }
+
     //根据名字获取当前设备
     public PgDevice getDeviceByAssetCode(String assetCode) {
         Criteria criteria=createCriteria(PgDevice.class);
@@ -56,9 +79,9 @@
     }
 
     //根据类型获取设备列表
-    public List<PgDeviceDto> getDeviceByDevTypee(String devType) {
+    public List<PgDeviceDto> getDeviceByDevType(String devType) {
         Criteria criteria=createCriteria(PgDevice.class);
-        criteria.add(Restrictions.eq("devType",devType));
+        criteria.add(Restrictions.like("devType","%"+devType+"%"));
 
         List<PgDevice> pgDeviceList=criteria.list();
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
@@ -106,7 +129,7 @@
         criteria.add(Restrictions.eq("partition",partition));
 
         List<PgDevice> pgDeviceList=criteria.list();
-        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<PgDeviceDto>();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
 
         for (PgDevice pgDevice : pgDeviceList) {
             pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
index 3a3bccd..595730e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
@@ -1,10 +1,13 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.devTable.domain.PgAlarmType;
 import com.casic.PgInterface.devTable.domain.PgPartition;
 import com.casic.PgInterface.devTable.domain.PgRoad;
 import com.casic.PgInterface.devTable.domain.PipeGallery;
 import com.casic.PgInterface.devTable.dto.PgPartitionDto;
+import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
@@ -12,7 +15,9 @@
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Created by yxw on 2017/11/4.
@@ -21,7 +26,8 @@
 public class PgPartitionManager extends HibernateEntityDao<PgPartition> {
 
     @Resource
-    PgRoadManager pgRoadManager;
+    private PgRoadManager pgRoadManager;
+
 
     public PgPartition getPartitionByParName(String parName) {
         Criteria criteria = getSession().createCriteria(PgPartition.class);
@@ -99,4 +105,5 @@
         return pgPartitionDtoList;
     }
 
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
index f216360..a6928f1 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
@@ -5,6 +5,7 @@
 public class PgPlanResultRe {
 
     private String taskKey;
+    private List<String> pileAcuList;
     private List<PgPlanResult> pgPlanResultList;
 
     public String getTaskKey() {
@@ -15,6 +16,14 @@
         this.taskKey = taskKey;
     }
 
+    public List<String> getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(List<String> pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+
     public List<PgPlanResult> getPgPlanResultList() {
         return pgPlanResultList;
     }
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
index 71ea765..47eea07 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
@@ -54,9 +54,7 @@
 
         List<PgLineHole> pgLineHoleList=criteria.list();
         List<PgLineHoleDTO> pgLineHoleDTOList=new ArrayList<>();
-        if(pgLineHoleList==null||pgLineHoleList.size()==0)
-            return null;
-        else
+        if(pgLineHoleList!=null&&pgLineHoleList.size()!=0)
             pgLineHoleDTOList=PgLineHoleDTO.ConvertToDTOList(pgLineHoleList,pgPileAcuManager,pgRoadManager);
         return pgLineHoleDTOList;
     }
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
index 0fd9e1f..841a386 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
@@ -1,12 +1,15 @@
 package com.casic.PgInterface.intelPlan.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.devTable.domain.PgPartition;
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
 import com.casic.PgInterface.intelPlan.domain.PgLineHole;
 import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
 import com.casic.PgInterface.intelPlan.domain.PgSection;
 import com.casic.PgInterface.intelPlan.dto.PgPlanResult;
 import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
 import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -22,6 +25,9 @@
     @Resource
     private PgLineHoleManager pgLineHoleManager;
 
+    @Resource
+    private PgRoadManager pgRoadManager;
+
     public PgPileAcu getPgPileAcuByCode(String acuCode){
         List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
 
@@ -58,7 +64,9 @@
         for(PgPlanTask pgPlanTask:pgPlanTaskList){
             List<PgPlanResult> pgPlanResultList=getPgPlanResultByPlantask(pgPlanTask);
             PgPlanResultRe pgPlanResultRe=new PgPlanResultRe();
+
             pgPlanResultRe.setTaskKey(pgPlanTask.getTaskKey());
+            pgPlanResultRe.setPileAcuList(pgPlanTask.getPileAcuList());
             pgPlanResultRe.setPgPlanResultList(pgPlanResultList);
 
             pgPlanResultReList.add(pgPlanResultRe);
@@ -142,4 +150,57 @@
         return length;
     }
 
+    private PgPileAcu getPgPileAcuByAcuCode(String acuCode){
+        List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
+
+        if(pgPileAcuList==null||pgPileAcuList.size()==0)
+            return null;
+        else
+            return pgPileAcuList.get(0);
+    }
+
+    public List<PgAcuTask> getACUTask(String pileAcuList){
+        String[] acuArray=pileAcuList.split(",");
+        List<PgAcuTask> pgAcuTaskList=new ArrayList<>();
+
+        for(String acu:acuArray){
+            PgPileAcu pgPileAcu=this.getPgPileAcuByCode(acu);
+            String roadName=pgRoadManager.get(pgPileAcu.getRoadId()).getRoadName();
+
+            if(!containRoad(roadName,pgAcuTaskList))
+            {
+                PgAcuTask pgAcuTask=new PgAcuTask();
+                pgAcuTask.setRoadName(roadName);
+                pgAcuTask.setPileAcuList(acu);
+                pgAcuTaskList.add(pgAcuTask);
+            }
+            else{
+                PgAcuTask pgAcuTask=getIndexRoad(roadName,pgAcuTaskList);
+                if(pgAcuTask!=null)
+                    pgAcuTask.setPileAcuList(pgAcuTask.getPileAcuList()+","+acu);
+            }
+        }
+
+        return pgAcuTaskList;
+    }
+
+    private boolean containRoad(String roadName,List<PgAcuTask> pgAcuTaskList){
+        if(pgAcuTaskList==null||pgAcuTaskList.size()==0) return false;
+        for(PgAcuTask pgAcuTask:pgAcuTaskList){
+            if(pgAcuTask.getRoadName().equals(roadName))
+                return true;
+        }
+
+        return false;
+    }
+
+    private PgAcuTask getIndexRoad(String roadName, List<PgAcuTask> pgAcuTaskList){
+        for(PgAcuTask pgAcuTask:pgAcuTaskList){
+            if(pgAcuTask.getRoadName().equals(roadName))
+                return pgAcuTask;
+        }
+
+        return null;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java
new file mode 100644
index 0000000..323f7ef
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java
@@ -0,0 +1,25 @@
+package com.casic.PgInterface.reservePlan.dto;
+
+import java.util.List;
+
+public class PgAcuTask {
+
+    private String roadName;//道路
+    private String pileAcuList;//acu分区
+
+    public String getRoadName() {
+        return roadName;
+    }
+
+    public void setRoadName(String roadName) {
+        this.roadName = roadName;
+    }
+
+    public String getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(String pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
index c25e926..c7d7693 100644
--- a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
@@ -70,9 +70,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(Long.valueOf(inPgPersonId));
         PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("hostName",pgInPgPerson.getAssetCode());
-//        PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode());
-//        long maxId = pgTagPositionManager.getMaxId(pgTagMac.getTagMac());
-//        PGTagPosition pgTagPosition = pgTagPositionManager.get(maxId);
+
         PGTagPosition pgTagPosition = tagmacRun.GetTagStatus(pgTagMac);
         boolean bExist = false;
         bExist = pgTagPositionManager.findTagPosition(pgTagPosition.getPositionUpdatetime(),pgTagPosition.getHostId());
@@ -104,8 +102,7 @@
         PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(Long.valueOf(inPgPersonId));
         PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pgInPgPersonId",pgInPgPerson);
         System.out.println("time:"+pgInPgStatus.getInTime());
-//        PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pgInPgPersonId",inPgPersonId);
-//        PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode());
+
         PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("hostName",pgInPgPerson.getAssetCode());
 
         Map<Object,Object> mapPosition = new HashMap<>();
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
index 082ba5d..3eed00a 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
@@ -48,6 +48,7 @@
     public Map<String, Object> linkDevice(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         PgDeviceDto pgDeviceDto = null;
         try {
@@ -62,6 +63,7 @@
                     else {
                         pgDeviceDto = new PgDeviceDto(pgDevice);
                         msg = "报警关联设备获取成功";
+                        code="200";
                     }
                 }
             }
@@ -71,6 +73,7 @@
             e.printStackTrace();
             msg = "获取关联设备失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceDto);
 
@@ -86,6 +89,7 @@
     public Map<String, Object> linkPartitionCamera(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
         try {
@@ -106,6 +110,7 @@
 
                         pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(partition,position);
                         msg = "关联设备获取成功";
+                        code="200";
                     }
                 }
             }
@@ -115,6 +120,7 @@
             e.printStackTrace();
             msg = "分区设备关联失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceDtoList);
         return resultMap;
@@ -129,6 +135,7 @@
     public Map<String, Object> linkReservePlan(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgReservePlanDto> pgReservePlanDtoList=new ArrayList<>();
         try{
@@ -139,10 +146,12 @@
                 else {
                     pgReservePlanDtoList = pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
 
-                    if(pgReservePlanDtoList==null||pgReservePlanDtoList.size()==0)
-                        msg="不存在关联的报警预案";
-                    else
+                    if (pgReservePlanDtoList == null || pgReservePlanDtoList.size() == 0)
+                        msg = "不存在关联的报警预案";
+                    else {
                         msg = "关联预案获取成功";
+                        code="200";
+                    }
                 }
             }
             else
@@ -153,6 +162,7 @@
             e.printStackTrace();
             msg="预案关联失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgReservePlanDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
index 0ddbc4d..0ce886b 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
@@ -41,25 +41,19 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getAlarmList(@FormParam("alarmType") String alarmType,
                                             @FormParam("startDay") String startDay,
+                                            @FormParam("partition") String partition,
                                             @FormParam("endDay") String endDay,
                                             @FormParam("isNew") String isNew,
                                             @FormParam("page") int page,
                                             @FormParam("rows") int rows) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
         try {
-            pgAlarmDtoList = pgAlarmManager.getAllAlarm(alarmType,startDay,endDay,isNew,page,rows);
-            if (pgAlarmDtoList==null||pgAlarmDtoList.size() == 0)
-                msg = "没有报警信息";
-            else
-                msg = "报警信息获取成功";
+            resultMap = pgAlarmManager.getAllAlarm(alarmType,partition,startDay,endDay,isNew,page,rows);
+
         } catch (Exception e) {
             e.printStackTrace();
-            msg = "报警信息获取失败";
         }
-        resultMap.put("msg", msg);
-        resultMap.put("result", pgAlarmDtoList);
         return resultMap;
     }
 
@@ -71,9 +65,10 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> clearAlarmList(@FormParam("id") String id) throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        String result = "false";
+        String result = "";
+        String code="0";
 
         try {
             PgAlarm pgAlarm = new PgAlarm();
@@ -86,12 +81,14 @@
                 pgAlarmManager.save(pgAlarm);
                 msg = "报警信息清除成功";
                 result = "true";
+                code = "200";
             }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警信息清除失败";
             result = "false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
@@ -106,21 +103,26 @@
     public Map<String, Object> getAlarmByTypeOrTime(@FormParam("alarmType") String alarmType,
                                                     @FormParam("startTime") String startTime,
                                                     @FormParam("endTime") String endTime) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
-        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<PgAlarmDto>();
+        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
         try {
             pgAlarmDtoList = pgAlarmManager.getAlarmByTypeAndTime(alarmType, startTime, endTime);
             if (pgAlarmDtoList == null || pgAlarmDtoList.size() == 0)
                 msg = "报警信息不存在";
             else
+            {
                 msg = "报警信息获取成功";
+                code="200";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警信息获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
index 29ce8a4..ed0bf34 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
@@ -39,8 +39,8 @@
     public Map<String, Object> getAlarmRule(@FormParam("devType") String devType) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
-        System.out.println("devType:"+devType);
         List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<>();
         try {
             pgAlarmRuleDtoList = pgAlarmRuleManager.getAlarmRuleDto(devType);
@@ -52,6 +52,7 @@
             e.printStackTrace();
             msg = "报警阈值信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmRuleDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
index 24ab894..abef1b1 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
@@ -39,16 +39,21 @@
                                                      @FormParam("endDate") String endDate)throws Exception{
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
+
         List<PgAlarmTjDto> pgAlarmTjDtoList=null;
         try{
             pgAlarmTjDtoList=pgAlarmTjManager.getAlarmTjResultByType(startDate,endDate);
             msg="获取成功";
+            code="200";
         }
         catch(Exception ex) {
             msg = "统计失败";
         }
-        resultMap.put("result",pgAlarmTjDtoList);
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
+        resultMap.put("result",pgAlarmTjDtoList);
+
         return resultMap;
     }
 
@@ -61,23 +66,27 @@
     public Map<String, Object> getAlarmByTime(@FormParam("startTime") String startTime,
                                               @FormParam("endTime") String endTime,
                                               @FormParam("statisticType") String statisticType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code = "0";
 
-        List<PgAlarmTjDto> pgAlarmTjDtoList = new ArrayList<PgAlarmTjDto>();
+        List<PgAlarmTjDto> pgAlarmTjDtoList = new ArrayList<>();
         try {
             pgAlarmTjDtoList = pgAlarmTjManager.getAlarmByTime(startTime, endTime, statisticType);
             if(pgAlarmTjDtoList==null)
                 msg="报警统计信息获取失败";
-            else
-                msg="报警统计信息获取成功";
+            else {
+                msg = "报警统计信息获取成功";
+                code="200";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警统计信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmTjDtoList);
         return resultMap;
     }
 
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
index 28bc811..b6278a9 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
@@ -30,7 +30,6 @@
     @Resource
     private PgAlarmTypeManager pgAlarmTypeManager;
 
-
     /**
      * 获取报警类型
      */
@@ -38,19 +37,24 @@
     @Path("getAlarmType")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getAlarmTypeList()throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
-        List<PgAlarmTypeDto> pgAlarmTypeDtoList=new ArrayList<PgAlarmTypeDto>();
+        String code="";
+
+        List<PgAlarmTypeDto> pgAlarmTypeDtoList=new ArrayList<>();
         try {
             pgAlarmTypeDtoList = pgAlarmTypeManager.getAllAlarmTypeDto();
             if(pgAlarmTypeDtoList.size()==0)
                 msg="没有报警类型信息";
-            else
-                msg="报警类型信息获取成功";
+            else {
+                code="200";
+                msg = "报警类型信息获取成功";
+            }
         }catch(Exception e){
             e.printStackTrace();
             msg="报警类型信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAlarmTypeDtoList);
         return resultMap;
@@ -66,6 +70,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
@@ -83,6 +88,7 @@
                 logger.info("成功保存");
                 result = "true";
                 msg = "保存成功";
+                code="200";
             }
         } catch (Exception e) {
             result = "false";
@@ -90,6 +96,7 @@
             e.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -106,6 +113,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try{
             if(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
@@ -119,6 +127,7 @@
                 pgAlarmTypeManager.save(pgAlarmType);
                 result = "true";
                 msg = "编辑成功";
+                code="200";
             }
         }
         catch(Exception e)
@@ -128,6 +137,7 @@
             e.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("result",result);
         resultMap.put("msg",msg);
 
@@ -146,6 +156,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
         String result="false";
+        String code="0";
 
         try {
             PgAlarmType pgAlarmType=pgAlarmTypeManager.get(Long.valueOf(id));
@@ -157,6 +168,7 @@
             {
                 pgAlarmType.setActive(0);
                 pgAlarmTypeManager.save(pgAlarmType);
+                code="200";
                 msg="报警类型删除成功";
                 result="true";
             }
@@ -165,6 +177,7 @@
             msg="报警类型删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
index 4533e1a..85940bb 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
@@ -33,12 +33,15 @@
                                                  @FormParam("inSpectionPlace") String inSpectionPlace){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
         List<PgAssetPlanDto> pgAssetPlanDtoList=new ArrayList<>();
         try{
             pgAssetPlanDtoList=pgAssetPlanManager.getPgAssetPlanDtoList(startDay,endDay,inSpectionPlace);
-            if(pgAssetPlanDtoList!=null&&pgAssetPlanDtoList.size()!=0)
-                msg="巡检信息获取成功";
+            if(pgAssetPlanDtoList!=null&&pgAssetPlanDtoList.size()!=0) {
+                code="200";
+                msg = "巡检信息获取成功";
+            }
             else
                 msg="不存在巡检信息";
         }
@@ -47,6 +50,7 @@
             msg="巡检信息获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAssetPlanDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
index 47ef9d1..5cbdfcb 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
@@ -30,12 +30,15 @@
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
         String result="";
+        String code="0";
 
         List<PgAssetPlanStatic> pgAssetPlanStaticList = null;
         try{
             pgAssetPlanStaticList=pgAssetPlanManager.getPgAssetPlanStaticLisByTime(startTime,endTime,staticType);
-            if(pgAssetPlanStaticList!=null&&pgAssetPlanStaticList.size()!=0)
-                msg="巡检统计信息获取成功";
+            if(pgAssetPlanStaticList!=null&&pgAssetPlanStaticList.size()!=0) {
+                code = "200";
+                msg = "巡检统计信息获取成功";
+            }
             else
                 msg="统计信息获取失败";
         }
@@ -44,6 +47,7 @@
             msg="统计失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAssetPlanStaticList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
index 26f5d6a..503bfe3 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
@@ -40,6 +40,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="";
 
         try{
             PgAuthority pgAuthority=new PgAuthority();
@@ -50,6 +51,7 @@
 
             pgAuthorityManager.save(pgAuthority);
             msg="用户权限保存成功";
+            code="200";
             result="true";
         }
         catch(Exception e) {
@@ -57,6 +59,7 @@
             msg = "新增权限失败";
             result = "false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -65,22 +68,25 @@
 
     /*
        *编辑角权限信息
-        */
+    */
     @POST
     @Path("editAuthority")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> editAuthority(@FormParam("id") String id,
                                        @FormParam("authority") String authority,
                                        @FormParam("concent") String concent) throws Exception{
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
+
         try {
             PgAuthority pgAuthority=pgAuthorityManager.get(Long.valueOf(id));
             pgAuthority.setAuthority(authority);
             pgAuthority.setConcent(concent);
 
             pgAuthorityManager.save(pgAuthority);
+            code="200";
             msg="权限保存成功";
             result="true";
         }
@@ -90,7 +96,7 @@
             msg="权限编辑失败";
             result="false";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -105,9 +111,10 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> deleteAuthority(@FormParam("id") String id)throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
-        String result="false";
+        String result="";
+        String code="0";
 
         try {
             PgAuthority pgAuthority= pgAuthorityManager.get(Long.valueOf(id));
@@ -119,6 +126,7 @@
             {
                 pgAuthority.setActive(0);
                 pgAuthorityManager.save(pgAuthority);
+                code="200";
                 msg="删除权限成功";
                 result="true";
             }
@@ -127,37 +135,40 @@
             msg="删除权限失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
     }
 
     /*
-* 获取权限信息
- */
+    * 获取权限信息
+    */
     @POST
     @Path("getAuthorityList")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> getAuthorityList() {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgAuthorityDto> pgAuthorityDtoList = new ArrayList<PgAuthorityDto>();
         try {
             pgAuthorityDtoList = pgAuthorityManager.getAuthorityList();
             if (pgAuthorityDtoList == null)
                 msg = "不存在权限信息";
-            else
+            else {
+                code = "200";
                 msg = "权限信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "权限信息获取是失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAuthorityDtoList);
         return resultMap;
     }
 
 
-
-
 }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
index a9ef521..a74ecc7 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
@@ -45,6 +45,7 @@
                                                @FormParam("endDate") String endDate)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgHistoryDataDto> pgHistoryDataDtoList=new ArrayList<>();
 
         try {
@@ -55,13 +56,16 @@
                 pgHistoryDataDtoList=pgCh4Manager.getAllCH4Data(pgDevice,startDate,endDate);
                 if(pgHistoryDataDtoList==null)
                     msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+                else {
+                    code = "200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgHistoryDataDtoList);
         return resultMap;
@@ -75,8 +79,9 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getNewestCh4InfoByDev(@FormParam("assetCode") String assetCode)throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
+        String code="0";
         PgCh4Dto pgCh4Dto=new PgCh4Dto(null);
 
         try {
@@ -87,13 +92,17 @@
                 pgCh4Dto=pgCh4Manager.getNewestCH4Data(pgDevice);
                 if(pgCh4Dto==null)
                     msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgCh4Dto);
         return resultMap;
@@ -111,6 +120,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
@@ -127,6 +137,7 @@
                 pgCh4.setPgDeviceId(pgDevice);
 
                 pgCh4Manager.save(pgCh4);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -135,7 +146,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
index a7eac39..dfc8ca5 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
@@ -43,23 +43,27 @@
                                                       @FormParam("endDate") String endDate)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgHistoryDataDto> pgHistoryDataDtoList=new ArrayList<>();
 
         try {
             PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
                 msg="设备不存在";
-            else{
-                pgHistoryDataDtoList=pgCoManager.getAllCoData(pgDevice, startDate, endDate);
-                if(pgHistoryDataDtoList==null)
-                    msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+            else {
+                pgHistoryDataDtoList = pgCoManager.getAllCoData(pgDevice, startDate, endDate);
+                if (pgHistoryDataDtoList == null)
+                    msg = "没有满足要求的数据";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgHistoryDataDtoList);
         return resultMap;
@@ -75,6 +79,7 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         PgCoDto pgCoDto=new PgCoDto(null);
 
         try {
@@ -85,13 +90,16 @@
                 pgCoDto=pgCoManager.getNewestCoData(pgDevice);
                 if(pgCoDto==null)
                     msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgCoDto);
         return resultMap;
@@ -110,6 +118,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         try {
@@ -126,6 +135,7 @@
 
                 pgCoManager.save(pgCo);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
         } catch (Exception e) {
@@ -133,7 +143,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
index b4b826e..9af98a3 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
@@ -60,6 +60,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         try {
 
@@ -80,8 +81,8 @@
                 pgConstruction.setPgConstructionTypeId(pgConstructionType.getId());
                 pgConstruction.setActive(1);
                 pgConstruction.setParName(parName);
-                logger.info("保存成功");
                 pgConstructionManager.save(pgConstruction);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -90,6 +91,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("success", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -116,6 +118,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
@@ -140,6 +143,7 @@
                 pgConstruction.setParName(parName);
 
                 pgConstructionManager.save(pgConstruction);
+                code="200";
                 result = "true";
                 msg = "编辑成功";
             }
@@ -150,7 +154,7 @@
             e.printStackTrace();
 
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -167,6 +171,8 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
+
         try {
             PgConstruction pgConstruction = pgConstructionManager.get(Long.valueOf(id));
             if (pgConstruction == null)
@@ -177,6 +183,7 @@
             {
                 pgConstruction.setActive(0);
                 pgConstructionManager.save(pgConstruction);
+                code="200";
                 result = "true";
                 msg = "成功删除信息";
             }
@@ -185,6 +192,7 @@
             result = "false";
             msg = "删除失败";
         }
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -204,9 +212,11 @@
                                                   @FormParam("rows") int rows)throws Exception{
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
         List<PgConstructionDto> pgConstructionDtoList=new ArrayList<>();
         try{
             pgConstructionDtoList=pgConstructionManager.getPgContructionDto(cs_name,cs_type,startTime,endTime,page,rows);
+            code="200";
             msg="信息获取成功";
         }
         catch(Exception e)
@@ -214,6 +224,7 @@
             e.printStackTrace();
             msg="查询失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
 
@@ -231,18 +242,22 @@
                                                               @FormParam("statisticType") String statisticType) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgConstructionStiatistic> pgConstructionStiatisticList=new ArrayList<>();
         try {
             pgConstructionStiatisticList = pgConstructionManager.getConstructionByTimeAndStatus(startTime, endTime, statisticType);
             if(pgConstructionStiatisticList==null)
                 msg="施工统计信息获取失败";
-            else
-                msg="施工统计信息获取成功";
+            else {
+                code="200";
+                msg = "施工统计信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "施工统计信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgConstructionStiatisticList);
         return resultMap;
@@ -257,6 +272,7 @@
     public Map<String, Object> getConstructionByType(@FormParam("statisticType") String statisticType){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
         List<PgConstructionStiatistic> pgConstructionStiatisticList=new ArrayList<>();
 
         try{
@@ -268,6 +284,7 @@
                 resultMap.put("result",null);
             }
             else {
+                code="200";
                 msg = "统计信息获取成功";
                 resultMap.put("result", pgConstructionStiatisticList);
             }
@@ -278,6 +295,7 @@
             msg="统计失败";
             resultMap.put("result",null);
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         return resultMap;
     }
@@ -291,9 +309,11 @@
     public Map<String, Object> getConstructionToday() throws Exception{
         Map<String,Object> resultMap=new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgConstructionDto> pgConstructionDtoList=new ArrayList<PgConstructionDto>();
         try {
             pgConstructionDtoList = pgConstructionManager.getConstructionToday();
+            code="200";
             msg = "当天施工信息获取成功";
         }
         catch(Exception e)
@@ -301,7 +321,7 @@
             e.printStackTrace();
             msg="获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
         return resultMap;
@@ -316,6 +336,7 @@
     public Map<String, Object> getConstructionDev(@FormParam("id") String id) throws Exception{
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
         List<PgDeviceDto> pgDeviceDtoList =new ArrayList<>();
         try{
@@ -325,14 +346,17 @@
 
             if(pgDeviceDtoList==null)
                 msg="信息获取失败";
-            else
-                msg="信息获取成功";
+            else {
+                code="200";
+                msg = "信息获取成功";
+            }
         }
         catch(Exception e)
         {
             e.printStackTrace();
-            msg="设备信息获取成功";
+            msg="信息获取是被";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgDeviceDtoList);
 
@@ -346,17 +370,21 @@
     @Path("getConstruction")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getConstruction() throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
-        List<PgConstructionDto> pgConstructionDtoList=new ArrayList<PgConstructionDto>();
+        String code="0";
+
+        List<PgConstructionDto> pgConstructionDtoList=new ArrayList<>();
 
         try{
             pgConstructionDtoList=pgConstructionManager.getPgConstructionList();
             if(pgConstructionDtoList==null||pgConstructionDtoList.size()==0)
                 msg="不存在施工记录";
-            else
-                msg="施工信息获取成功";
+            else {
+                code = "200";
+                msg = "施工信息获取成功";
+            }
         }
         catch(Exception e)
         {
@@ -364,6 +392,7 @@
             msg="施工信息获取失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java
index fd3d53e..2019502 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java
@@ -39,12 +39,12 @@
         try {
             pgConstructionTypeDtoList = pgConstructionTypeManager.getAllConstructionTypeDto();
             if (pgConstructionTypeDtoList.size() == 0)
-                msg = "没有项目类型信息";
+                msg = "获取失败";
             else
-                msg = "项目类型获取成功";
+                msg = "获取成功";
         } catch (Exception e) {
             e.printStackTrace();
-            msg = "项目类型信息获取失败";
+            msg = "获取失败";
         }
         resultMap.put("msg", msg);
         resultMap.put("result", pgConstructionTypeDtoList);
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
index 90d001c..037a399 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
@@ -51,6 +51,7 @@
 
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if (StringUtils.isBlank(construct_doc)||StringUtils.isBlank(doc_name))
@@ -65,6 +66,7 @@
             pgCsDocument.setActive(1);
             pgCsDocumentManager.save(pgCsDocument);
 
+            code="200";
             result = "true";
             msg = "保存成功";
 
@@ -74,6 +76,7 @@
             ex.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("success", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -90,6 +93,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             PgCsDocument pgCsDocument = pgCsDocumentManager.get(Long.valueOf(id));
@@ -103,6 +107,7 @@
 
                 pgCsDocumentManager.save(pgCsDocument);
 
+                code="200";
                 result = "true";
                 msg = "编辑成功";
             }
@@ -112,6 +117,7 @@
             msg = "编辑失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -125,9 +131,9 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
         String result="";
+        String code="0";
 
         try{
-
             PgCsDocument pgCsDocument = pgCsDocumentManager.get(Long.valueOf(id));
             if(pgCsDocument==null)
             {
@@ -137,6 +143,7 @@
             else{
                 pgCsDocument.setActive(0);
                 pgCsDocumentManager.save(pgCsDocument);
+                code="200";
                 result="true";
                 msg="删除成功";
             }
@@ -147,7 +154,7 @@
             msg="预案删除失败";
             result="false";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -168,18 +175,21 @@
 
         String msg="";
         String result="";
+        String code="0";
 
         try {
             pgCsDocumentDtoList = pgCsDocumentManager.getAllDocData(cs_name);
-            if (pgCsDocumentDtoList != null)
+            if (pgCsDocumentDtoList != null) {
+                code="200";
                 msg = "获取数据成功";
+            }
             else
                 msg = "没有满足条件的数据";
         }catch (Exception e){
             e.printStackTrace();
             msg = "获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgCsDocumentDtoList);
         return resultMap;
@@ -192,20 +202,22 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
 
         String msg = "";
+        String code="0";
         ResponseEntity<byte[]> path = null;
         try {
             PgCsDocument pgCsDocument = pgCsDocumentManager.get(Long.valueOf(id));
             path = pgCsDocumentManager.downloadFile(pgCsDocument);
             if (path == null)
                 msg = "不存在该文档";
-            else
+            else {
+                code = "200";
                 msg = "下载成功";
-
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "下载失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", path.getBody());
         resultMap.put("msg", msg);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
index 94c5c84..ffc8b95 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
@@ -41,22 +41,24 @@
     public Map<String, Object> getPgDeviceByDevType(@FormParam("devType") String devType) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
         try {
-            pgDeviceDtoList = pgDeviceManager.getDeviceByDevTypee(devType);
+            pgDeviceDtoList = pgDeviceManager.getDeviceByDevType(devType);
             if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0){
                 msg="不存在满足要求的数据";
-                resultMap.put("result",null);
             }
             else{
-                resultMap.put("result", pgDeviceDtoList);
+                code="200";
                 msg = "获取成功";
             }
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", pgDeviceDtoList);
         return resultMap;
     }
 
@@ -69,25 +71,26 @@
     public Map<String, Object> getPgDeviceByAssetCode(@FormParam("assetCode") String assetCode) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         PgDeviceDto pgDeviceDto=null;
         try {
             PgDevice pgDevice = pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
             {
                 msg="不存在设备信息";
-                resultMap.put("result",null);
             }
             else {
                 pgDeviceDto = new PgDeviceDto(pgDevice);
                 msg = "获取成功";
-                resultMap.put("result", pgDeviceDto);
+                code="200";
             }
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", pgDeviceDto);
         return resultMap;
     }
 
@@ -102,27 +105,61 @@
                                              @FormParam("devType") String devType)throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
         try {
             pgDeviceDtoList = pgDeviceManager.getAllDevice(road,partition,devType);
             if(pgDeviceDtoList.size()==0) {
                 msg = "没有找到设备信息";
-                resultMap.put("result",null);
             }
             else {
                 msg = "设备信息获取成功";
-                resultMap.put("result", pgDeviceDtoList);
+                code="200";
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result", pgDeviceDtoList);
         return resultMap;
     }
 
     /**
+     * 显示设备列表
+     */
+    @POST
+    @Path("getPgDev")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String, Object> getPgDev(@FormParam("road") String road,
+                                             @FormParam("partition") String partition,
+                                             @FormParam("devType") String devType)throws Exception {
+        Map<String, Object> resultMap = new HashMap<>();
+        String msg="";
+        String code="0";
+        List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
+        try {
+            pgDeviceDtoList = pgDeviceManager.getAllDev(road,partition,devType);
+            if(pgDeviceDtoList.size()==0) {
+                msg = "没有找到设备信息";
+            }
+            else {
+                code="200";
+                msg = "设备信息获取成功";
+            }
+        }catch(Exception e){
+            e.printStackTrace();
+            msg="设备信息获取失败";
+        }
+        resultMap.put("code",code);
+        resultMap.put("msg",msg);
+        resultMap.put("result", pgDeviceDtoList);
+        return resultMap;
+    }
+
+
+    /**
      * 新增设备
      */
     @POST
@@ -145,6 +182,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if (pgDeviceManager.getDeviceByAssetCode(assetCode)!=null) {
@@ -169,6 +207,7 @@
 
                 pgDeviceManager.save(pgDevice);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
 
@@ -177,10 +216,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -208,14 +246,9 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
-            /*
-            if (pgDeviceManager.getDeviceByAssetCode(assetCode)!=null) {
-                result = "false";
-                msg = "已存在同名设备";
-            } else {
-            */
             PgDevice pgDevice = pgDeviceManager.get(Long.valueOf(id));
             pgDevice.setPipeGallery(pipeGallery);
             pgDevice.setPartition(partition);
@@ -233,14 +266,14 @@
 
             pgDeviceManager.save(pgDevice);
             result = "true";
+            code="200";
             msg = "编辑成功";
-            //}
         } catch (Exception e) {
             result = "false";
             msg = "编辑失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("result",result);
         resultMap.put("msg",msg);
         return resultMap;
@@ -256,7 +289,8 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
-        String result="false";
+        String result="";
+        String code="0";
 
         try {
             PgDevice pgDevice=pgDeviceManager.get(Long.valueOf(id));
@@ -268,6 +302,7 @@
             {
                 pgDevice.setActive(0);
                 pgDeviceManager.save(pgDevice);
+                code="200";
                 msg="设备删除成功";
                 result="true";
             }
@@ -276,6 +311,7 @@
             msg="设备删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -291,18 +327,18 @@
     {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         PgDeviceDto pgDeviceDto=null;
 
         try{
             PgDevice pgDevice=pgDeviceManager.getDeviceBydevCode(devCode);
             if(pgDevice==null) {
                 msg = "设备信息获取失败";
-                resultMap.put("result",null);
             }
             else{
                 pgDeviceDto = new PgDeviceDto(pgDevice);
                 msg = "设备信息获取成功";
-                resultMap.put("result",pgDeviceDto);
+                code="200";
             }
         }
         catch(Exception ex)
@@ -310,8 +346,9 @@
             ex.printStackTrace();
             msg="设备状态获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgDeviceDto);
         return resultMap;
     }
 
@@ -324,17 +361,17 @@
     public Map<String,Object> getDeviceByPartition(@FormParam("partition") String partition) throws Exception{
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<PgDeviceDto>();
 
         try{
             pgDeviceDtoList=pgDeviceManager.getPgDeviceDtoListByPartition(partition);
             if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0) {
                 msg = "设备信息获取失败";
-                resultMap.put("result",null);
             }
             else {
+                code="200";
                 msg = "设备信息获取成功";
-                resultMap.put("result",pgDeviceDtoList);
             }
         }
         catch(Exception e)
@@ -342,8 +379,9 @@
             e.printStackTrace();
             msg="设备信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgDeviceDtoList);
         return resultMap;
     }
 
@@ -353,17 +391,16 @@
     public Map<String,Object> getDeviceByOldDAssetCodeCode(@FormParam("assetCode") String assetCode) throws Exception{
         Map<String, Object> resultMap = new HashMap<>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
 
         try{
             pgDeviceDtoList=pgDeviceManager.getDeviceByOldDAssetCodeCode(assetCode);
-            if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0) {
-                msg = "设备信息获取失败";;
-                resultMap.put("result",null);
-            }
+            if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0)
+                msg = "设备信息获取失败";
             else {
                 msg = "设备信息获取成功";
-                resultMap.put("result",pgDeviceDtoList);
+                code="200";
             }
         }
         catch(Exception e)
@@ -372,8 +409,9 @@
             msg="设备信息获取失败";
             resultMap.put("result",null);
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgDeviceDtoList);
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java
index 421d249..f6f167d 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java
@@ -38,17 +38,21 @@
     public Map<String, Object> getDeviceTpeyList()throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgDeviceTypeDto> pgDeviceTypeDtoList=new ArrayList<PgDeviceTypeDto>();
         try {
             pgDeviceTypeDtoList = pgDeviceTypeManager.getAllDeviceType();
             if(pgDeviceTypeDtoList.size()==0)
                 msg="没有找到设备类型信息";
-            else
-                msg="设备类型信息获取成功";
+            else {
+                code="200";
+                msg = "设备类型信息获取成功";
+            }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备类型信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgDeviceTypeDtoList);
         return resultMap;
@@ -66,6 +70,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if (pgDeviceTypeManager.getDeviceTypeByDeType(devType)!=null) {
@@ -79,6 +84,7 @@
 
                 pgDeviceTypeManager.save(pgDeviceType);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
 
@@ -87,10 +93,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
index c276fb3..c789960 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
@@ -44,6 +44,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 
         try {
@@ -62,6 +63,7 @@
                 pgEquipment.setActive(1);
 
                 pgEquipmentManager.save(pgEquipment);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -70,9 +72,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -89,9 +91,10 @@
                                             @FormParam("ownerUnit") String ownerUnit,
                                             @FormParam("enterDate") String enterDate,
                                             @FormParam("curUser") String curUser) {
-        HashMap<String, Object> resultMap = new HashMap<String, Object>();
+        HashMap<String, Object> resultMap = new HashMap<>();
         String msg = "";
         String result = "";
+        String code="0";
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 
         try {
@@ -111,6 +114,7 @@
                 pgEquipment.setEnterDate(sdf.parse(enterDate));
 
                 pgEquipmentManager.save(pgEquipment);
+                code="200";
                 msg="编辑成功";
                 result="true";
             }
@@ -119,9 +123,9 @@
             result = "false";
             msg = "编辑失败";
         }
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -134,16 +138,19 @@
     public Map<String, Object> getEquipment(@FormParam("eqName") String eqName,
                                             @FormParam("eqCode") String eqCode,
                                             @FormParam("eqType") String eqType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        List<PgEquipmentDto> pgEquipmentDtoList=new ArrayList<PgEquipmentDto>();
+        String code="0";
+        List<PgEquipmentDto> pgEquipmentDtoList=new ArrayList<>();
 
         try{
             pgEquipmentDtoList=pgEquipmentManager.getEquipmentDtiList(eqName,eqCode,eqType);
             if(pgEquipmentDtoList==null||pgEquipmentDtoList.size()==0)
                 msg="不存在工器具记录";
-            else
-                msg="维获取成功";
+            else {
+                code = "200";
+                msg = "维获取成功";
+            }
         }
         catch(Exception e)
         {
@@ -166,6 +173,7 @@
         HashMap<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
         String result = "";
+        String code="";
 
         try {
             PgEquipment pgEquipment=pgEquipmentManager.get(Long.valueOf(id));
@@ -178,6 +186,7 @@
             {
                 pgEquipment.setActive(0);
                 pgEquipmentManager.save(pgEquipment);
+                code="200";
                 msg="删除成功";
                 result="true";
             }
@@ -186,6 +195,7 @@
             msg="设备信息获取失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -201,16 +211,19 @@
             throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=new ArrayList<PgDeviceTypeStatisticDto>();
 
         try {
             pgDeviceTypeStatisticDtoList=pgEquipmentManager.getDeviceStatisticByDevType(eqType);
 
+            code="200";
             msg = "获取成功";
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceTypeStatisticDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
index 05a9709..a90fd6c 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
@@ -4,9 +4,9 @@
 import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
 import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
 import com.casic.PgInterface.intelPlan.manager.PgPileAcuManager;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import com.casic.PgInterface.test.PlanData;
 import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.ModelAttribute;
 
 import javax.annotation.Resource;
 import javax.ws.rs.FormParam;
@@ -32,23 +32,25 @@
     public Map<String,Object> getPlanResult(@FormParam("planParamStr") String planParamStr){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
-        //List<PgPlanTask> pgPlanTaskList=pgPlanParams.getPgPlanTaskList();
         List<PgPlanTask> pgPlanTaskList=new PgPlanParams().getPgPlanParamsByString(planParamStr);
         List<PgPlanResultRe> pgPlanResultReList=new ArrayList<>();
 
-        try{
-                pgPlanResultReList=pgPileAcuManager.getPgPlanResultList(pgPlanTaskList);
-                if(pgPlanResultReList==null)
-                    msg="管线智能规划出错";
-                else
-                    msg="管线智能规划完成";
+        try {
+            pgPlanResultReList = pgPileAcuManager.getPgPlanResultList(pgPlanTaskList);
+            if (pgPlanResultReList == null)
+                msg = "管线智能规划出错";
+            else {
+                code="200";
+                msg = "管线智能规划完成";
+            }
         }
         catch(Exception ex){
             msg="智能规划出错";
             ex.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgPlanResultReList);
 
@@ -80,4 +82,30 @@
         return resultMap;
     }
 
+    @POST
+    @Path("getPlanTask")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getACUTask(@FormParam("pileAcuList") String pileAcuList){
+
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        String code="0";
+        List<PgAcuTask> pgAcuTaskList=new ArrayList<>();
+
+        try{
+            pgAcuTaskList=pgPileAcuManager.getACUTask(pileAcuList);
+            code="200";
+            msg="任务获取成功";
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            msg="任务获取失败";
+        }
+        resultMap.put("code",code);
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgAcuTaskList);
+
+        return resultMap;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
index ff85c61..66eec76 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
@@ -55,13 +55,13 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         try {
             PgInPgPerson pgInPgPerson = null;//pgInPgPersonManager.getPersonByUserName(userName);
             int iHostName = pgTagMacManager.getCount("select count(1) from PGTagMac where hostname = ?",assetCode);
-//            int iTagMac = pgTagMacManager.getCount("select count(1) from PGTagMac where tagmac = ?",assetCode.toUpperCase());
             if (0==iHostName)
             {
                 result = "false";
@@ -92,9 +92,8 @@
 
                 pgInPgStatusManager.save(pgInPgStatus);
 
-//                String syResult=pgInPgPersonManager.synchorizedInPgInfo(assetCode,userCode,userName,personType);
+                code="200";
                 result = "true";
-//                msg = "人员注册保存成功"+syResult;
                 msg = "人员注册保存成功";
             }
             else {
@@ -106,6 +105,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -120,6 +120,7 @@
     public Map<String, Object> getInPgPerson() throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<>();
         try {
@@ -127,11 +128,15 @@
             if (pgInPgInfoDtoList == null || pgInPgInfoDtoList.size() == 0)
                 msg = "没有找到入廊人员信息";
             else
+            {
+                code="200";
                 msg = "入廊人员信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "入廊人员信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
         return resultMap;
@@ -146,18 +151,22 @@
     public Map<String, Object> getInPgPersonInPg() throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
 
-        List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<PgInPgInfoDto>();
+        List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<>();
         try {
             pgInPgInfoDtoList = pgInPgPersonManager.getPgInPersonList(1);
             if (pgInPgInfoDtoList == null || pgInPgInfoDtoList.size() == 0)
                 msg = "没有找到入廊人员信息";
-            else
+            else {
+                code="200";
                 msg = "入廊人员信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "入廊人员信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
         return resultMap;
@@ -172,6 +181,7 @@
     public Map<String, Object> getInPgPersonByName(@FormParam("userName") String userName) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
 
         PgInPgPerson pgInPgPerson = null;
         PgInPgPersonDto pgInPgPersonDto=null;
@@ -184,12 +194,13 @@
                 pgInPgPersonDto=new PgInPgPersonDto(pgInPgPerson);
                 pgInPgPersonDtoList.add(pgInPgPersonDto);
                 msg = "人员信息获取成功";
+                code="200";
             }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "人员信息获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgPersonDtoList);
         return resultMap;
@@ -206,6 +217,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             PgInPgPerson pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName);
@@ -221,6 +233,7 @@
                     pgInPgPersonManager.save(pgInPgPerson);
                     result = "true";
                     msg = "编辑成功";
+                    code="200";
                 }
             }
         } catch (Exception e) {
@@ -228,9 +241,9 @@
             msg = "编辑失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -244,10 +257,12 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         int inPgNum=0;
         String msg = "";
+        String code="0";
 
         try{
             inPgNum=pgInPgStatusManager.getInPgNum();
 
+            code="200";
             msg="人员入廊次数获取成功";
         }
         catch(Exception e)
@@ -255,6 +270,7 @@
             e.printStackTrace();
             msg="人员入廊次数获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",inPgNum);
 
@@ -272,18 +288,22 @@
                                                    @FormParam("statisticType") String statisticType) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
 
         List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<PgInPgInfoDto>();
         try {
             pgInPgInfoDtoList = pgInPgPersonManager.getPgInPersonListByTime(startTime, endTime, statisticType);
             if(pgInPgInfoDtoList==null)
                 msg="入廊人员统计信息获取失败";
-            else
-                msg="入廊人员统计信息获取成功";
+            else {
+                code="200";
+                msg = "入廊人员统计信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "入廊人员统计信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
         return resultMap;
@@ -296,6 +316,7 @@
 
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
 
         try {
@@ -304,8 +325,10 @@
                 pgDeviceDtoList=pgDeviceManager.getPgCameraListByPosition("",apCodeStr);
                 if(pgDeviceDtoList==null)
                     msg="不存在关联摄像机";
-                else
-                    msg="关联摄像机获取成功";
+                else {
+                    code="200";
+                    msg = "关联摄像机获取成功";
+                }
             } else {
                 msg="请输入Ap编号";
             }
@@ -315,6 +338,7 @@
             msg="关联摄像机获取成功";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgDeviceDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java
index 507b3fe..b43f077 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java
@@ -34,6 +34,7 @@
 
         String result="";
         String msg="";
+        String code="";
         try{
             PgInPgStatus pgInPgStatus=new PgInPgStatus();
 
@@ -44,6 +45,7 @@
             pgInPgStatusManager.save(pgInPgStatus);
             msg="入廊时间提交成功";
             result="true";
+            code="200";
         }
         catch (Exception e){
             e.printStackTrace();
@@ -51,6 +53,7 @@
             result="false";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -66,6 +69,7 @@
 
         String result="";
         String msg="";
+        String code="0";
         try{
             PgInPgPerson pgInPgPerson=pgInPgPersonManager.getPgInPgPersonByAssetCode(assetCode);
 
@@ -79,6 +83,7 @@
             pgInPgStatusManager.save(pgInPgStatus);
 
             msg="出廊时间提交成功";
+            code="200";
             result="true";
         }
         catch (Exception e){
@@ -87,6 +92,7 @@
             result="false";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
index 9def330..9c0ba1f 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
@@ -33,17 +33,20 @@
                                             @FormParam("existNum") String existNum) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         String result="";
 
         try {
             pgIntelPlanManager.savePgIntelPlan(parName,lineName,maxNum,existNum);
             msg="规划数据保存成功";
+            code="200";
             result="true";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "规划数据保存失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
@@ -55,15 +58,18 @@
     public Map<String, Object> getIntelLineType() throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgIntelPlanTypeDto> pgIntelPlanTypeDtoList=new ArrayList<>();
         try {
             pgIntelPlanTypeDtoList=pgIntelPlanManager.getIntelPlanType();
+            code="200";
             msg="获取排线类型成功";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "获取排线类型失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgIntelPlanTypeDtoList);
         return resultMap;
@@ -76,6 +82,7 @@
                                             @FormParam("partitionStr") String partitionStr) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgIntelPlanDto> pgIntelPlanDtoList = new ArrayList<>();
 
@@ -83,8 +90,10 @@
             pgIntelPlanDtoList = pgIntelPlanManager.getPgIntelPlanListByPartion(lineName, partitionStr);
             if(pgIntelPlanDtoList==null||pgIntelPlanDtoList.size()==0)
                 msg="请输入正确的规划参数";
-            else
-                msg="规划数据获取成功";
+            else {
+                code="200";
+                msg = "规划数据获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "规划数据获取失败";
@@ -103,10 +112,12 @@
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
         String result="";
+        String code="0";
 
         try {
             boolean bl=pgIntelPlanManager.addLineUse(lineName,partitionStr,num);
             if(bl){
+                code="200";
                 msg="排线入廊成功";
                 result="true";
             }
@@ -119,6 +130,7 @@
             msg = "排线入廊失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
@@ -132,6 +144,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
         String result="";
+        String code="0";
 
         try {
             PgIntelPlan pgIntelPlan=pgIntelPlanManager.getPgIntelPlanByParNameAndLine(lineName,parName);
@@ -140,11 +153,13 @@
             pgIntelPlanManager.save(pgIntelPlan);
             msg="规划数据删除成功";
             result="true";
+            code="200";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "规划数据删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java b/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java
index 378af00..9c39523 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java
@@ -1,5 +1,6 @@
 package com.casic.PgInterface.rs;
 
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
 import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
 import com.casic.PgInterface.intelPlan.dto.PgLineHoleDTO;
 import com.casic.PgInterface.intelPlan.manager.PgLineHoleManager;
@@ -27,6 +28,9 @@
     @Resource
     private PgPileAcuManager pgPileAcuManager;
 
+    @Resource
+    private PgRoadManager pgRoadManager;
+
     @POST
     @Path("getPgLineAcuHole")
     @Produces(MediaType.APPLICATION_JSON)
@@ -34,23 +38,32 @@
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
         String result="";
+        String code="0";
         List<PgLineHoleDTO> pgLineHoleDTOList=new ArrayList<>();
 
         try {
             PgPileAcu pgPileAcu=pgPileAcuManager.getPgPileAcuByCode(acuCode);
             if(pgPileAcu==null){
                 msg="不存在分区";
-            }else{
-                pgLineHoleDTOList=pgLineHoleManager.getCurrentHoleByAcu(pgPileAcu.getId());
-                if(pgLineHoleDTOList!=null&&pgLineHoleDTOList.size()!=0)
-                    msg="获取成功";
-                else
-                    msg="未找到入廊数据";
+            }else {
+                pgLineHoleDTOList = pgLineHoleManager.getCurrentHoleByAcu(pgPileAcu.getId());
+                if (pgLineHoleDTOList != null && pgLineHoleDTOList.size() != 0)
+                {
+                    code="200";
+                    msg = "获取成功";
+                }
+                else {
+                    PgLineHoleDTO pgLineHoleDTO=new PgLineHoleDTO();
+                    pgLineHoleDTO.setRoad(pgRoadManager.get(pgPileAcu.getRoadId()).getRoadName());
+                    pgLineHoleDTOList.add(pgLineHoleDTO);
+                    msg = "未找到入廊数据";
+                }
             }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgLineHoleDTOList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgLogRs.java b/src/main/java/com/casic/PgInterface/rs/PgLogRs.java
index 39cff52..30db63b 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgLogRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgLogRs.java
@@ -45,6 +45,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         PgLog pgLog=new PgLog();
         try {
             PgUser pgUser = new PgUser();
@@ -60,14 +61,15 @@
             pgLogManager.save(pgLog);
             result = "true";
             msg = "保存成功";
-
+            code="200";
         } catch (Exception e) {
             result = "false";
             msg = "保存失败";
             e.printStackTrace();
         }
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -83,17 +85,21 @@
             throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgLogDto> pgLogDtoList = new ArrayList<PgLogDto>();
         try {
             pgLogDtoList = pgLogManager.getAllLogs(userName, startTime, endTime);
             if (pgLogDtoList == null || pgLogDtoList.size() == 0)
                 msg = "没有找到日志信息";
-            else
+            else {
+                code="200";
                 msg = "日志信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "日志信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgLogDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java
index 9fd0a5f..37b72f6 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java
@@ -36,19 +36,23 @@
         Map<String,Object> resultMap=new HashMap<>();
 
         String msg = "";
+        String code="0";
         List<PgMaintainType> pgMaintainTypeList=new ArrayList<>();
         try{
             pgMaintainTypeList=pgMaintainTypeManager.getMaintainType();
             if(pgMaintainTypeList!=null&&pgMaintainTypeList.size()!=0)
                 msg="不存在运维类别";
-            else
-                msg="运维类别获取成功";
+            else {
+                code="200";
+                msg = "运维类别获取成功";
+            }
         }
         catch(Exception ex)
         {
             ex.printStackTrace();
             msg="运维类别获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgMaintainTypeList);
 
@@ -65,10 +69,11 @@
         Map<String,Object> resultMap=new HashMap<>();
 
         String msg = "";
+        String code="0";
         List<PgMaintainTypeDto> pgMaintainTypeDtoList=new ArrayList<PgMaintainTypeDto>();
         try{
             pgMaintainTypeDtoList=pgMaintainTypeManager.getMaintainTypeModel(type);
-
+            code="200";
             msg="维护类型获取成功";
         }
         catch(Exception ex)
@@ -77,9 +82,9 @@
             msg="维护类型获取失败";
         }
 
-        resultMap.put("result",pgMaintainTypeDtoList);
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgMaintainTypeDtoList);
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java
index d735cc9..82ffca4 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java
@@ -33,12 +33,16 @@
                                                  @FormParam("endTime") String endTime){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
         List<PgMaintanceRecordHeadDto> pgMaintanceRecordHeadDtoList=new ArrayList<>();
         try{
             pgMaintanceRecordHeadDtoList=pgMaintanceRecordHeadManager.getPgMaintanceRecordHeadLsit(repairMan,startTime,endTime);
             if(pgMaintanceRecordHeadDtoList!=null&&pgMaintanceRecordHeadDtoList.size()!=0)
+            {
+                code="200";
                 msg="维护信息获取成功";
+            }
             else
                 msg="不存在维护信息";
         }
@@ -47,6 +51,7 @@
             msg="巡检信息获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgMaintanceRecordHeadDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java
index effc9df..9f46fc8 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java
@@ -32,12 +32,16 @@
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
         String result="";
+        String code="0";
 
         List<PgMaintanceRecordHeadStatic> pgMaintanceRecordHeadStaticList=new ArrayList<>();
         try{
             pgMaintanceRecordHeadStaticList=pgMaintanceRecordHeadManager.getPgMaintanceRecordHeadStaticLisByTime(startTime,endTime,staticType);
             if(pgMaintanceRecordHeadStaticList!=null&&pgMaintanceRecordHeadStaticList.size()!=0)
+            {
+                code="200";
                 msg="维护统计信息获取成功";
+            }
             else
                 msg="维护统计失败";
         }
@@ -46,7 +50,7 @@
             ex.printStackTrace();
             msg="统计失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgMaintanceRecordHeadStaticList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java b/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java
index 3a67bf3..6a5f4dc 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java
@@ -39,27 +39,31 @@
     @Path("getO2InfoByDevAndDate")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getO2InfoByDevAndDate(@FormParam("assetCode") String assetCode,
-                                                      @FormParam("startDate") String startDate,
-                                                      @FormParam("endDate") String endDate)throws Exception {
+                                                     @FormParam("startDate") String startDate,
+                                                     @FormParam("endDate") String endDate)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgHistoryDataDto> pgHistoryDataDtoList=new ArrayList<>();
 
         try {
             PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
                 msg="设备不存在";
-            else{
-                pgHistoryDataDtoList=pgO2Manager.getAllO2Data(pgDevice, startDate, endDate);
-                if(pgHistoryDataDtoList==null)
-                    msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+            else {
+                pgHistoryDataDtoList = pgO2Manager.getAllO2Data(pgDevice, startDate, endDate);
+                if (pgHistoryDataDtoList == null)
+                    msg = "没有满足要求的数据";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgHistoryDataDtoList);
         return resultMap;
@@ -75,23 +79,27 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         PgO2Dto pgO2Dto=new PgO2Dto(null);
 
         try {
             PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
                 msg="设备不存在";
-            else{
-                pgO2Dto=pgO2Manager.getNewestO2Data(pgDevice);
-                if(pgO2Dto==null)
-                    msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+            else {
+                pgO2Dto = pgO2Manager.getNewestO2Data(pgDevice);
+                if (pgO2Dto == null)
+                    msg = "没有满足要求的数据";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgO2Dto);
         return resultMap;
@@ -104,11 +112,12 @@
     @Path("addO2Data")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> addO2Data(@FormParam("devCode") String devCode,
-                                          @FormParam("upTime") String upTime,
-                                          @FormParam("o2") String o2)throws Exception {
+                                         @FormParam("upTime") String upTime,
+                                         @FormParam("o2") String o2)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
@@ -125,6 +134,7 @@
                 pgO2.setPgDeviceId(pgDevice);
 
                 pgO2Manager.save(pgO2);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -133,9 +143,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java b/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java
index 6217cde..70b3b41 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java
@@ -30,8 +30,6 @@
 public class PgOverViewRs {
 
     @Resource
-    private PgInPgPersonManager pgInPgPersonManager;
-    @Resource
     private PgInPgStatusManager pgInPgStatusManager;
     @Resource
     private PgAlarmManager pgAlarmManager;
@@ -46,18 +44,21 @@
     @Path("getPersonNumInPgByMonth")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<Object, String> getMonthInPgPersonNum() throws Exception {
-        Map<Object, String> resultMap = new HashMap<Object, String>();
+        Map<Object, String> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         int inNum = 0;
 
         try {
             inNum = pgInPgStatusManager.getMonthInPgPersonNum();
+            code="200";
             msg = "本月入廊人员次数获取成功";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "本月入廊人员次数获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", String.valueOf(inNum));
 
@@ -73,15 +74,18 @@
     public Map<Object, String> getWeekInPgPersonNum() throws Exception {
         Map<Object, String> resultMap = new HashMap<Object, String>();
         String msg = "";
+        String code="0";
         int inNum = 0;
         try {
             inNum = pgInPgStatusManager.getWeekInPgPersonNum();
+            code="200";
             msg = "本周入廊人员次数获取成功";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "本周入廊人员次数获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", String.valueOf(inNum));
 
@@ -97,19 +101,22 @@
     public Map<String, Object> getDayInPgStatistic() throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<>();
         try {
             pgInPgInfoDtoList = pgInPgStatusManager.getPgInPersonListByDay();
             if (pgInPgInfoDtoList == null)
                 msg = "信息获取失败";
-            else
+            else {
+                code="200";
                 msg = "信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "信息获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
         return resultMap;
@@ -124,18 +131,23 @@
     public Map<String, Object> getTodayInPgInfo() throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
 
         List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<PgInPgInfoDto>();
         try {
             pgInPgInfoDtoList = pgInPgStatusManager.getTodayInPgInfo();
             if(pgInPgInfoDtoList!=null||pgInPgInfoDtoList.size()!=0)
+            {
+                code="200";
                 msg = "信息获取成功";
+            }
             else
                 msg="当天没有入廊人员信息";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
 
@@ -149,18 +161,22 @@
     public Map<String, Object> getAlarmNum(@FormParam("isDevFault") String isDevFault) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         int num = 0;
 
         try {
             if(isDevFault!=null){
                 num = pgAlarmManager.getAlarmNum(isDevFault);
-                msg = "报警数量获取成功";}
+                msg = "报警数量获取成功";
+                code="200";
+            }
             else
                 msg="请输入统计参数";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警数量统计失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", num);
 
@@ -176,16 +192,18 @@
     public Map<Object, String> getMonthAlarmNum(@FormParam("isDevFault") String isDevFault) throws Exception {
         Map<Object, String> resultMap = new HashMap<Object, String>();
         String msg = "";
+        String code="0";
         int inNum = 0;
 
         try {
-                inNum = pgAlarmManager.getMonthAlarmNum(isDevFault);
-                msg = "报警次数获取成功";
+            inNum = pgAlarmManager.getMonthAlarmNum(isDevFault);
+            code="200";
+            msg = "报警次数获取成功";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警次数获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", String.valueOf(inNum));
 
@@ -201,15 +219,17 @@
     public Map<Object, String> getWeekAlarmNum(@FormParam("isDevFault") String isDevFault) throws Exception {
         Map<Object, String> resultMap = new HashMap<Object, String>();
         String msg = "";
+        String code="0";
         int inNum = 0;
         try {
             inNum = pgAlarmManager.getWeekAlarmNum(isDevFault);
+            code="200";
             msg = "报警次数获取成功";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警次数获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", String.valueOf(inNum));
 
@@ -225,14 +245,17 @@
     public Map<String, Object> getDayAlarmStatistic() throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgAlarmTjDto> pgAlarmTjDtoList = new ArrayList<PgAlarmTjDto>();
         try {
             pgAlarmTjDtoList = pgAlarmManager.getDayAlarmStatistic();
             if (pgAlarmTjDtoList == null)
                 msg = "信息获取失败";
-            else
+            else {
+                code="200";
                 msg = "信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "信息获取失败";
@@ -252,9 +275,11 @@
     public Map<String, Object> getAlarmList(@FormParam("isDevFault") String isDevFault) throws Exception{
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         List<PgAlarmDto> pgAlarmDtoList=new ArrayList<>();
         try{
             pgAlarmDtoList=pgAlarmManager.getAlarmList(isDevFault);
+            code="200";
             msg="信息获取成功";
         }
         catch(Exception e)
@@ -262,6 +287,7 @@
             e.printStackTrace();
             msg="信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAlarmDtoList);
 
@@ -278,17 +304,19 @@
     public Map<String,Object> getConstructionNum() throws Exception{
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgConstructionTypeNumStatisticDto> pgConstructionTypeNumDtoList=new ArrayList<PgConstructionTypeNumStatisticDto>();
         try{
             pgConstructionTypeNumDtoList=pgConstructionManager.getConstructionNum();
             msg="施工数量获取成功";
+            code="200";
         }
         catch(Exception e)
         {
             e.printStackTrace();
             msg="施工数量统计";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionTypeNumDtoList);
 
@@ -302,21 +330,25 @@
     @Path("getConstructionToday")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> getConstructionToday() throws Exception{
-        Map<String,Object > resultMap = new HashMap<String,Object>();
+        Map<String,Object > resultMap = new HashMap<>();
         String msg = "";
-        List<PgConstructionDto> pgConstructionDtoList=new ArrayList<PgConstructionDto>();
+        String code="0";
+        List<PgConstructionDto> pgConstructionDtoList=new ArrayList<>();
         try {
             pgConstructionDtoList = pgConstructionManager.getConstructionToday();
-            if (pgConstructionDtoList == null&&pgConstructionDtoList.size()==0)
+            if (pgConstructionDtoList == null && pgConstructionDtoList.size() == 0)
                 msg = "不存在施工信息";
-            else
+            else {
+                code="200";
                 msg = "施工信息获取成功";
+            }
         }
         catch(Exception e)
         {
             e.printStackTrace();
             msg="施工信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java b/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java
index d3c10d4..31ffcfc 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java
@@ -48,6 +48,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 
         try {
@@ -66,9 +67,9 @@
                 pgPartition.setMaterial(material);
                 pgPartition.setActive(1);
 
-                logger.info("成功保存");
                 pgPartitionManager.save(pgPartition);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
         } catch (Exception e) {
@@ -76,9 +77,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
         return resultMap;
     }
     /*
@@ -100,6 +101,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         PgPartition partition = new PgPartition();
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
@@ -122,6 +124,7 @@
 
                 pgPartitionManager.save(pgPartition);
                 result = "true";
+                code="200";
                 msg = "编辑成功";
             }
 
@@ -131,8 +134,10 @@
             e.printStackTrace();
         }
 
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
+
         return resultMap;
     }
 
@@ -147,7 +152,8 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
-        String result="false";
+        String result="";
+        String code="0";
 
         try {
             PgPartition pgPartition=pgPartitionManager.get(Long.valueOf(id));
@@ -161,12 +167,14 @@
                 pgPartitionManager.save(pgPartition);
                 msg="分区删除成功";
                 result="true";
+                code="200";
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="分区删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -181,14 +189,17 @@
     public Map<String, Object> getPartition() throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgPartitionDto> pgPartitionDtoList = new ArrayList<PgPartitionDto>();
         try {
             pgPartitionDtoList = pgPartitionManager.getPgPartitionDtoList();
+            code="200";
             msg = "获取成功";
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgPartitionDtoList);
         return resultMap;
@@ -203,14 +214,17 @@
     public Map<String, Object> getPartitionListByName(@FormParam("parName") String parName) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgPartitionDto> pgPartitionDtoList = new ArrayList<PgPartitionDto>();
         try {
             pgPartitionDtoList = pgPartitionManager.getPartitionByName(parName);
+            code="200";
             msg = "获取成功";
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgPartitionDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java b/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java
index 883adf9..cf81b72 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java
@@ -37,6 +37,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
         PgRoad pgRoad=pgRoadManager.getPgRoadByName(road);
         try {
             PgPileAcu pgPileAcu=new PgPileAcu();
@@ -49,6 +50,7 @@
             pgPileAcu.setActive(true);
 
             pgPileAcuManager.save(pgPileAcu);
+            code="200";
             result="true";
             msg="保存成功";
         } catch (Exception e) {
@@ -56,9 +58,10 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
+
         return resultMap;
     }
 
@@ -73,6 +76,7 @@
 
         String result="";
         String msg="";
+        String code="0";
         try{
             PgPileAcu pgPileAcu=pgPileAcuManager.get(id);
             if(pgPileAcu==null){
@@ -83,7 +87,7 @@
             {
                 pgPileAcu.setActive(false);
                 pgPileAcuManager.save(pgPileAcu);
-
+                code="200";
                 result="true";
                 msg="桩号删除成功";
             }
@@ -94,8 +98,9 @@
             ex.printStackTrace();
         }
 
-        resultMap.put("result",result);
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
+        resultMap.put("result",result);
 
         return resultMap;
     }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPileRs.java b/src/main/java/com/casic/PgInterface/rs/PgPileRs.java
index cf62954..c9999ac 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgPileRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgPileRs.java
@@ -33,6 +33,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             PgPile pgPile=new PgPile();
@@ -40,6 +41,7 @@
             pgPile.setActive(true);
 
             pgPileManager.save(pgPile);
+            code="200";
             result="true";
             msg="保存成功";
         } catch (Exception e) {
@@ -47,9 +49,10 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
+
         return resultMap;
     }
 
@@ -64,9 +67,10 @@
         Map<String,Object> resultMap=new HashMap<>();
         List<PgPileDTO> pgPileDTOList=new ArrayList<>();
         String msg="";
+        String code="0";
         try{
             pgPileDTOList=pgPileManager.getPgPileDTOList();
-
+            code="200";
             msg="获取成功";
         }
         catch(Exception ex){
@@ -74,8 +78,9 @@
             msg="获取成失败";
             ex.printStackTrace();
         }
-        resultMap.put("result",pgPileDTOList);
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
+        resultMap.put("result",pgPileDTOList);
 
         return resultMap;
     }
@@ -91,6 +96,7 @@
 
         String result="";
         String msg="";
+        String code="0";
         try{
             PgPile pgPile=pgPileManager.get(id);
             if(pgPile==null){
@@ -101,7 +107,7 @@
             {
                 pgPile.setActive(false);
                 pgPileManager.save(pgPile);
-
+                code="200";
                 result="true";
                 msg="桩号删除成功";
             }
@@ -111,9 +117,9 @@
             msg="桩号删除失败";
             ex.printStackTrace();
         }
-
-        resultMap.put("result",result);
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
+        resultMap.put("result",result);
 
         return resultMap;
     }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
index 6ee63ff..63b5597 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
@@ -53,10 +53,12 @@
         try {
                resultMap = pgPipeLineManager.addPipeLine(lineCode,lineType,secRow,secColumn,pileAcuList);
                resultMap.put("msg","提交成功");
+               resultMap.put("code","200");
                resultMap.put("result","true");
 
         } catch (Exception e) {
             e.printStackTrace();
+            resultMap.put("code","0");
             resultMap.put("result","false");
             resultMap.put("msg","提交失败");
             return  resultMap;
@@ -74,14 +76,17 @@
     public Map<String, Object> getPipeLineByLineType(@FormParam("lineType") String lineType) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgPipeLineDto> pgPipeLineDtoList=new ArrayList<PgPipeLineDto>();
         try {
             pgPipeLineDtoList = pgPipeLineManager.getPipeLineByLineType(lineType);
+            code="200";
             msg = "获取成功";
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgPipeLineDtoList);
         return resultMap;
@@ -96,6 +101,7 @@
     public Map<String, Object> getPipeLineByName(@FormParam("lineCode") String lineCode) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         PgPipeLineDto pgPipeLineDto=null;
         try {
             PgPipeLine pgPipeLine = pgPipeLineManager.getPipeLineBylineName(lineCode);
@@ -103,12 +109,14 @@
                 msg="不存在："+lineCode;
             else {
                 pgPipeLineDto = new PgPipeLineDto(pgPipeLine);
+                code="200";
                 msg = "获取成功";
             }
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgPipeLineDto);
         return resultMap;
@@ -123,15 +131,18 @@
     public Map<String,Object> getPipeLengthStatic()throws Exception{
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         List<PgPipeLineLengthStatic> pgPipeLineLengthStaticList=new ArrayList<PgPipeLineLengthStatic>();
         try {
             pgPipeLineLengthStaticList = pgPipeLineManager.getPipeLengthByName();
+            code="200";
             msg="管线长度获取成功";
         }catch(Exception e)
         {
             e.printStackTrace();
             msg="管线长度统计失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgPipeLineLengthStaticList);
 
@@ -147,14 +158,17 @@
     public Map<String, Object> getPipeLineType() throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgPipeLineTypeDto> pgPipeLineTypeDtoList=new ArrayList<PgPipeLineTypeDto>();
         try {
             pgPipeLineTypeDtoList = pgPipeLineManager.getPipeType();
+            code="200";
             msg = "获取成功";
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgPipeLineTypeDtoList);
         return resultMap;
@@ -170,20 +184,24 @@
         Map<String,Object> resultMap=new HashMap<String, Object>();
 
         String msg="";
+        String code="0";
         List<PgPipeLineTypeNumDto> pgPipeLineTypeNumDtoList=new ArrayList<PgPipeLineTypeNumDto>();
 
-        try{
-            pgPipeLineTypeNumDtoList=pgPipeLineManager.getPipeTypeNum();
+        try {
+            pgPipeLineTypeNumDtoList = pgPipeLineManager.getPipeTypeNum();
 
-            if(pgPipeLineTypeNumDtoList==null)
-                msg="不存在管线类型占比";
-            else
-                msg="管线占比获取成功";
+            if (pgPipeLineTypeNumDtoList == null)
+                msg = "不存在管线类型占比";
+            else {
+                code="200";
+                msg = "管线占比获取成功";
+            }
         }
         catch (Exception e){
             msg="管线占比数量获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgPipeLineTypeNumDtoList);
 

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 25ded8a..283d7ab 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,20 +7,56 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" 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/construction/manager/PgCsDocumentManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/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/manager/PgAlarmManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/~$说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/~$说明20191207.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.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$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/接口说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明20191207.docx" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
@@ -51,7 +87,7 @@
         <counts>
           <entry key="class" value="4" />
           <entry key="iml" value="2" />
-          <entry key="java" value="707" />
+          <entry key="java" value="820" />
           <entry key="properties" value="14" />
           <entry key="xml" value="7" />
         </counts>
@@ -60,7 +96,7 @@
         <counts>
           <entry key="CLASS" value="4" />
           <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="707" />
+          <entry key="JAVA" value="820" />
           <entry key="Properties" value="14" />
           <entry key="XML" value="7" />
         </counts>
@@ -68,32 +104,32 @@
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
           <entry key="dummy" value="38" />
-          <entry key="java" value="30161" />
+          <entry key="java" value="40859" />
           <entry key="properties" value="100" />
-          <entry key="txt" value="176" />
+          <entry key="txt" value="186" />
           <entry key="xml" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="30161" />
-          <entry key="PLAIN_TEXT" value="214" />
+          <entry key="JAVA" value="40859" />
+          <entry key="PLAIN_TEXT" value="224" />
           <entry key="Properties" value="100" />
           <entry key="XML" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="48" />
+          <entry key="project.closed" value="51" />
           <entry key="project.open.time.1" value="5" />
           <entry key="project.open.time.12" value="2" />
           <entry key="project.open.time.13" value="1" />
           <entry key="project.open.time.15" value="1" />
           <entry key="project.open.time.16" value="1" />
           <entry key="project.open.time.17" value="1" />
-          <entry key="project.open.time.2" value="1" />
+          <entry key="project.open.time.2" value="2" />
           <entry key="project.open.time.20" value="1" />
-          <entry key="project.open.time.23" value="1" />
+          <entry key="project.open.time.23" value="2" />
           <entry key="project.open.time.24" value="2" />
           <entry key="project.open.time.251" value="1" />
           <entry key="project.open.time.27" value="2" />
@@ -106,8 +142,8 @@
           <entry key="project.open.time.36" value="1" />
           <entry key="project.open.time.37" value="1" />
           <entry key="project.open.time.39" value="2" />
-          <entry key="project.open.time.4" value="2" />
-          <entry key="project.open.time.40" value="1" />
+          <entry key="project.open.time.4" value="3" />
+          <entry key="project.open.time.40" value="2" />
           <entry key="project.open.time.41" value="2" />
           <entry key="project.open.time.42" value="2" />
           <entry key="project.open.time.43" value="2" />
@@ -122,23 +158,25 @@
           <entry key="project.open.time.6" value="3" />
           <entry key="project.open.time.63" value="2" />
           <entry key="project.open.time.64" value="1" />
+          <entry key="project.open.time.66" value="1" />
           <entry key="project.open.time.71" value="2" />
+          <entry key="project.open.time.74" value="1" />
           <entry key="project.open.time.76" value="1" />
           <entry key="project.open.time.8" value="2" />
           <entry key="project.open.time.9" value="1" />
           <entry key="project.open.time.97" value="1" />
-          <entry key="project.opened" value="78" />
+          <entry key="project.opened" value="84" />
         </counts>
       </usages-collector>
     </session>
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+            <state relative-caret-position="396">
+              <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
               <folding>
                 <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
                 <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -147,73 +185,6 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <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="99">
-              <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-              <folding>
-                <element signature="imports" expanded="true" />
-                <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-1170">
-              <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state>
-              <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
-              <folding>
-                <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-                <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="true">
-        <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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-              <folding>
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-                <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>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <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="352">
-              <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -225,18 +196,9 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>inCriteria</find>
-      <find>getPgPlanResulList</find>
-      <find>getPileAcuListByPileAcuStr</find>
-      <find>distinct</find>
-      <find>order</find>
-      <find>canPlanLine</find>
-      <find>isExistLine</find>
-      <find>getPlanResult</find>
       <find>pgPipeLine</find>
       <find>getPipeLineBylineName</find>
       <find>StringU</find>
-      <find>getAllAlarm</find>
       <find>getAlarmList</find>
       <find>getPgInPersonListByDay</find>
       <find>getDayInPgStatistic</find>
@@ -254,7 +216,16 @@
       <find>getPgContructionByNameOrType</find>
       <find>&quot;&quot;,&quot;&quot;,</find>
       <find>getPgContructionDtoByNameOrType</find>
+      <find>addConstruction</find>
+      <find>getPgLineAcuHole</find>
+      <find>getPlanResult</find>
       <find>getConstruction</find>
+      <find>addPipeLine</find>
+      <find>未找到入廊数据</find>
+      <find>getCurrentHoleByAcu</find>
+      <find>getAllAlarm</find>
+      <find>getPgDeviceDtoListByPartition</find>
+      <find>getPgDeviceByDevType</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -263,57 +234,57 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlan.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileHoleManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/planData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/PlanData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
       </list>
     </option>
   </component>
@@ -359,7 +330,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -421,53 +391,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="dto" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="manager" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -479,29 +402,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="rs" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -516,6 +416,7 @@
         </subPane>
       </pane>
       <pane id="Scope" />
+      <pane id="PackagesPane" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -710,7 +611,13 @@
       <workItem from="1574902733573" duration="1829000" />
       <workItem from="1574998240004" duration="7016000" />
       <workItem from="1575247959683" duration="6997000" />
-      <workItem from="1575704345590" duration="40473000" />
+      <workItem from="1575704345590" duration="69381000" />
+      <workItem from="1575869479666" duration="721000" />
+      <workItem from="1575947104878" duration="6101000" />
+      <workItem from="1576128264436" duration="3347000" />
+      <workItem from="1576208571543" duration="22000" />
+      <workItem from="1576227513917" duration="862000" />
+      <workItem from="1576293721220" duration="18246000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -817,11 +724,18 @@
       <option name="project" value="LOCAL" />
       <updated>1575775489149</updated>
     </task>
-    <option name="localTasksCounter" value="16" />
+    <task id="LOCAL-00016" summary="整改施工信息">
+      <created>1575791780774</created>
+      <option name="number" value="00016" />
+      <option name="presentableId" value="LOCAL-00016" />
+      <option name="project" value="LOCAL" />
+      <updated>1575791780774</updated>
+    </task>
+    <option name="localTasksCounter" value="17" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="452131000" />
+    <option name="totallyTimeSpent" value="510338000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -834,9 +748,8 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
-    <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.24205749" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2647504" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -847,7 +760,7 @@
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.3295082" />
       <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.4819672" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.65737706" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.3295082" />
@@ -939,7 +852,8 @@
     <MESSAGE value="重新设计智能规划部分" />
     <MESSAGE value="完成智能规划对接" />
     <MESSAGE value="修改报警统计" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改报警统计" />
+    <MESSAGE value="整改施工信息" />
+    <option name="LAST_COMMIT_MESSAGE" value="整改施工信息" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -951,16 +865,10 @@
           <option name="timeStamp" value="3" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java</url>
-          <line>69</line>
+          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java</url>
+          <line>40</line>
           <properties />
-          <option name="timeStamp" value="21" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java</url>
-          <line>96</line>
-          <properties />
-          <option name="timeStamp" value="38" />
+          <option name="timeStamp" value="122" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
@@ -970,394 +878,452 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <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="2068">
-          <caret line="154" column="35" selection-start-line="154" selection-start-column="35" selection-end-line="154" selection-end-column="35" />
-        </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="3300">
-          <caret line="297" column="22" selection-start-line="297" selection-start-column="22" selection-end-line="297" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/StringUtils.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
-          <caret line="13" column="48" lean-forward="true" selection-start-line="13" selection-start-column="48" selection-end-line="13" selection-end-column="48" />
+          <caret line="11" column="5" selection-start-line="11" selection-start-column="5" selection-end-line="11" selection-end-column="5" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="78" lean-forward="true" selection-start-line="78" selection-end-line="78" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="616">
-          <caret line="41" column="1" selection-start-line="41" selection-start-column="1" selection-end-line="41" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="110">
-          <caret line="12" column="23" selection-start-line="12" selection-start-column="23" selection-end-line="12" selection-end-column="23" />
+        <state relative-caret-position="516">
+          <caret line="114" column="12" selection-start-line="114" selection-start-column="12" selection-end-line="114" selection-end-column="12" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="164">
-          <caret line="56" lean-forward="true" selection-start-line="56" selection-end-line="56" />
+        <state relative-caret-position="418">
+          <caret line="33" column="44" selection-start-line="33" selection-start-column="44" selection-end-line="33" selection-end-column="44" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="258">
-          <caret line="27" column="12" lean-forward="true" selection-start-line="27" selection-start-column="12" selection-end-line="27" selection-end-column="12" />
+        <state relative-caret-position="132">
+          <caret line="11" column="20" lean-forward="true" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="20" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.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="-12">
-          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        <state relative-caret-position="516">
+          <caret line="142" column="54" selection-start-line="142" selection-start-column="54" selection-end-line="142" selection-end-column="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="858">
-          <caret line="55" column="27" lean-forward="true" selection-start-line="55" selection-start-column="27" selection-end-line="55" selection-end-column="27" />
+        <state relative-caret-position="66">
+          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="58">
+          <caret line="18" column="28" selection-start-line="18" selection-start-column="19" selection-end-line="18" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="305">
+          <caret line="24" column="31" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="714">
+          <caret line="58" column="5" lean-forward="true" selection-start-line="58" selection-start-column="5" selection-end-line="58" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="924">
+          <caret line="134" column="92" selection-start-line="134" selection-start-column="92" selection-end-line="134" selection-end-column="92" />
+          <folding>
+            <element signature="method#linkDevice#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkPartitionCamera#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkReservePlan#0;class#PgAlarmLinkRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1066">
+          <caret line="90" lean-forward="true" selection-start-line="90" selection-end-line="90" />
+          <folding>
+            <element signature="method#getTjResultByAlarmType#0;class#PgAlarmTjRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="946">
+          <caret line="148" column="11" lean-forward="true" selection-start-line="148" selection-start-column="11" selection-end-line="148" selection-end-column="11" />
+          <folding>
+            <element signature="method#getAlarmTypeList#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#addAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#editAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#deleteAlarmType#0;class#PgAlarmTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="208">
+          <caret line="46" column="23" lean-forward="true" selection-start-line="46" selection-start-column="23" selection-end-line="46" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="113" column="9" lean-forward="true" selection-start-line="113" selection-start-column="9" selection-end-line="113" selection-end-column="9" />
+          <folding>
+            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
+            <element signature="method#getNewestCh4InfoByDev#0;class#PgCh4Rs#0" />
+            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="145" column="6" lean-forward="true" selection-start-line="145" selection-start-column="6" selection-end-line="145" selection-end-column="6" />
+          <folding>
+            <element signature="method#addAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#editAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#deleteAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#getAuthorityList#0;class#PgAuthorityRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="58" column="1" lean-forward="true" selection-start-line="58" selection-start-column="1" selection-end-line="58" selection-end-column="1" />
+          <folding>
+            <element signature="method#getPgAssetPlanList#0;class#PgAssetPlanRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="370">
+          <caret line="371" column="66" selection-start-line="371" selection-start-column="66" selection-end-line="371" selection-end-column="66" />
+          <folding>
+            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#searchConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionDev#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="139" column="13" lean-forward="true" selection-start-line="139" selection-start-column="13" selection-end-line="139" selection-end-column="13" />
+          <folding>
+            <element signature="method#getCoInfoByDevAndDate#0;class#PgCoRs#0" />
+            <element signature="method#getNewestCoInfoByDev#0;class#PgCoRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="540">
+          <caret line="223" column="5" lean-forward="true" selection-start-line="223" selection-start-column="5" selection-end-line="223" selection-end-column="5" />
+          <folding>
+            <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="682">
+          <caret line="100" lean-forward="true" selection-start-line="100" selection-end-line="100" />
+          <folding>
+            <element signature="method#getDeviceTpeyList#0;class#PgDeviceTypeRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="377">
+          <caret line="225" column="35" selection-start-line="225" selection-start-column="35" selection-end-line="225" selection-end-column="35" />
+          <folding>
+            <element signature="method#addEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#addEquipment#1;class#PgEquipmentRs#0" />
+            <element signature="method#getEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#deleteEquipment#0;class#PgEquipmentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="406">
+          <caret line="109" lean-forward="true" selection-start-line="109" selection-end-line="109" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="154">
+          <caret line="28" column="19" selection-start-line="28" selection-start-column="19" selection-end-line="28" selection-end-column="19" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="748">
-          <caret line="49" column="5" lean-forward="true" selection-start-line="49" selection-start-column="5" selection-end-line="49" selection-end-column="5" />
+        <state relative-caret-position="296">
+          <caret line="161" column="35" selection-start-line="161" selection-start-column="35" selection-end-line="161" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="384">
+          <caret line="99" column="5" lean-forward="true" selection-start-line="99" selection-start-column="5" selection-end-line="99" selection-end-column="5" />
+        </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="362">
+          <caret line="340" column="35" selection-start-line="340" selection-start-column="35" selection-end-line="340" selection-end-column="35" />
+          <folding>
+            <element signature="method#addInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPersonInPg#0;class#PgInPgPersonRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-606">
+          <caret line="76" column="20" lean-forward="true" selection-start-line="76" selection-start-column="20" selection-end-line="76" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="65" column="35" selection-start-line="65" selection-start-column="35" selection-end-line="65" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="101" column="35" selection-start-line="101" selection-start-column="35" selection-end-line="101" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="84" column="35" selection-start-line="84" selection-start-column="35" selection-end-line="84" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="59" lean-forward="true" selection-start-line="59" selection-end-line="59" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="60" column="1" lean-forward="true" selection-start-line="60" selection-start-column="1" selection-end-line="60" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="145" column="35" selection-start-line="145" selection-start-column="35" selection-end-line="145" selection-end-column="35" />
+        </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="274">
+          <caret line="350" column="35" selection-start-line="350" selection-start-column="35" selection-end-line="350" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="121" column="39" selection-start-line="121" selection-start-column="39" selection-end-line="121" selection-end-column="39" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="28" column="8" lean-forward="true" selection-start-line="28" selection-start-column="8" selection-end-line="28" selection-end-column="8" />
+        <state relative-caret-position="340">
+          <caret line="103" selection-start-line="103" selection-end-line="103" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="226" column="35" selection-start-line="226" selection-start-column="35" selection-end-line="226" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="203" column="35" selection-start-line="203" selection-start-column="35" selection-end-line="203" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="241" column="35" selection-start-line="241" selection-start-column="35" selection-end-line="241" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="225" column="1" lean-forward="true" selection-start-line="225" selection-start-column="1" selection-end-line="225" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="176" column="5" lean-forward="true" selection-start-line="176" selection-start-column="5" selection-end-line="176" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="178" column="35" lean-forward="true" selection-start-line="178" selection-start-column="35" selection-end-line="178" selection-end-column="35" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="516">
-          <caret line="94" column="53" selection-start-line="94" selection-start-column="53" selection-end-line="94" selection-end-column="53" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="814">
-          <caret line="52" column="9" lean-forward="true" selection-start-line="52" selection-start-column="9" selection-end-line="52" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="182">
-          <caret line="58" column="12" lean-forward="true" selection-start-line="58" selection-start-column="12" selection-end-line="58" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="34" lean-forward="true" selection-start-line="34" selection-end-line="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="32" lean-forward="true" selection-start-line="32" selection-end-line="32" />
-          <folding>
-            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
-            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="185">
-          <caret line="63" column="13" selection-start-line="63" selection-start-column="13" selection-end-line="63" selection-end-column="13" />
-          <folding>
-            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
-            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
-            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="e#6319#6324#0" />
-            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
-          </folding>
+          <caret line="240" lean-forward="true" selection-start-line="240" selection-end-line="240" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
-          <caret line="58" column="28" lean-forward="true" selection-start-line="58" selection-start-column="28" selection-end-line="58" selection-end-column="28" />
-          <folding>
-            <element signature="method#addTempHumData#0;class#PgTempHumRs#0" />
-          </folding>
+        <state relative-caret-position="340">
+          <caret line="148" column="34" selection-start-line="148" selection-start-column="34" selection-end-line="148" selection-end-column="34" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
+        <state relative-caret-position="458">
+          <caret line="99" column="35" selection-start-line="99" selection-start-column="35" selection-end-line="99" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+        <state relative-caret-position="384">
+          <caret line="145" column="32" lean-forward="true" selection-start-line="145" selection-start-column="32" selection-end-line="145" selection-end-column="32" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="414">
-          <caret line="22" column="46" lean-forward="true" selection-start-line="22" selection-start-column="46" selection-end-line="22" selection-end-column="46" />
-        </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="396">
-          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" column="83" selection-start-line="11" selection-start-column="83" selection-end-line="11" selection-end-column="83" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="26">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
-          <folding>
-            <element signature="method#getPgInPgStatusByPerson#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNumByName#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNum#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPersonListByDay#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPgStatusByPgInPgPerson#0;class#PgInPgStatusManager#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="44">
-          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-12">
-          <caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="87" lean-forward="true" selection-start-line="87" selection-end-line="87" />
-          <folding>
-            <element signature="method#getConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#addConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#deleteConstructionType#0;class#PgConstructionTypeRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
-          <folding>
-            <element signature="method#getConstructionTypeByType#0;class#PgConstructionTypeManager#0" />
-            <element signature="method#getAllConstructionTypeDto#0;class#PgConstructionTypeManager#0" />
-          </folding>
-        </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="145">
-          <caret line="258" column="9" lean-forward="true" selection-start-line="258" selection-start-column="9" selection-end-line="258" selection-end-column="9" />
-          <folding>
-            <element signature="method#getMonthInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayInPgStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgOverViewRs#0" />
-            <element signature="method#getAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getMonthAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayAlarmStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgOverViewRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="103">
-          <caret line="105" column="50" lean-forward="true" selection-start-line="105" selection-start-column="50" selection-end-line="105" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateBasicDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="99">
-          <caret line="125" selection-start-line="125" selection-end-line="125" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="190">
-          <caret line="24" column="35" lean-forward="true" selection-start-line="24" selection-start-column="35" selection-end-line="24" selection-end-column="35" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="436">
-          <caret line="24" lean-forward="true" selection-start-line="24" selection-end-line="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" lean-forward="true" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="300">
-          <caret line="34" column="31" lean-forward="true" selection-start-line="34" selection-start-column="31" selection-end-line="34" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="42" column="13" lean-forward="true" selection-start-line="42" selection-start-column="13" selection-end-line="42" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="120" column="72" lean-forward="true" selection-start-line="120" selection-start-column="72" selection-end-line="120" selection-end-column="72" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="293">
-          <caret line="58" column="73" lean-forward="true" selection-start-line="58" selection-start-column="73" selection-end-line="58" selection-end-column="73" />
-          <folding>
-            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
-            <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
-          </folding>
-        </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="307">
-          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
+        <state relative-caret-position="758">
+          <caret line="130" column="5" lean-forward="true" selection-start-line="130" selection-start-column="5" selection-end-line="130" selection-end-column="5" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1170">
-          <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
+        <state relative-caret-position="494">
+          <caret line="86" column="62" lean-forward="true" selection-start-line="86" selection-start-column="62" selection-end-line="86" selection-end-column="62" />
           <folding>
-            <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-            <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+            <element signature="method#getAllDevice#0;class#PgDeviceManager#0" />
+            <element signature="method#getAllDev#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="195" column="28" lean-forward="true" selection-start-line="195" selection-start-column="28" selection-end-line="195" selection-end-column="28" />
+        <state relative-caret-position="166">
+          <caret line="174" column="13" lean-forward="true" selection-start-line="174" selection-start-column="13" selection-end-line="174" selection-end-column="13" />
           <folding>
-            <element signature="method#getAlarmByTypeAndTime#0;class#PgAlarmManager#0" />
-            <element signature="method#getAlarmNum#0;class#PgAlarmManager#0" />
             <element signature="method#getDayAlarmStatistic#0;class#PgAlarmManager#0" />
+            <element signature="method#getAlarmList#0;class#PgAlarmManager#0" />
             <element signature="method#createDTO#0;class#PgAlarmManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="364">
+          <caret line="46" column="56" lean-forward="true" selection-start-line="46" selection-start-column="56" selection-end-line="46" selection-end-column="56" />
+          <folding>
+            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
+            <element signature="method#getPgDev#0;class#PgDeviceRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
+            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+        <state relative-caret-position="396">
+          <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
           <folding>
             <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
             <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -1365,52 +1331,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="239">
-          <caret line="21" column="33" lean-forward="true" selection-start-line="21" selection-start-column="33" selection-end-line="21" selection-end-column="33" />
-        </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="352">
-          <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-        </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="99">
-          <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-          </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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-          <folding>
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-            <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>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
index c436c93..e913155 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
@@ -132,7 +132,10 @@
             this.setAlarmType("");
         else
             this.setAlarmType(pgAlarm.getAlarmTypeId().getAlarmType());
-        this.setAlarmValue(pgAlarm.getAlarmValue());
+        if(pgAlarm.getAlarmValue()==null)
+            this.setAlarmValue("");
+        else
+            this.setAlarmValue(pgAlarm.getAlarmValue());
         if (pgAlarm.getAlarmDate() != null)
             this.setAlarmDate(sdf.format(pgAlarm.getAlarmDate()));
         else
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
index a43965c..565cb41 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -159,11 +159,21 @@
     }
 
     //获取历史报警消息列表
-    public List<PgAlarmDto> getAllAlarm(String alarmType,String startDay,String endDay,String isNew,int page,int rows) {
-        try {
+    public  Map<String, Object> getAllAlarm(String alarmType,String partition,String startDay,String endDay,String isNew,int page,int rows) {
 
+        Map<String, Object> resultMap = new HashMap<>();
+        String msg="";
+
+        try {
             Criteria criteria = createCriteria(PgAlarm.class);
 
+            if (StringUtils.isNotBlank(partition)) {
+                DetachedCriteria inCriteria = DetachedCriteria.forClass(PgDevice.class);
+                inCriteria.add(Restrictions.eq("partition", partition));
+                inCriteria.setProjection(Property.forName("id"));
+                criteria.add(Property.forName("alarmDevId").in(inCriteria));
+            }
+
             if (StringUtils.isNotBlank(alarmType)&&!alarmType.contains("全部")&&pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
                 criteria.add(Restrictions.eq("alarmTypeId", pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)));
 
@@ -190,8 +200,16 @@
             for (PgAlarm pgAlarm : pgAlarmList) {
                 pgAlarmDtoList.add(new PgAlarmDto(pgAlarm));
             }
-
-            return pgAlarmDtoList;
+            if(pgAlarmDtoList==null||pgAlarmDtoList.size()==0) {
+                resultMap.put("msg", "没有报警信息");
+                resultMap.put("code","0");
+            }else {
+                resultMap.put("code","200");
+                resultMap.put("msg", "报警信息获取成功");
+            }
+            resultMap.put("count",pg.getTotalCount());
+            resultMap.put("result",pgAlarmDtoList);
+            return resultMap;
         }
         catch(Exception ex){
             ex.printStackTrace();
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index 7547560..654f49e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -24,11 +24,11 @@
 
         Criteria criteria = createCriteria(PgDevice.class);
 
-        if(road!=null)
+        if(StringUtils.isNotBlank(road))
             criteria.add(Restrictions.eq("road",road));
-        if(partition!=null)
+        if(StringUtils.isNotBlank(partition))
             criteria.add(Restrictions.eq("partition",partition));
-        if(devType!=null)
+        if(StringUtils.isNotBlank(devType))
             criteria.add(Restrictions.eq("devType",devType));
 
         criteria.add(Restrictions.eq("active", 1));
@@ -43,6 +43,29 @@
         return pgDeviceDtoList;
     }
 
+    public List<PgDeviceDto> getAllDev(String road,String partition,String devType) {
+
+        Criteria criteria = createCriteria(PgDevice.class);
+
+        if(StringUtils.isNotBlank(road))
+            criteria.add(Restrictions.eq("road",road));
+        if(StringUtils.isNotBlank(partition))
+            criteria.add(Restrictions.eq("partition",partition));
+        if(StringUtils.isNotBlank(devType))
+            criteria.add(Restrictions.like("devType","%"+devType+"%"));
+
+        criteria.add(Restrictions.eq("active", 1));
+        criteria.addOrder(Order.desc("id"));
+        List<PgDevice> pgDeviceList = criteria.list();
+
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
+        for (PgDevice pgDevice : pgDeviceList) {
+            pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
+        }
+
+        return pgDeviceDtoList;
+    }
+
     //根据名字获取当前设备
     public PgDevice getDeviceByAssetCode(String assetCode) {
         Criteria criteria=createCriteria(PgDevice.class);
@@ -56,9 +79,9 @@
     }
 
     //根据类型获取设备列表
-    public List<PgDeviceDto> getDeviceByDevTypee(String devType) {
+    public List<PgDeviceDto> getDeviceByDevType(String devType) {
         Criteria criteria=createCriteria(PgDevice.class);
-        criteria.add(Restrictions.eq("devType",devType));
+        criteria.add(Restrictions.like("devType","%"+devType+"%"));
 
         List<PgDevice> pgDeviceList=criteria.list();
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
@@ -106,7 +129,7 @@
         criteria.add(Restrictions.eq("partition",partition));
 
         List<PgDevice> pgDeviceList=criteria.list();
-        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<PgDeviceDto>();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
 
         for (PgDevice pgDevice : pgDeviceList) {
             pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
index 3a3bccd..595730e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
@@ -1,10 +1,13 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.devTable.domain.PgAlarmType;
 import com.casic.PgInterface.devTable.domain.PgPartition;
 import com.casic.PgInterface.devTable.domain.PgRoad;
 import com.casic.PgInterface.devTable.domain.PipeGallery;
 import com.casic.PgInterface.devTable.dto.PgPartitionDto;
+import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
@@ -12,7 +15,9 @@
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Created by yxw on 2017/11/4.
@@ -21,7 +26,8 @@
 public class PgPartitionManager extends HibernateEntityDao<PgPartition> {
 
     @Resource
-    PgRoadManager pgRoadManager;
+    private PgRoadManager pgRoadManager;
+
 
     public PgPartition getPartitionByParName(String parName) {
         Criteria criteria = getSession().createCriteria(PgPartition.class);
@@ -99,4 +105,5 @@
         return pgPartitionDtoList;
     }
 
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
index f216360..a6928f1 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
@@ -5,6 +5,7 @@
 public class PgPlanResultRe {
 
     private String taskKey;
+    private List<String> pileAcuList;
     private List<PgPlanResult> pgPlanResultList;
 
     public String getTaskKey() {
@@ -15,6 +16,14 @@
         this.taskKey = taskKey;
     }
 
+    public List<String> getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(List<String> pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+
     public List<PgPlanResult> getPgPlanResultList() {
         return pgPlanResultList;
     }
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
index 71ea765..47eea07 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
@@ -54,9 +54,7 @@
 
         List<PgLineHole> pgLineHoleList=criteria.list();
         List<PgLineHoleDTO> pgLineHoleDTOList=new ArrayList<>();
-        if(pgLineHoleList==null||pgLineHoleList.size()==0)
-            return null;
-        else
+        if(pgLineHoleList!=null&&pgLineHoleList.size()!=0)
             pgLineHoleDTOList=PgLineHoleDTO.ConvertToDTOList(pgLineHoleList,pgPileAcuManager,pgRoadManager);
         return pgLineHoleDTOList;
     }
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
index 0fd9e1f..841a386 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
@@ -1,12 +1,15 @@
 package com.casic.PgInterface.intelPlan.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.devTable.domain.PgPartition;
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
 import com.casic.PgInterface.intelPlan.domain.PgLineHole;
 import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
 import com.casic.PgInterface.intelPlan.domain.PgSection;
 import com.casic.PgInterface.intelPlan.dto.PgPlanResult;
 import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
 import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -22,6 +25,9 @@
     @Resource
     private PgLineHoleManager pgLineHoleManager;
 
+    @Resource
+    private PgRoadManager pgRoadManager;
+
     public PgPileAcu getPgPileAcuByCode(String acuCode){
         List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
 
@@ -58,7 +64,9 @@
         for(PgPlanTask pgPlanTask:pgPlanTaskList){
             List<PgPlanResult> pgPlanResultList=getPgPlanResultByPlantask(pgPlanTask);
             PgPlanResultRe pgPlanResultRe=new PgPlanResultRe();
+
             pgPlanResultRe.setTaskKey(pgPlanTask.getTaskKey());
+            pgPlanResultRe.setPileAcuList(pgPlanTask.getPileAcuList());
             pgPlanResultRe.setPgPlanResultList(pgPlanResultList);
 
             pgPlanResultReList.add(pgPlanResultRe);
@@ -142,4 +150,57 @@
         return length;
     }
 
+    private PgPileAcu getPgPileAcuByAcuCode(String acuCode){
+        List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
+
+        if(pgPileAcuList==null||pgPileAcuList.size()==0)
+            return null;
+        else
+            return pgPileAcuList.get(0);
+    }
+
+    public List<PgAcuTask> getACUTask(String pileAcuList){
+        String[] acuArray=pileAcuList.split(",");
+        List<PgAcuTask> pgAcuTaskList=new ArrayList<>();
+
+        for(String acu:acuArray){
+            PgPileAcu pgPileAcu=this.getPgPileAcuByCode(acu);
+            String roadName=pgRoadManager.get(pgPileAcu.getRoadId()).getRoadName();
+
+            if(!containRoad(roadName,pgAcuTaskList))
+            {
+                PgAcuTask pgAcuTask=new PgAcuTask();
+                pgAcuTask.setRoadName(roadName);
+                pgAcuTask.setPileAcuList(acu);
+                pgAcuTaskList.add(pgAcuTask);
+            }
+            else{
+                PgAcuTask pgAcuTask=getIndexRoad(roadName,pgAcuTaskList);
+                if(pgAcuTask!=null)
+                    pgAcuTask.setPileAcuList(pgAcuTask.getPileAcuList()+","+acu);
+            }
+        }
+
+        return pgAcuTaskList;
+    }
+
+    private boolean containRoad(String roadName,List<PgAcuTask> pgAcuTaskList){
+        if(pgAcuTaskList==null||pgAcuTaskList.size()==0) return false;
+        for(PgAcuTask pgAcuTask:pgAcuTaskList){
+            if(pgAcuTask.getRoadName().equals(roadName))
+                return true;
+        }
+
+        return false;
+    }
+
+    private PgAcuTask getIndexRoad(String roadName, List<PgAcuTask> pgAcuTaskList){
+        for(PgAcuTask pgAcuTask:pgAcuTaskList){
+            if(pgAcuTask.getRoadName().equals(roadName))
+                return pgAcuTask;
+        }
+
+        return null;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java
new file mode 100644
index 0000000..323f7ef
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java
@@ -0,0 +1,25 @@
+package com.casic.PgInterface.reservePlan.dto;
+
+import java.util.List;
+
+public class PgAcuTask {
+
+    private String roadName;//道路
+    private String pileAcuList;//acu分区
+
+    public String getRoadName() {
+        return roadName;
+    }
+
+    public void setRoadName(String roadName) {
+        this.roadName = roadName;
+    }
+
+    public String getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(String pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
index c25e926..c7d7693 100644
--- a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
@@ -70,9 +70,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(Long.valueOf(inPgPersonId));
         PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("hostName",pgInPgPerson.getAssetCode());
-//        PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode());
-//        long maxId = pgTagPositionManager.getMaxId(pgTagMac.getTagMac());
-//        PGTagPosition pgTagPosition = pgTagPositionManager.get(maxId);
+
         PGTagPosition pgTagPosition = tagmacRun.GetTagStatus(pgTagMac);
         boolean bExist = false;
         bExist = pgTagPositionManager.findTagPosition(pgTagPosition.getPositionUpdatetime(),pgTagPosition.getHostId());
@@ -104,8 +102,7 @@
         PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(Long.valueOf(inPgPersonId));
         PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pgInPgPersonId",pgInPgPerson);
         System.out.println("time:"+pgInPgStatus.getInTime());
-//        PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pgInPgPersonId",inPgPersonId);
-//        PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode());
+
         PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("hostName",pgInPgPerson.getAssetCode());
 
         Map<Object,Object> mapPosition = new HashMap<>();
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
index 082ba5d..3eed00a 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
@@ -48,6 +48,7 @@
     public Map<String, Object> linkDevice(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         PgDeviceDto pgDeviceDto = null;
         try {
@@ -62,6 +63,7 @@
                     else {
                         pgDeviceDto = new PgDeviceDto(pgDevice);
                         msg = "报警关联设备获取成功";
+                        code="200";
                     }
                 }
             }
@@ -71,6 +73,7 @@
             e.printStackTrace();
             msg = "获取关联设备失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceDto);
 
@@ -86,6 +89,7 @@
     public Map<String, Object> linkPartitionCamera(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
         try {
@@ -106,6 +110,7 @@
 
                         pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(partition,position);
                         msg = "关联设备获取成功";
+                        code="200";
                     }
                 }
             }
@@ -115,6 +120,7 @@
             e.printStackTrace();
             msg = "分区设备关联失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceDtoList);
         return resultMap;
@@ -129,6 +135,7 @@
     public Map<String, Object> linkReservePlan(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgReservePlanDto> pgReservePlanDtoList=new ArrayList<>();
         try{
@@ -139,10 +146,12 @@
                 else {
                     pgReservePlanDtoList = pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
 
-                    if(pgReservePlanDtoList==null||pgReservePlanDtoList.size()==0)
-                        msg="不存在关联的报警预案";
-                    else
+                    if (pgReservePlanDtoList == null || pgReservePlanDtoList.size() == 0)
+                        msg = "不存在关联的报警预案";
+                    else {
                         msg = "关联预案获取成功";
+                        code="200";
+                    }
                 }
             }
             else
@@ -153,6 +162,7 @@
             e.printStackTrace();
             msg="预案关联失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgReservePlanDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
index 0ddbc4d..0ce886b 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
@@ -41,25 +41,19 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getAlarmList(@FormParam("alarmType") String alarmType,
                                             @FormParam("startDay") String startDay,
+                                            @FormParam("partition") String partition,
                                             @FormParam("endDay") String endDay,
                                             @FormParam("isNew") String isNew,
                                             @FormParam("page") int page,
                                             @FormParam("rows") int rows) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
         try {
-            pgAlarmDtoList = pgAlarmManager.getAllAlarm(alarmType,startDay,endDay,isNew,page,rows);
-            if (pgAlarmDtoList==null||pgAlarmDtoList.size() == 0)
-                msg = "没有报警信息";
-            else
-                msg = "报警信息获取成功";
+            resultMap = pgAlarmManager.getAllAlarm(alarmType,partition,startDay,endDay,isNew,page,rows);
+
         } catch (Exception e) {
             e.printStackTrace();
-            msg = "报警信息获取失败";
         }
-        resultMap.put("msg", msg);
-        resultMap.put("result", pgAlarmDtoList);
         return resultMap;
     }
 
@@ -71,9 +65,10 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> clearAlarmList(@FormParam("id") String id) throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        String result = "false";
+        String result = "";
+        String code="0";
 
         try {
             PgAlarm pgAlarm = new PgAlarm();
@@ -86,12 +81,14 @@
                 pgAlarmManager.save(pgAlarm);
                 msg = "报警信息清除成功";
                 result = "true";
+                code = "200";
             }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警信息清除失败";
             result = "false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
@@ -106,21 +103,26 @@
     public Map<String, Object> getAlarmByTypeOrTime(@FormParam("alarmType") String alarmType,
                                                     @FormParam("startTime") String startTime,
                                                     @FormParam("endTime") String endTime) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
-        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<PgAlarmDto>();
+        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
         try {
             pgAlarmDtoList = pgAlarmManager.getAlarmByTypeAndTime(alarmType, startTime, endTime);
             if (pgAlarmDtoList == null || pgAlarmDtoList.size() == 0)
                 msg = "报警信息不存在";
             else
+            {
                 msg = "报警信息获取成功";
+                code="200";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警信息获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
index 29ce8a4..ed0bf34 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
@@ -39,8 +39,8 @@
     public Map<String, Object> getAlarmRule(@FormParam("devType") String devType) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
-        System.out.println("devType:"+devType);
         List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<>();
         try {
             pgAlarmRuleDtoList = pgAlarmRuleManager.getAlarmRuleDto(devType);
@@ -52,6 +52,7 @@
             e.printStackTrace();
             msg = "报警阈值信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmRuleDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
index 24ab894..abef1b1 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
@@ -39,16 +39,21 @@
                                                      @FormParam("endDate") String endDate)throws Exception{
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
+
         List<PgAlarmTjDto> pgAlarmTjDtoList=null;
         try{
             pgAlarmTjDtoList=pgAlarmTjManager.getAlarmTjResultByType(startDate,endDate);
             msg="获取成功";
+            code="200";
         }
         catch(Exception ex) {
             msg = "统计失败";
         }
-        resultMap.put("result",pgAlarmTjDtoList);
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
+        resultMap.put("result",pgAlarmTjDtoList);
+
         return resultMap;
     }
 
@@ -61,23 +66,27 @@
     public Map<String, Object> getAlarmByTime(@FormParam("startTime") String startTime,
                                               @FormParam("endTime") String endTime,
                                               @FormParam("statisticType") String statisticType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code = "0";
 
-        List<PgAlarmTjDto> pgAlarmTjDtoList = new ArrayList<PgAlarmTjDto>();
+        List<PgAlarmTjDto> pgAlarmTjDtoList = new ArrayList<>();
         try {
             pgAlarmTjDtoList = pgAlarmTjManager.getAlarmByTime(startTime, endTime, statisticType);
             if(pgAlarmTjDtoList==null)
                 msg="报警统计信息获取失败";
-            else
-                msg="报警统计信息获取成功";
+            else {
+                msg = "报警统计信息获取成功";
+                code="200";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警统计信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmTjDtoList);
         return resultMap;
     }
 
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
index 28bc811..b6278a9 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
@@ -30,7 +30,6 @@
     @Resource
     private PgAlarmTypeManager pgAlarmTypeManager;
 
-
     /**
      * 获取报警类型
      */
@@ -38,19 +37,24 @@
     @Path("getAlarmType")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getAlarmTypeList()throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
-        List<PgAlarmTypeDto> pgAlarmTypeDtoList=new ArrayList<PgAlarmTypeDto>();
+        String code="";
+
+        List<PgAlarmTypeDto> pgAlarmTypeDtoList=new ArrayList<>();
         try {
             pgAlarmTypeDtoList = pgAlarmTypeManager.getAllAlarmTypeDto();
             if(pgAlarmTypeDtoList.size()==0)
                 msg="没有报警类型信息";
-            else
-                msg="报警类型信息获取成功";
+            else {
+                code="200";
+                msg = "报警类型信息获取成功";
+            }
         }catch(Exception e){
             e.printStackTrace();
             msg="报警类型信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAlarmTypeDtoList);
         return resultMap;
@@ -66,6 +70,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
@@ -83,6 +88,7 @@
                 logger.info("成功保存");
                 result = "true";
                 msg = "保存成功";
+                code="200";
             }
         } catch (Exception e) {
             result = "false";
@@ -90,6 +96,7 @@
             e.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -106,6 +113,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try{
             if(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
@@ -119,6 +127,7 @@
                 pgAlarmTypeManager.save(pgAlarmType);
                 result = "true";
                 msg = "编辑成功";
+                code="200";
             }
         }
         catch(Exception e)
@@ -128,6 +137,7 @@
             e.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("result",result);
         resultMap.put("msg",msg);
 
@@ -146,6 +156,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
         String result="false";
+        String code="0";
 
         try {
             PgAlarmType pgAlarmType=pgAlarmTypeManager.get(Long.valueOf(id));
@@ -157,6 +168,7 @@
             {
                 pgAlarmType.setActive(0);
                 pgAlarmTypeManager.save(pgAlarmType);
+                code="200";
                 msg="报警类型删除成功";
                 result="true";
             }
@@ -165,6 +177,7 @@
             msg="报警类型删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
index 4533e1a..85940bb 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
@@ -33,12 +33,15 @@
                                                  @FormParam("inSpectionPlace") String inSpectionPlace){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
         List<PgAssetPlanDto> pgAssetPlanDtoList=new ArrayList<>();
         try{
             pgAssetPlanDtoList=pgAssetPlanManager.getPgAssetPlanDtoList(startDay,endDay,inSpectionPlace);
-            if(pgAssetPlanDtoList!=null&&pgAssetPlanDtoList.size()!=0)
-                msg="巡检信息获取成功";
+            if(pgAssetPlanDtoList!=null&&pgAssetPlanDtoList.size()!=0) {
+                code="200";
+                msg = "巡检信息获取成功";
+            }
             else
                 msg="不存在巡检信息";
         }
@@ -47,6 +50,7 @@
             msg="巡检信息获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAssetPlanDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
index 47ef9d1..5cbdfcb 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
@@ -30,12 +30,15 @@
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
         String result="";
+        String code="0";
 
         List<PgAssetPlanStatic> pgAssetPlanStaticList = null;
         try{
             pgAssetPlanStaticList=pgAssetPlanManager.getPgAssetPlanStaticLisByTime(startTime,endTime,staticType);
-            if(pgAssetPlanStaticList!=null&&pgAssetPlanStaticList.size()!=0)
-                msg="巡检统计信息获取成功";
+            if(pgAssetPlanStaticList!=null&&pgAssetPlanStaticList.size()!=0) {
+                code = "200";
+                msg = "巡检统计信息获取成功";
+            }
             else
                 msg="统计信息获取失败";
         }
@@ -44,6 +47,7 @@
             msg="统计失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAssetPlanStaticList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
index 26f5d6a..503bfe3 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
@@ -40,6 +40,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="";
 
         try{
             PgAuthority pgAuthority=new PgAuthority();
@@ -50,6 +51,7 @@
 
             pgAuthorityManager.save(pgAuthority);
             msg="用户权限保存成功";
+            code="200";
             result="true";
         }
         catch(Exception e) {
@@ -57,6 +59,7 @@
             msg = "新增权限失败";
             result = "false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -65,22 +68,25 @@
 
     /*
        *编辑角权限信息
-        */
+    */
     @POST
     @Path("editAuthority")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> editAuthority(@FormParam("id") String id,
                                        @FormParam("authority") String authority,
                                        @FormParam("concent") String concent) throws Exception{
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
+
         try {
             PgAuthority pgAuthority=pgAuthorityManager.get(Long.valueOf(id));
             pgAuthority.setAuthority(authority);
             pgAuthority.setConcent(concent);
 
             pgAuthorityManager.save(pgAuthority);
+            code="200";
             msg="权限保存成功";
             result="true";
         }
@@ -90,7 +96,7 @@
             msg="权限编辑失败";
             result="false";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -105,9 +111,10 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> deleteAuthority(@FormParam("id") String id)throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
-        String result="false";
+        String result="";
+        String code="0";
 
         try {
             PgAuthority pgAuthority= pgAuthorityManager.get(Long.valueOf(id));
@@ -119,6 +126,7 @@
             {
                 pgAuthority.setActive(0);
                 pgAuthorityManager.save(pgAuthority);
+                code="200";
                 msg="删除权限成功";
                 result="true";
             }
@@ -127,37 +135,40 @@
             msg="删除权限失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
     }
 
     /*
-* 获取权限信息
- */
+    * 获取权限信息
+    */
     @POST
     @Path("getAuthorityList")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> getAuthorityList() {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgAuthorityDto> pgAuthorityDtoList = new ArrayList<PgAuthorityDto>();
         try {
             pgAuthorityDtoList = pgAuthorityManager.getAuthorityList();
             if (pgAuthorityDtoList == null)
                 msg = "不存在权限信息";
-            else
+            else {
+                code = "200";
                 msg = "权限信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "权限信息获取是失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAuthorityDtoList);
         return resultMap;
     }
 
 
-
-
 }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
index a9ef521..a74ecc7 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
@@ -45,6 +45,7 @@
                                                @FormParam("endDate") String endDate)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgHistoryDataDto> pgHistoryDataDtoList=new ArrayList<>();
 
         try {
@@ -55,13 +56,16 @@
                 pgHistoryDataDtoList=pgCh4Manager.getAllCH4Data(pgDevice,startDate,endDate);
                 if(pgHistoryDataDtoList==null)
                     msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+                else {
+                    code = "200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgHistoryDataDtoList);
         return resultMap;
@@ -75,8 +79,9 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getNewestCh4InfoByDev(@FormParam("assetCode") String assetCode)throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
+        String code="0";
         PgCh4Dto pgCh4Dto=new PgCh4Dto(null);
 
         try {
@@ -87,13 +92,17 @@
                 pgCh4Dto=pgCh4Manager.getNewestCH4Data(pgDevice);
                 if(pgCh4Dto==null)
                     msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgCh4Dto);
         return resultMap;
@@ -111,6 +120,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
@@ -127,6 +137,7 @@
                 pgCh4.setPgDeviceId(pgDevice);
 
                 pgCh4Manager.save(pgCh4);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -135,7 +146,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
index a7eac39..dfc8ca5 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
@@ -43,23 +43,27 @@
                                                       @FormParam("endDate") String endDate)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgHistoryDataDto> pgHistoryDataDtoList=new ArrayList<>();
 
         try {
             PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
                 msg="设备不存在";
-            else{
-                pgHistoryDataDtoList=pgCoManager.getAllCoData(pgDevice, startDate, endDate);
-                if(pgHistoryDataDtoList==null)
-                    msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+            else {
+                pgHistoryDataDtoList = pgCoManager.getAllCoData(pgDevice, startDate, endDate);
+                if (pgHistoryDataDtoList == null)
+                    msg = "没有满足要求的数据";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgHistoryDataDtoList);
         return resultMap;
@@ -75,6 +79,7 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         PgCoDto pgCoDto=new PgCoDto(null);
 
         try {
@@ -85,13 +90,16 @@
                 pgCoDto=pgCoManager.getNewestCoData(pgDevice);
                 if(pgCoDto==null)
                     msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgCoDto);
         return resultMap;
@@ -110,6 +118,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         try {
@@ -126,6 +135,7 @@
 
                 pgCoManager.save(pgCo);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
         } catch (Exception e) {
@@ -133,7 +143,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
index b4b826e..9af98a3 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
@@ -60,6 +60,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         try {
 
@@ -80,8 +81,8 @@
                 pgConstruction.setPgConstructionTypeId(pgConstructionType.getId());
                 pgConstruction.setActive(1);
                 pgConstruction.setParName(parName);
-                logger.info("保存成功");
                 pgConstructionManager.save(pgConstruction);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -90,6 +91,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("success", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -116,6 +118,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
@@ -140,6 +143,7 @@
                 pgConstruction.setParName(parName);
 
                 pgConstructionManager.save(pgConstruction);
+                code="200";
                 result = "true";
                 msg = "编辑成功";
             }
@@ -150,7 +154,7 @@
             e.printStackTrace();
 
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -167,6 +171,8 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
+
         try {
             PgConstruction pgConstruction = pgConstructionManager.get(Long.valueOf(id));
             if (pgConstruction == null)
@@ -177,6 +183,7 @@
             {
                 pgConstruction.setActive(0);
                 pgConstructionManager.save(pgConstruction);
+                code="200";
                 result = "true";
                 msg = "成功删除信息";
             }
@@ -185,6 +192,7 @@
             result = "false";
             msg = "删除失败";
         }
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -204,9 +212,11 @@
                                                   @FormParam("rows") int rows)throws Exception{
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
         List<PgConstructionDto> pgConstructionDtoList=new ArrayList<>();
         try{
             pgConstructionDtoList=pgConstructionManager.getPgContructionDto(cs_name,cs_type,startTime,endTime,page,rows);
+            code="200";
             msg="信息获取成功";
         }
         catch(Exception e)
@@ -214,6 +224,7 @@
             e.printStackTrace();
             msg="查询失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
 
@@ -231,18 +242,22 @@
                                                               @FormParam("statisticType") String statisticType) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgConstructionStiatistic> pgConstructionStiatisticList=new ArrayList<>();
         try {
             pgConstructionStiatisticList = pgConstructionManager.getConstructionByTimeAndStatus(startTime, endTime, statisticType);
             if(pgConstructionStiatisticList==null)
                 msg="施工统计信息获取失败";
-            else
-                msg="施工统计信息获取成功";
+            else {
+                code="200";
+                msg = "施工统计信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "施工统计信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgConstructionStiatisticList);
         return resultMap;
@@ -257,6 +272,7 @@
     public Map<String, Object> getConstructionByType(@FormParam("statisticType") String statisticType){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
         List<PgConstructionStiatistic> pgConstructionStiatisticList=new ArrayList<>();
 
         try{
@@ -268,6 +284,7 @@
                 resultMap.put("result",null);
             }
             else {
+                code="200";
                 msg = "统计信息获取成功";
                 resultMap.put("result", pgConstructionStiatisticList);
             }
@@ -278,6 +295,7 @@
             msg="统计失败";
             resultMap.put("result",null);
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         return resultMap;
     }
@@ -291,9 +309,11 @@
     public Map<String, Object> getConstructionToday() throws Exception{
         Map<String,Object> resultMap=new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgConstructionDto> pgConstructionDtoList=new ArrayList<PgConstructionDto>();
         try {
             pgConstructionDtoList = pgConstructionManager.getConstructionToday();
+            code="200";
             msg = "当天施工信息获取成功";
         }
         catch(Exception e)
@@ -301,7 +321,7 @@
             e.printStackTrace();
             msg="获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
         return resultMap;
@@ -316,6 +336,7 @@
     public Map<String, Object> getConstructionDev(@FormParam("id") String id) throws Exception{
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
         List<PgDeviceDto> pgDeviceDtoList =new ArrayList<>();
         try{
@@ -325,14 +346,17 @@
 
             if(pgDeviceDtoList==null)
                 msg="信息获取失败";
-            else
-                msg="信息获取成功";
+            else {
+                code="200";
+                msg = "信息获取成功";
+            }
         }
         catch(Exception e)
         {
             e.printStackTrace();
-            msg="设备信息获取成功";
+            msg="信息获取是被";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgDeviceDtoList);
 
@@ -346,17 +370,21 @@
     @Path("getConstruction")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getConstruction() throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
-        List<PgConstructionDto> pgConstructionDtoList=new ArrayList<PgConstructionDto>();
+        String code="0";
+
+        List<PgConstructionDto> pgConstructionDtoList=new ArrayList<>();
 
         try{
             pgConstructionDtoList=pgConstructionManager.getPgConstructionList();
             if(pgConstructionDtoList==null||pgConstructionDtoList.size()==0)
                 msg="不存在施工记录";
-            else
-                msg="施工信息获取成功";
+            else {
+                code = "200";
+                msg = "施工信息获取成功";
+            }
         }
         catch(Exception e)
         {
@@ -364,6 +392,7 @@
             msg="施工信息获取失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java
index fd3d53e..2019502 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java
@@ -39,12 +39,12 @@
         try {
             pgConstructionTypeDtoList = pgConstructionTypeManager.getAllConstructionTypeDto();
             if (pgConstructionTypeDtoList.size() == 0)
-                msg = "没有项目类型信息";
+                msg = "获取失败";
             else
-                msg = "项目类型获取成功";
+                msg = "获取成功";
         } catch (Exception e) {
             e.printStackTrace();
-            msg = "项目类型信息获取失败";
+            msg = "获取失败";
         }
         resultMap.put("msg", msg);
         resultMap.put("result", pgConstructionTypeDtoList);
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
index 90d001c..037a399 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
@@ -51,6 +51,7 @@
 
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if (StringUtils.isBlank(construct_doc)||StringUtils.isBlank(doc_name))
@@ -65,6 +66,7 @@
             pgCsDocument.setActive(1);
             pgCsDocumentManager.save(pgCsDocument);
 
+            code="200";
             result = "true";
             msg = "保存成功";
 
@@ -74,6 +76,7 @@
             ex.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("success", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -90,6 +93,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             PgCsDocument pgCsDocument = pgCsDocumentManager.get(Long.valueOf(id));
@@ -103,6 +107,7 @@
 
                 pgCsDocumentManager.save(pgCsDocument);
 
+                code="200";
                 result = "true";
                 msg = "编辑成功";
             }
@@ -112,6 +117,7 @@
             msg = "编辑失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -125,9 +131,9 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
         String result="";
+        String code="0";
 
         try{
-
             PgCsDocument pgCsDocument = pgCsDocumentManager.get(Long.valueOf(id));
             if(pgCsDocument==null)
             {
@@ -137,6 +143,7 @@
             else{
                 pgCsDocument.setActive(0);
                 pgCsDocumentManager.save(pgCsDocument);
+                code="200";
                 result="true";
                 msg="删除成功";
             }
@@ -147,7 +154,7 @@
             msg="预案删除失败";
             result="false";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -168,18 +175,21 @@
 
         String msg="";
         String result="";
+        String code="0";
 
         try {
             pgCsDocumentDtoList = pgCsDocumentManager.getAllDocData(cs_name);
-            if (pgCsDocumentDtoList != null)
+            if (pgCsDocumentDtoList != null) {
+                code="200";
                 msg = "获取数据成功";
+            }
             else
                 msg = "没有满足条件的数据";
         }catch (Exception e){
             e.printStackTrace();
             msg = "获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgCsDocumentDtoList);
         return resultMap;
@@ -192,20 +202,22 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
 
         String msg = "";
+        String code="0";
         ResponseEntity<byte[]> path = null;
         try {
             PgCsDocument pgCsDocument = pgCsDocumentManager.get(Long.valueOf(id));
             path = pgCsDocumentManager.downloadFile(pgCsDocument);
             if (path == null)
                 msg = "不存在该文档";
-            else
+            else {
+                code = "200";
                 msg = "下载成功";
-
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "下载失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", path.getBody());
         resultMap.put("msg", msg);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
index 94c5c84..ffc8b95 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
@@ -41,22 +41,24 @@
     public Map<String, Object> getPgDeviceByDevType(@FormParam("devType") String devType) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
         try {
-            pgDeviceDtoList = pgDeviceManager.getDeviceByDevTypee(devType);
+            pgDeviceDtoList = pgDeviceManager.getDeviceByDevType(devType);
             if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0){
                 msg="不存在满足要求的数据";
-                resultMap.put("result",null);
             }
             else{
-                resultMap.put("result", pgDeviceDtoList);
+                code="200";
                 msg = "获取成功";
             }
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", pgDeviceDtoList);
         return resultMap;
     }
 
@@ -69,25 +71,26 @@
     public Map<String, Object> getPgDeviceByAssetCode(@FormParam("assetCode") String assetCode) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         PgDeviceDto pgDeviceDto=null;
         try {
             PgDevice pgDevice = pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
             {
                 msg="不存在设备信息";
-                resultMap.put("result",null);
             }
             else {
                 pgDeviceDto = new PgDeviceDto(pgDevice);
                 msg = "获取成功";
-                resultMap.put("result", pgDeviceDto);
+                code="200";
             }
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", pgDeviceDto);
         return resultMap;
     }
 
@@ -102,27 +105,61 @@
                                              @FormParam("devType") String devType)throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
         try {
             pgDeviceDtoList = pgDeviceManager.getAllDevice(road,partition,devType);
             if(pgDeviceDtoList.size()==0) {
                 msg = "没有找到设备信息";
-                resultMap.put("result",null);
             }
             else {
                 msg = "设备信息获取成功";
-                resultMap.put("result", pgDeviceDtoList);
+                code="200";
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result", pgDeviceDtoList);
         return resultMap;
     }
 
     /**
+     * 显示设备列表
+     */
+    @POST
+    @Path("getPgDev")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String, Object> getPgDev(@FormParam("road") String road,
+                                             @FormParam("partition") String partition,
+                                             @FormParam("devType") String devType)throws Exception {
+        Map<String, Object> resultMap = new HashMap<>();
+        String msg="";
+        String code="0";
+        List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
+        try {
+            pgDeviceDtoList = pgDeviceManager.getAllDev(road,partition,devType);
+            if(pgDeviceDtoList.size()==0) {
+                msg = "没有找到设备信息";
+            }
+            else {
+                code="200";
+                msg = "设备信息获取成功";
+            }
+        }catch(Exception e){
+            e.printStackTrace();
+            msg="设备信息获取失败";
+        }
+        resultMap.put("code",code);
+        resultMap.put("msg",msg);
+        resultMap.put("result", pgDeviceDtoList);
+        return resultMap;
+    }
+
+
+    /**
      * 新增设备
      */
     @POST
@@ -145,6 +182,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if (pgDeviceManager.getDeviceByAssetCode(assetCode)!=null) {
@@ -169,6 +207,7 @@
 
                 pgDeviceManager.save(pgDevice);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
 
@@ -177,10 +216,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -208,14 +246,9 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
-            /*
-            if (pgDeviceManager.getDeviceByAssetCode(assetCode)!=null) {
-                result = "false";
-                msg = "已存在同名设备";
-            } else {
-            */
             PgDevice pgDevice = pgDeviceManager.get(Long.valueOf(id));
             pgDevice.setPipeGallery(pipeGallery);
             pgDevice.setPartition(partition);
@@ -233,14 +266,14 @@
 
             pgDeviceManager.save(pgDevice);
             result = "true";
+            code="200";
             msg = "编辑成功";
-            //}
         } catch (Exception e) {
             result = "false";
             msg = "编辑失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("result",result);
         resultMap.put("msg",msg);
         return resultMap;
@@ -256,7 +289,8 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
-        String result="false";
+        String result="";
+        String code="0";
 
         try {
             PgDevice pgDevice=pgDeviceManager.get(Long.valueOf(id));
@@ -268,6 +302,7 @@
             {
                 pgDevice.setActive(0);
                 pgDeviceManager.save(pgDevice);
+                code="200";
                 msg="设备删除成功";
                 result="true";
             }
@@ -276,6 +311,7 @@
             msg="设备删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -291,18 +327,18 @@
     {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         PgDeviceDto pgDeviceDto=null;
 
         try{
             PgDevice pgDevice=pgDeviceManager.getDeviceBydevCode(devCode);
             if(pgDevice==null) {
                 msg = "设备信息获取失败";
-                resultMap.put("result",null);
             }
             else{
                 pgDeviceDto = new PgDeviceDto(pgDevice);
                 msg = "设备信息获取成功";
-                resultMap.put("result",pgDeviceDto);
+                code="200";
             }
         }
         catch(Exception ex)
@@ -310,8 +346,9 @@
             ex.printStackTrace();
             msg="设备状态获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgDeviceDto);
         return resultMap;
     }
 
@@ -324,17 +361,17 @@
     public Map<String,Object> getDeviceByPartition(@FormParam("partition") String partition) throws Exception{
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<PgDeviceDto>();
 
         try{
             pgDeviceDtoList=pgDeviceManager.getPgDeviceDtoListByPartition(partition);
             if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0) {
                 msg = "设备信息获取失败";
-                resultMap.put("result",null);
             }
             else {
+                code="200";
                 msg = "设备信息获取成功";
-                resultMap.put("result",pgDeviceDtoList);
             }
         }
         catch(Exception e)
@@ -342,8 +379,9 @@
             e.printStackTrace();
             msg="设备信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgDeviceDtoList);
         return resultMap;
     }
 
@@ -353,17 +391,16 @@
     public Map<String,Object> getDeviceByOldDAssetCodeCode(@FormParam("assetCode") String assetCode) throws Exception{
         Map<String, Object> resultMap = new HashMap<>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
 
         try{
             pgDeviceDtoList=pgDeviceManager.getDeviceByOldDAssetCodeCode(assetCode);
-            if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0) {
-                msg = "设备信息获取失败";;
-                resultMap.put("result",null);
-            }
+            if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0)
+                msg = "设备信息获取失败";
             else {
                 msg = "设备信息获取成功";
-                resultMap.put("result",pgDeviceDtoList);
+                code="200";
             }
         }
         catch(Exception e)
@@ -372,8 +409,9 @@
             msg="设备信息获取失败";
             resultMap.put("result",null);
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgDeviceDtoList);
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java
index 421d249..f6f167d 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java
@@ -38,17 +38,21 @@
     public Map<String, Object> getDeviceTpeyList()throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgDeviceTypeDto> pgDeviceTypeDtoList=new ArrayList<PgDeviceTypeDto>();
         try {
             pgDeviceTypeDtoList = pgDeviceTypeManager.getAllDeviceType();
             if(pgDeviceTypeDtoList.size()==0)
                 msg="没有找到设备类型信息";
-            else
-                msg="设备类型信息获取成功";
+            else {
+                code="200";
+                msg = "设备类型信息获取成功";
+            }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备类型信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgDeviceTypeDtoList);
         return resultMap;
@@ -66,6 +70,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if (pgDeviceTypeManager.getDeviceTypeByDeType(devType)!=null) {
@@ -79,6 +84,7 @@
 
                 pgDeviceTypeManager.save(pgDeviceType);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
 
@@ -87,10 +93,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
index c276fb3..c789960 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
@@ -44,6 +44,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 
         try {
@@ -62,6 +63,7 @@
                 pgEquipment.setActive(1);
 
                 pgEquipmentManager.save(pgEquipment);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -70,9 +72,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -89,9 +91,10 @@
                                             @FormParam("ownerUnit") String ownerUnit,
                                             @FormParam("enterDate") String enterDate,
                                             @FormParam("curUser") String curUser) {
-        HashMap<String, Object> resultMap = new HashMap<String, Object>();
+        HashMap<String, Object> resultMap = new HashMap<>();
         String msg = "";
         String result = "";
+        String code="0";
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 
         try {
@@ -111,6 +114,7 @@
                 pgEquipment.setEnterDate(sdf.parse(enterDate));
 
                 pgEquipmentManager.save(pgEquipment);
+                code="200";
                 msg="编辑成功";
                 result="true";
             }
@@ -119,9 +123,9 @@
             result = "false";
             msg = "编辑失败";
         }
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -134,16 +138,19 @@
     public Map<String, Object> getEquipment(@FormParam("eqName") String eqName,
                                             @FormParam("eqCode") String eqCode,
                                             @FormParam("eqType") String eqType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        List<PgEquipmentDto> pgEquipmentDtoList=new ArrayList<PgEquipmentDto>();
+        String code="0";
+        List<PgEquipmentDto> pgEquipmentDtoList=new ArrayList<>();
 
         try{
             pgEquipmentDtoList=pgEquipmentManager.getEquipmentDtiList(eqName,eqCode,eqType);
             if(pgEquipmentDtoList==null||pgEquipmentDtoList.size()==0)
                 msg="不存在工器具记录";
-            else
-                msg="维获取成功";
+            else {
+                code = "200";
+                msg = "维获取成功";
+            }
         }
         catch(Exception e)
         {
@@ -166,6 +173,7 @@
         HashMap<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
         String result = "";
+        String code="";
 
         try {
             PgEquipment pgEquipment=pgEquipmentManager.get(Long.valueOf(id));
@@ -178,6 +186,7 @@
             {
                 pgEquipment.setActive(0);
                 pgEquipmentManager.save(pgEquipment);
+                code="200";
                 msg="删除成功";
                 result="true";
             }
@@ -186,6 +195,7 @@
             msg="设备信息获取失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -201,16 +211,19 @@
             throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=new ArrayList<PgDeviceTypeStatisticDto>();
 
         try {
             pgDeviceTypeStatisticDtoList=pgEquipmentManager.getDeviceStatisticByDevType(eqType);
 
+            code="200";
             msg = "获取成功";
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceTypeStatisticDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
index 05a9709..a90fd6c 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
@@ -4,9 +4,9 @@
 import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
 import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
 import com.casic.PgInterface.intelPlan.manager.PgPileAcuManager;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import com.casic.PgInterface.test.PlanData;
 import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.ModelAttribute;
 
 import javax.annotation.Resource;
 import javax.ws.rs.FormParam;
@@ -32,23 +32,25 @@
     public Map<String,Object> getPlanResult(@FormParam("planParamStr") String planParamStr){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
-        //List<PgPlanTask> pgPlanTaskList=pgPlanParams.getPgPlanTaskList();
         List<PgPlanTask> pgPlanTaskList=new PgPlanParams().getPgPlanParamsByString(planParamStr);
         List<PgPlanResultRe> pgPlanResultReList=new ArrayList<>();
 
-        try{
-                pgPlanResultReList=pgPileAcuManager.getPgPlanResultList(pgPlanTaskList);
-                if(pgPlanResultReList==null)
-                    msg="管线智能规划出错";
-                else
-                    msg="管线智能规划完成";
+        try {
+            pgPlanResultReList = pgPileAcuManager.getPgPlanResultList(pgPlanTaskList);
+            if (pgPlanResultReList == null)
+                msg = "管线智能规划出错";
+            else {
+                code="200";
+                msg = "管线智能规划完成";
+            }
         }
         catch(Exception ex){
             msg="智能规划出错";
             ex.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgPlanResultReList);
 
@@ -80,4 +82,30 @@
         return resultMap;
     }
 
+    @POST
+    @Path("getPlanTask")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getACUTask(@FormParam("pileAcuList") String pileAcuList){
+
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        String code="0";
+        List<PgAcuTask> pgAcuTaskList=new ArrayList<>();
+
+        try{
+            pgAcuTaskList=pgPileAcuManager.getACUTask(pileAcuList);
+            code="200";
+            msg="任务获取成功";
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            msg="任务获取失败";
+        }
+        resultMap.put("code",code);
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgAcuTaskList);
+
+        return resultMap;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
index ff85c61..66eec76 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
@@ -55,13 +55,13 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         try {
             PgInPgPerson pgInPgPerson = null;//pgInPgPersonManager.getPersonByUserName(userName);
             int iHostName = pgTagMacManager.getCount("select count(1) from PGTagMac where hostname = ?",assetCode);
-//            int iTagMac = pgTagMacManager.getCount("select count(1) from PGTagMac where tagmac = ?",assetCode.toUpperCase());
             if (0==iHostName)
             {
                 result = "false";
@@ -92,9 +92,8 @@
 
                 pgInPgStatusManager.save(pgInPgStatus);
 
-//                String syResult=pgInPgPersonManager.synchorizedInPgInfo(assetCode,userCode,userName,personType);
+                code="200";
                 result = "true";
-//                msg = "人员注册保存成功"+syResult;
                 msg = "人员注册保存成功";
             }
             else {
@@ -106,6 +105,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -120,6 +120,7 @@
     public Map<String, Object> getInPgPerson() throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<>();
         try {
@@ -127,11 +128,15 @@
             if (pgInPgInfoDtoList == null || pgInPgInfoDtoList.size() == 0)
                 msg = "没有找到入廊人员信息";
             else
+            {
+                code="200";
                 msg = "入廊人员信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "入廊人员信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
         return resultMap;
@@ -146,18 +151,22 @@
     public Map<String, Object> getInPgPersonInPg() throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
 
-        List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<PgInPgInfoDto>();
+        List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<>();
         try {
             pgInPgInfoDtoList = pgInPgPersonManager.getPgInPersonList(1);
             if (pgInPgInfoDtoList == null || pgInPgInfoDtoList.size() == 0)
                 msg = "没有找到入廊人员信息";
-            else
+            else {
+                code="200";
                 msg = "入廊人员信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "入廊人员信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
         return resultMap;
@@ -172,6 +181,7 @@
     public Map<String, Object> getInPgPersonByName(@FormParam("userName") String userName) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
 
         PgInPgPerson pgInPgPerson = null;
         PgInPgPersonDto pgInPgPersonDto=null;
@@ -184,12 +194,13 @@
                 pgInPgPersonDto=new PgInPgPersonDto(pgInPgPerson);
                 pgInPgPersonDtoList.add(pgInPgPersonDto);
                 msg = "人员信息获取成功";
+                code="200";
             }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "人员信息获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgPersonDtoList);
         return resultMap;
@@ -206,6 +217,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             PgInPgPerson pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName);
@@ -221,6 +233,7 @@
                     pgInPgPersonManager.save(pgInPgPerson);
                     result = "true";
                     msg = "编辑成功";
+                    code="200";
                 }
             }
         } catch (Exception e) {
@@ -228,9 +241,9 @@
             msg = "编辑失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -244,10 +257,12 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         int inPgNum=0;
         String msg = "";
+        String code="0";
 
         try{
             inPgNum=pgInPgStatusManager.getInPgNum();
 
+            code="200";
             msg="人员入廊次数获取成功";
         }
         catch(Exception e)
@@ -255,6 +270,7 @@
             e.printStackTrace();
             msg="人员入廊次数获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",inPgNum);
 
@@ -272,18 +288,22 @@
                                                    @FormParam("statisticType") String statisticType) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
 
         List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<PgInPgInfoDto>();
         try {
             pgInPgInfoDtoList = pgInPgPersonManager.getPgInPersonListByTime(startTime, endTime, statisticType);
             if(pgInPgInfoDtoList==null)
                 msg="入廊人员统计信息获取失败";
-            else
-                msg="入廊人员统计信息获取成功";
+            else {
+                code="200";
+                msg = "入廊人员统计信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "入廊人员统计信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
         return resultMap;
@@ -296,6 +316,7 @@
 
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
 
         try {
@@ -304,8 +325,10 @@
                 pgDeviceDtoList=pgDeviceManager.getPgCameraListByPosition("",apCodeStr);
                 if(pgDeviceDtoList==null)
                     msg="不存在关联摄像机";
-                else
-                    msg="关联摄像机获取成功";
+                else {
+                    code="200";
+                    msg = "关联摄像机获取成功";
+                }
             } else {
                 msg="请输入Ap编号";
             }
@@ -315,6 +338,7 @@
             msg="关联摄像机获取成功";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgDeviceDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java
index 507b3fe..b43f077 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java
@@ -34,6 +34,7 @@
 
         String result="";
         String msg="";
+        String code="";
         try{
             PgInPgStatus pgInPgStatus=new PgInPgStatus();
 
@@ -44,6 +45,7 @@
             pgInPgStatusManager.save(pgInPgStatus);
             msg="入廊时间提交成功";
             result="true";
+            code="200";
         }
         catch (Exception e){
             e.printStackTrace();
@@ -51,6 +53,7 @@
             result="false";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -66,6 +69,7 @@
 
         String result="";
         String msg="";
+        String code="0";
         try{
             PgInPgPerson pgInPgPerson=pgInPgPersonManager.getPgInPgPersonByAssetCode(assetCode);
 
@@ -79,6 +83,7 @@
             pgInPgStatusManager.save(pgInPgStatus);
 
             msg="出廊时间提交成功";
+            code="200";
             result="true";
         }
         catch (Exception e){
@@ -87,6 +92,7 @@
             result="false";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
index 9def330..9c0ba1f 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
@@ -33,17 +33,20 @@
                                             @FormParam("existNum") String existNum) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         String result="";
 
         try {
             pgIntelPlanManager.savePgIntelPlan(parName,lineName,maxNum,existNum);
             msg="规划数据保存成功";
+            code="200";
             result="true";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "规划数据保存失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
@@ -55,15 +58,18 @@
     public Map<String, Object> getIntelLineType() throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgIntelPlanTypeDto> pgIntelPlanTypeDtoList=new ArrayList<>();
         try {
             pgIntelPlanTypeDtoList=pgIntelPlanManager.getIntelPlanType();
+            code="200";
             msg="获取排线类型成功";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "获取排线类型失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgIntelPlanTypeDtoList);
         return resultMap;
@@ -76,6 +82,7 @@
                                             @FormParam("partitionStr") String partitionStr) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgIntelPlanDto> pgIntelPlanDtoList = new ArrayList<>();
 
@@ -83,8 +90,10 @@
             pgIntelPlanDtoList = pgIntelPlanManager.getPgIntelPlanListByPartion(lineName, partitionStr);
             if(pgIntelPlanDtoList==null||pgIntelPlanDtoList.size()==0)
                 msg="请输入正确的规划参数";
-            else
-                msg="规划数据获取成功";
+            else {
+                code="200";
+                msg = "规划数据获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "规划数据获取失败";
@@ -103,10 +112,12 @@
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
         String result="";
+        String code="0";
 
         try {
             boolean bl=pgIntelPlanManager.addLineUse(lineName,partitionStr,num);
             if(bl){
+                code="200";
                 msg="排线入廊成功";
                 result="true";
             }
@@ -119,6 +130,7 @@
             msg = "排线入廊失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
@@ -132,6 +144,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
         String result="";
+        String code="0";
 
         try {
             PgIntelPlan pgIntelPlan=pgIntelPlanManager.getPgIntelPlanByParNameAndLine(lineName,parName);
@@ -140,11 +153,13 @@
             pgIntelPlanManager.save(pgIntelPlan);
             msg="规划数据删除成功";
             result="true";
+            code="200";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "规划数据删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java b/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java
index 378af00..9c39523 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java
@@ -1,5 +1,6 @@
 package com.casic.PgInterface.rs;
 
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
 import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
 import com.casic.PgInterface.intelPlan.dto.PgLineHoleDTO;
 import com.casic.PgInterface.intelPlan.manager.PgLineHoleManager;
@@ -27,6 +28,9 @@
     @Resource
     private PgPileAcuManager pgPileAcuManager;
 
+    @Resource
+    private PgRoadManager pgRoadManager;
+
     @POST
     @Path("getPgLineAcuHole")
     @Produces(MediaType.APPLICATION_JSON)
@@ -34,23 +38,32 @@
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
         String result="";
+        String code="0";
         List<PgLineHoleDTO> pgLineHoleDTOList=new ArrayList<>();
 
         try {
             PgPileAcu pgPileAcu=pgPileAcuManager.getPgPileAcuByCode(acuCode);
             if(pgPileAcu==null){
                 msg="不存在分区";
-            }else{
-                pgLineHoleDTOList=pgLineHoleManager.getCurrentHoleByAcu(pgPileAcu.getId());
-                if(pgLineHoleDTOList!=null&&pgLineHoleDTOList.size()!=0)
-                    msg="获取成功";
-                else
-                    msg="未找到入廊数据";
+            }else {
+                pgLineHoleDTOList = pgLineHoleManager.getCurrentHoleByAcu(pgPileAcu.getId());
+                if (pgLineHoleDTOList != null && pgLineHoleDTOList.size() != 0)
+                {
+                    code="200";
+                    msg = "获取成功";
+                }
+                else {
+                    PgLineHoleDTO pgLineHoleDTO=new PgLineHoleDTO();
+                    pgLineHoleDTO.setRoad(pgRoadManager.get(pgPileAcu.getRoadId()).getRoadName());
+                    pgLineHoleDTOList.add(pgLineHoleDTO);
+                    msg = "未找到入廊数据";
+                }
             }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgLineHoleDTOList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgLogRs.java b/src/main/java/com/casic/PgInterface/rs/PgLogRs.java
index 39cff52..30db63b 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgLogRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgLogRs.java
@@ -45,6 +45,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         PgLog pgLog=new PgLog();
         try {
             PgUser pgUser = new PgUser();
@@ -60,14 +61,15 @@
             pgLogManager.save(pgLog);
             result = "true";
             msg = "保存成功";
-
+            code="200";
         } catch (Exception e) {
             result = "false";
             msg = "保存失败";
             e.printStackTrace();
         }
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -83,17 +85,21 @@
             throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgLogDto> pgLogDtoList = new ArrayList<PgLogDto>();
         try {
             pgLogDtoList = pgLogManager.getAllLogs(userName, startTime, endTime);
             if (pgLogDtoList == null || pgLogDtoList.size() == 0)
                 msg = "没有找到日志信息";
-            else
+            else {
+                code="200";
                 msg = "日志信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "日志信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgLogDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java
index 9fd0a5f..37b72f6 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java
@@ -36,19 +36,23 @@
         Map<String,Object> resultMap=new HashMap<>();
 
         String msg = "";
+        String code="0";
         List<PgMaintainType> pgMaintainTypeList=new ArrayList<>();
         try{
             pgMaintainTypeList=pgMaintainTypeManager.getMaintainType();
             if(pgMaintainTypeList!=null&&pgMaintainTypeList.size()!=0)
                 msg="不存在运维类别";
-            else
-                msg="运维类别获取成功";
+            else {
+                code="200";
+                msg = "运维类别获取成功";
+            }
         }
         catch(Exception ex)
         {
             ex.printStackTrace();
             msg="运维类别获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgMaintainTypeList);
 
@@ -65,10 +69,11 @@
         Map<String,Object> resultMap=new HashMap<>();
 
         String msg = "";
+        String code="0";
         List<PgMaintainTypeDto> pgMaintainTypeDtoList=new ArrayList<PgMaintainTypeDto>();
         try{
             pgMaintainTypeDtoList=pgMaintainTypeManager.getMaintainTypeModel(type);
-
+            code="200";
             msg="维护类型获取成功";
         }
         catch(Exception ex)
@@ -77,9 +82,9 @@
             msg="维护类型获取失败";
         }
 
-        resultMap.put("result",pgMaintainTypeDtoList);
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgMaintainTypeDtoList);
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java
index d735cc9..82ffca4 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java
@@ -33,12 +33,16 @@
                                                  @FormParam("endTime") String endTime){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
         List<PgMaintanceRecordHeadDto> pgMaintanceRecordHeadDtoList=new ArrayList<>();
         try{
             pgMaintanceRecordHeadDtoList=pgMaintanceRecordHeadManager.getPgMaintanceRecordHeadLsit(repairMan,startTime,endTime);
             if(pgMaintanceRecordHeadDtoList!=null&&pgMaintanceRecordHeadDtoList.size()!=0)
+            {
+                code="200";
                 msg="维护信息获取成功";
+            }
             else
                 msg="不存在维护信息";
         }
@@ -47,6 +51,7 @@
             msg="巡检信息获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgMaintanceRecordHeadDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java
index effc9df..9f46fc8 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java
@@ -32,12 +32,16 @@
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
         String result="";
+        String code="0";
 
         List<PgMaintanceRecordHeadStatic> pgMaintanceRecordHeadStaticList=new ArrayList<>();
         try{
             pgMaintanceRecordHeadStaticList=pgMaintanceRecordHeadManager.getPgMaintanceRecordHeadStaticLisByTime(startTime,endTime,staticType);
             if(pgMaintanceRecordHeadStaticList!=null&&pgMaintanceRecordHeadStaticList.size()!=0)
+            {
+                code="200";
                 msg="维护统计信息获取成功";
+            }
             else
                 msg="维护统计失败";
         }
@@ -46,7 +50,7 @@
             ex.printStackTrace();
             msg="统计失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgMaintanceRecordHeadStaticList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java b/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java
index 3a67bf3..6a5f4dc 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java
@@ -39,27 +39,31 @@
     @Path("getO2InfoByDevAndDate")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getO2InfoByDevAndDate(@FormParam("assetCode") String assetCode,
-                                                      @FormParam("startDate") String startDate,
-                                                      @FormParam("endDate") String endDate)throws Exception {
+                                                     @FormParam("startDate") String startDate,
+                                                     @FormParam("endDate") String endDate)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgHistoryDataDto> pgHistoryDataDtoList=new ArrayList<>();
 
         try {
             PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
                 msg="设备不存在";
-            else{
-                pgHistoryDataDtoList=pgO2Manager.getAllO2Data(pgDevice, startDate, endDate);
-                if(pgHistoryDataDtoList==null)
-                    msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+            else {
+                pgHistoryDataDtoList = pgO2Manager.getAllO2Data(pgDevice, startDate, endDate);
+                if (pgHistoryDataDtoList == null)
+                    msg = "没有满足要求的数据";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgHistoryDataDtoList);
         return resultMap;
@@ -75,23 +79,27 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         PgO2Dto pgO2Dto=new PgO2Dto(null);
 
         try {
             PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
                 msg="设备不存在";
-            else{
-                pgO2Dto=pgO2Manager.getNewestO2Data(pgDevice);
-                if(pgO2Dto==null)
-                    msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+            else {
+                pgO2Dto = pgO2Manager.getNewestO2Data(pgDevice);
+                if (pgO2Dto == null)
+                    msg = "没有满足要求的数据";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgO2Dto);
         return resultMap;
@@ -104,11 +112,12 @@
     @Path("addO2Data")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> addO2Data(@FormParam("devCode") String devCode,
-                                          @FormParam("upTime") String upTime,
-                                          @FormParam("o2") String o2)throws Exception {
+                                         @FormParam("upTime") String upTime,
+                                         @FormParam("o2") String o2)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
@@ -125,6 +134,7 @@
                 pgO2.setPgDeviceId(pgDevice);
 
                 pgO2Manager.save(pgO2);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -133,9 +143,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java b/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java
index 6217cde..70b3b41 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java
@@ -30,8 +30,6 @@
 public class PgOverViewRs {
 
     @Resource
-    private PgInPgPersonManager pgInPgPersonManager;
-    @Resource
     private PgInPgStatusManager pgInPgStatusManager;
     @Resource
     private PgAlarmManager pgAlarmManager;
@@ -46,18 +44,21 @@
     @Path("getPersonNumInPgByMonth")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<Object, String> getMonthInPgPersonNum() throws Exception {
-        Map<Object, String> resultMap = new HashMap<Object, String>();
+        Map<Object, String> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         int inNum = 0;
 
         try {
             inNum = pgInPgStatusManager.getMonthInPgPersonNum();
+            code="200";
             msg = "本月入廊人员次数获取成功";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "本月入廊人员次数获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", String.valueOf(inNum));
 
@@ -73,15 +74,18 @@
     public Map<Object, String> getWeekInPgPersonNum() throws Exception {
         Map<Object, String> resultMap = new HashMap<Object, String>();
         String msg = "";
+        String code="0";
         int inNum = 0;
         try {
             inNum = pgInPgStatusManager.getWeekInPgPersonNum();
+            code="200";
             msg = "本周入廊人员次数获取成功";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "本周入廊人员次数获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", String.valueOf(inNum));
 
@@ -97,19 +101,22 @@
     public Map<String, Object> getDayInPgStatistic() throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<>();
         try {
             pgInPgInfoDtoList = pgInPgStatusManager.getPgInPersonListByDay();
             if (pgInPgInfoDtoList == null)
                 msg = "信息获取失败";
-            else
+            else {
+                code="200";
                 msg = "信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "信息获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
         return resultMap;
@@ -124,18 +131,23 @@
     public Map<String, Object> getTodayInPgInfo() throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
 
         List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<PgInPgInfoDto>();
         try {
             pgInPgInfoDtoList = pgInPgStatusManager.getTodayInPgInfo();
             if(pgInPgInfoDtoList!=null||pgInPgInfoDtoList.size()!=0)
+            {
+                code="200";
                 msg = "信息获取成功";
+            }
             else
                 msg="当天没有入廊人员信息";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
 
@@ -149,18 +161,22 @@
     public Map<String, Object> getAlarmNum(@FormParam("isDevFault") String isDevFault) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         int num = 0;
 
         try {
             if(isDevFault!=null){
                 num = pgAlarmManager.getAlarmNum(isDevFault);
-                msg = "报警数量获取成功";}
+                msg = "报警数量获取成功";
+                code="200";
+            }
             else
                 msg="请输入统计参数";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警数量统计失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", num);
 
@@ -176,16 +192,18 @@
     public Map<Object, String> getMonthAlarmNum(@FormParam("isDevFault") String isDevFault) throws Exception {
         Map<Object, String> resultMap = new HashMap<Object, String>();
         String msg = "";
+        String code="0";
         int inNum = 0;
 
         try {
-                inNum = pgAlarmManager.getMonthAlarmNum(isDevFault);
-                msg = "报警次数获取成功";
+            inNum = pgAlarmManager.getMonthAlarmNum(isDevFault);
+            code="200";
+            msg = "报警次数获取成功";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警次数获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", String.valueOf(inNum));
 
@@ -201,15 +219,17 @@
     public Map<Object, String> getWeekAlarmNum(@FormParam("isDevFault") String isDevFault) throws Exception {
         Map<Object, String> resultMap = new HashMap<Object, String>();
         String msg = "";
+        String code="0";
         int inNum = 0;
         try {
             inNum = pgAlarmManager.getWeekAlarmNum(isDevFault);
+            code="200";
             msg = "报警次数获取成功";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警次数获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", String.valueOf(inNum));
 
@@ -225,14 +245,17 @@
     public Map<String, Object> getDayAlarmStatistic() throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgAlarmTjDto> pgAlarmTjDtoList = new ArrayList<PgAlarmTjDto>();
         try {
             pgAlarmTjDtoList = pgAlarmManager.getDayAlarmStatistic();
             if (pgAlarmTjDtoList == null)
                 msg = "信息获取失败";
-            else
+            else {
+                code="200";
                 msg = "信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "信息获取失败";
@@ -252,9 +275,11 @@
     public Map<String, Object> getAlarmList(@FormParam("isDevFault") String isDevFault) throws Exception{
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         List<PgAlarmDto> pgAlarmDtoList=new ArrayList<>();
         try{
             pgAlarmDtoList=pgAlarmManager.getAlarmList(isDevFault);
+            code="200";
             msg="信息获取成功";
         }
         catch(Exception e)
@@ -262,6 +287,7 @@
             e.printStackTrace();
             msg="信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAlarmDtoList);
 
@@ -278,17 +304,19 @@
     public Map<String,Object> getConstructionNum() throws Exception{
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgConstructionTypeNumStatisticDto> pgConstructionTypeNumDtoList=new ArrayList<PgConstructionTypeNumStatisticDto>();
         try{
             pgConstructionTypeNumDtoList=pgConstructionManager.getConstructionNum();
             msg="施工数量获取成功";
+            code="200";
         }
         catch(Exception e)
         {
             e.printStackTrace();
             msg="施工数量统计";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionTypeNumDtoList);
 
@@ -302,21 +330,25 @@
     @Path("getConstructionToday")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> getConstructionToday() throws Exception{
-        Map<String,Object > resultMap = new HashMap<String,Object>();
+        Map<String,Object > resultMap = new HashMap<>();
         String msg = "";
-        List<PgConstructionDto> pgConstructionDtoList=new ArrayList<PgConstructionDto>();
+        String code="0";
+        List<PgConstructionDto> pgConstructionDtoList=new ArrayList<>();
         try {
             pgConstructionDtoList = pgConstructionManager.getConstructionToday();
-            if (pgConstructionDtoList == null&&pgConstructionDtoList.size()==0)
+            if (pgConstructionDtoList == null && pgConstructionDtoList.size() == 0)
                 msg = "不存在施工信息";
-            else
+            else {
+                code="200";
                 msg = "施工信息获取成功";
+            }
         }
         catch(Exception e)
         {
             e.printStackTrace();
             msg="施工信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java b/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java
index d3c10d4..31ffcfc 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java
@@ -48,6 +48,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 
         try {
@@ -66,9 +67,9 @@
                 pgPartition.setMaterial(material);
                 pgPartition.setActive(1);
 
-                logger.info("成功保存");
                 pgPartitionManager.save(pgPartition);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
         } catch (Exception e) {
@@ -76,9 +77,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
         return resultMap;
     }
     /*
@@ -100,6 +101,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         PgPartition partition = new PgPartition();
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
@@ -122,6 +124,7 @@
 
                 pgPartitionManager.save(pgPartition);
                 result = "true";
+                code="200";
                 msg = "编辑成功";
             }
 
@@ -131,8 +134,10 @@
             e.printStackTrace();
         }
 
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
+
         return resultMap;
     }
 
@@ -147,7 +152,8 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
-        String result="false";
+        String result="";
+        String code="0";
 
         try {
             PgPartition pgPartition=pgPartitionManager.get(Long.valueOf(id));
@@ -161,12 +167,14 @@
                 pgPartitionManager.save(pgPartition);
                 msg="分区删除成功";
                 result="true";
+                code="200";
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="分区删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -181,14 +189,17 @@
     public Map<String, Object> getPartition() throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgPartitionDto> pgPartitionDtoList = new ArrayList<PgPartitionDto>();
         try {
             pgPartitionDtoList = pgPartitionManager.getPgPartitionDtoList();
+            code="200";
             msg = "获取成功";
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgPartitionDtoList);
         return resultMap;
@@ -203,14 +214,17 @@
     public Map<String, Object> getPartitionListByName(@FormParam("parName") String parName) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgPartitionDto> pgPartitionDtoList = new ArrayList<PgPartitionDto>();
         try {
             pgPartitionDtoList = pgPartitionManager.getPartitionByName(parName);
+            code="200";
             msg = "获取成功";
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgPartitionDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java b/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java
index 883adf9..cf81b72 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java
@@ -37,6 +37,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
         PgRoad pgRoad=pgRoadManager.getPgRoadByName(road);
         try {
             PgPileAcu pgPileAcu=new PgPileAcu();
@@ -49,6 +50,7 @@
             pgPileAcu.setActive(true);
 
             pgPileAcuManager.save(pgPileAcu);
+            code="200";
             result="true";
             msg="保存成功";
         } catch (Exception e) {
@@ -56,9 +58,10 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
+
         return resultMap;
     }
 
@@ -73,6 +76,7 @@
 
         String result="";
         String msg="";
+        String code="0";
         try{
             PgPileAcu pgPileAcu=pgPileAcuManager.get(id);
             if(pgPileAcu==null){
@@ -83,7 +87,7 @@
             {
                 pgPileAcu.setActive(false);
                 pgPileAcuManager.save(pgPileAcu);
-
+                code="200";
                 result="true";
                 msg="桩号删除成功";
             }
@@ -94,8 +98,9 @@
             ex.printStackTrace();
         }
 
-        resultMap.put("result",result);
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
+        resultMap.put("result",result);
 
         return resultMap;
     }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPileRs.java b/src/main/java/com/casic/PgInterface/rs/PgPileRs.java
index cf62954..c9999ac 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgPileRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgPileRs.java
@@ -33,6 +33,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             PgPile pgPile=new PgPile();
@@ -40,6 +41,7 @@
             pgPile.setActive(true);
 
             pgPileManager.save(pgPile);
+            code="200";
             result="true";
             msg="保存成功";
         } catch (Exception e) {
@@ -47,9 +49,10 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
+
         return resultMap;
     }
 
@@ -64,9 +67,10 @@
         Map<String,Object> resultMap=new HashMap<>();
         List<PgPileDTO> pgPileDTOList=new ArrayList<>();
         String msg="";
+        String code="0";
         try{
             pgPileDTOList=pgPileManager.getPgPileDTOList();
-
+            code="200";
             msg="获取成功";
         }
         catch(Exception ex){
@@ -74,8 +78,9 @@
             msg="获取成失败";
             ex.printStackTrace();
         }
-        resultMap.put("result",pgPileDTOList);
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
+        resultMap.put("result",pgPileDTOList);
 
         return resultMap;
     }
@@ -91,6 +96,7 @@
 
         String result="";
         String msg="";
+        String code="0";
         try{
             PgPile pgPile=pgPileManager.get(id);
             if(pgPile==null){
@@ -101,7 +107,7 @@
             {
                 pgPile.setActive(false);
                 pgPileManager.save(pgPile);
-
+                code="200";
                 result="true";
                 msg="桩号删除成功";
             }
@@ -111,9 +117,9 @@
             msg="桩号删除失败";
             ex.printStackTrace();
         }
-
-        resultMap.put("result",result);
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
+        resultMap.put("result",result);
 
         return resultMap;
     }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
index 6ee63ff..63b5597 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
@@ -53,10 +53,12 @@
         try {
                resultMap = pgPipeLineManager.addPipeLine(lineCode,lineType,secRow,secColumn,pileAcuList);
                resultMap.put("msg","提交成功");
+               resultMap.put("code","200");
                resultMap.put("result","true");
 
         } catch (Exception e) {
             e.printStackTrace();
+            resultMap.put("code","0");
             resultMap.put("result","false");
             resultMap.put("msg","提交失败");
             return  resultMap;
@@ -74,14 +76,17 @@
     public Map<String, Object> getPipeLineByLineType(@FormParam("lineType") String lineType) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgPipeLineDto> pgPipeLineDtoList=new ArrayList<PgPipeLineDto>();
         try {
             pgPipeLineDtoList = pgPipeLineManager.getPipeLineByLineType(lineType);
+            code="200";
             msg = "获取成功";
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgPipeLineDtoList);
         return resultMap;
@@ -96,6 +101,7 @@
     public Map<String, Object> getPipeLineByName(@FormParam("lineCode") String lineCode) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         PgPipeLineDto pgPipeLineDto=null;
         try {
             PgPipeLine pgPipeLine = pgPipeLineManager.getPipeLineBylineName(lineCode);
@@ -103,12 +109,14 @@
                 msg="不存在："+lineCode;
             else {
                 pgPipeLineDto = new PgPipeLineDto(pgPipeLine);
+                code="200";
                 msg = "获取成功";
             }
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgPipeLineDto);
         return resultMap;
@@ -123,15 +131,18 @@
     public Map<String,Object> getPipeLengthStatic()throws Exception{
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         List<PgPipeLineLengthStatic> pgPipeLineLengthStaticList=new ArrayList<PgPipeLineLengthStatic>();
         try {
             pgPipeLineLengthStaticList = pgPipeLineManager.getPipeLengthByName();
+            code="200";
             msg="管线长度获取成功";
         }catch(Exception e)
         {
             e.printStackTrace();
             msg="管线长度统计失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgPipeLineLengthStaticList);
 
@@ -147,14 +158,17 @@
     public Map<String, Object> getPipeLineType() throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgPipeLineTypeDto> pgPipeLineTypeDtoList=new ArrayList<PgPipeLineTypeDto>();
         try {
             pgPipeLineTypeDtoList = pgPipeLineManager.getPipeType();
+            code="200";
             msg = "获取成功";
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgPipeLineTypeDtoList);
         return resultMap;
@@ -170,20 +184,24 @@
         Map<String,Object> resultMap=new HashMap<String, Object>();
 
         String msg="";
+        String code="0";
         List<PgPipeLineTypeNumDto> pgPipeLineTypeNumDtoList=new ArrayList<PgPipeLineTypeNumDto>();
 
-        try{
-            pgPipeLineTypeNumDtoList=pgPipeLineManager.getPipeTypeNum();
+        try {
+            pgPipeLineTypeNumDtoList = pgPipeLineManager.getPipeTypeNum();
 
-            if(pgPipeLineTypeNumDtoList==null)
-                msg="不存在管线类型占比";
-            else
-                msg="管线占比获取成功";
+            if (pgPipeLineTypeNumDtoList == null)
+                msg = "不存在管线类型占比";
+            else {
+                code="200";
+                msg = "管线占比获取成功";
+            }
         }
         catch (Exception e){
             msg="管线占比数量获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgPipeLineTypeNumDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java
index 672b376..7042994 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java
@@ -43,17 +43,21 @@
     public Map<String,Object> getReservePlan() {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgReservePlanDto> pgReservePlanDtoList = new ArrayList<PgReservePlanDto>();
         try {
             pgReservePlanDtoList = pgReservePlanManager.getPgReservePlanDto();
             if (pgReservePlanDtoList == null)
                 msg = "不存在预案信息";
-            else
+            else {
+                code="200";
                 msg = "预案信息获取成功";
-        } catch (Exception e) {
+            }
+        }catch (Exception e) {
             e.printStackTrace();
             msg = "预案信息获取是失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgReservePlanDtoList);
         return resultMap;
@@ -66,6 +70,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
 
         String msg = "";
+        String code="0";
         ResponseEntity<byte[]> path = null;
         try {
             PgReservePlan pgReservePlan = pgReservePlanManager.get(Long.valueOf(id));
@@ -73,15 +78,17 @@
 
             if (path == null)
                 msg = "不存在该文档";
-            else
+            else {
+                code="200";
                 msg = "下载成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "下载失败";
         }
-
-        resultMap.put("result", path.getBody());
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", path.getBody());
         return resultMap;
     }
     /*
@@ -99,6 +106,7 @@
         Map<String,Object> resultMap=new HashMap<String, Object>();
         String msg="";
         String result="";
+        String code="0";
 
         try {
             PgReservePlan pgReservePlan = new PgReservePlan();
@@ -124,6 +132,7 @@
                 pgReservePlanManager.save(pgReservePlan);
                 msg = "新增成功";
                 result = "true";
+                code="200";
             }
         }
         catch(Exception e)
@@ -133,6 +142,7 @@
             result="false";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -152,6 +162,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             PgReservePlan pgReservePlan=pgReservePlanManager.get(Long.valueOf(id));
@@ -177,6 +188,7 @@
 
                     pgReservePlanManager.save(pgReservePlan);
 
+                    code="200";
                     result = "true";
                     msg = "编辑成功";
                 }
@@ -187,6 +199,7 @@
             msg = "编辑失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -201,6 +214,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
         String result="";
+        String code="0";
 
         try{
 
@@ -214,6 +228,7 @@
                 pgReservePlan.setActive(0);;
                 pgReservePlanManager.save(pgReservePlan);
                 result="true";
+                code="200";
                 msg="删除成功";
             }
         }
@@ -224,6 +239,7 @@
             result="false";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 25ded8a..283d7ab 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,20 +7,56 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" 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/construction/manager/PgCsDocumentManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/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/manager/PgAlarmManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/~$说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/~$说明20191207.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.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$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/接口说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明20191207.docx" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
@@ -51,7 +87,7 @@
         <counts>
           <entry key="class" value="4" />
           <entry key="iml" value="2" />
-          <entry key="java" value="707" />
+          <entry key="java" value="820" />
           <entry key="properties" value="14" />
           <entry key="xml" value="7" />
         </counts>
@@ -60,7 +96,7 @@
         <counts>
           <entry key="CLASS" value="4" />
           <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="707" />
+          <entry key="JAVA" value="820" />
           <entry key="Properties" value="14" />
           <entry key="XML" value="7" />
         </counts>
@@ -68,32 +104,32 @@
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
           <entry key="dummy" value="38" />
-          <entry key="java" value="30161" />
+          <entry key="java" value="40859" />
           <entry key="properties" value="100" />
-          <entry key="txt" value="176" />
+          <entry key="txt" value="186" />
           <entry key="xml" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="30161" />
-          <entry key="PLAIN_TEXT" value="214" />
+          <entry key="JAVA" value="40859" />
+          <entry key="PLAIN_TEXT" value="224" />
           <entry key="Properties" value="100" />
           <entry key="XML" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="48" />
+          <entry key="project.closed" value="51" />
           <entry key="project.open.time.1" value="5" />
           <entry key="project.open.time.12" value="2" />
           <entry key="project.open.time.13" value="1" />
           <entry key="project.open.time.15" value="1" />
           <entry key="project.open.time.16" value="1" />
           <entry key="project.open.time.17" value="1" />
-          <entry key="project.open.time.2" value="1" />
+          <entry key="project.open.time.2" value="2" />
           <entry key="project.open.time.20" value="1" />
-          <entry key="project.open.time.23" value="1" />
+          <entry key="project.open.time.23" value="2" />
           <entry key="project.open.time.24" value="2" />
           <entry key="project.open.time.251" value="1" />
           <entry key="project.open.time.27" value="2" />
@@ -106,8 +142,8 @@
           <entry key="project.open.time.36" value="1" />
           <entry key="project.open.time.37" value="1" />
           <entry key="project.open.time.39" value="2" />
-          <entry key="project.open.time.4" value="2" />
-          <entry key="project.open.time.40" value="1" />
+          <entry key="project.open.time.4" value="3" />
+          <entry key="project.open.time.40" value="2" />
           <entry key="project.open.time.41" value="2" />
           <entry key="project.open.time.42" value="2" />
           <entry key="project.open.time.43" value="2" />
@@ -122,23 +158,25 @@
           <entry key="project.open.time.6" value="3" />
           <entry key="project.open.time.63" value="2" />
           <entry key="project.open.time.64" value="1" />
+          <entry key="project.open.time.66" value="1" />
           <entry key="project.open.time.71" value="2" />
+          <entry key="project.open.time.74" value="1" />
           <entry key="project.open.time.76" value="1" />
           <entry key="project.open.time.8" value="2" />
           <entry key="project.open.time.9" value="1" />
           <entry key="project.open.time.97" value="1" />
-          <entry key="project.opened" value="78" />
+          <entry key="project.opened" value="84" />
         </counts>
       </usages-collector>
     </session>
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+            <state relative-caret-position="396">
+              <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
               <folding>
                 <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
                 <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -147,73 +185,6 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <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="99">
-              <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-              <folding>
-                <element signature="imports" expanded="true" />
-                <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-1170">
-              <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state>
-              <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
-              <folding>
-                <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-                <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="true">
-        <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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-              <folding>
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-                <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>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <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="352">
-              <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -225,18 +196,9 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>inCriteria</find>
-      <find>getPgPlanResulList</find>
-      <find>getPileAcuListByPileAcuStr</find>
-      <find>distinct</find>
-      <find>order</find>
-      <find>canPlanLine</find>
-      <find>isExistLine</find>
-      <find>getPlanResult</find>
       <find>pgPipeLine</find>
       <find>getPipeLineBylineName</find>
       <find>StringU</find>
-      <find>getAllAlarm</find>
       <find>getAlarmList</find>
       <find>getPgInPersonListByDay</find>
       <find>getDayInPgStatistic</find>
@@ -254,7 +216,16 @@
       <find>getPgContructionByNameOrType</find>
       <find>&quot;&quot;,&quot;&quot;,</find>
       <find>getPgContructionDtoByNameOrType</find>
+      <find>addConstruction</find>
+      <find>getPgLineAcuHole</find>
+      <find>getPlanResult</find>
       <find>getConstruction</find>
+      <find>addPipeLine</find>
+      <find>未找到入廊数据</find>
+      <find>getCurrentHoleByAcu</find>
+      <find>getAllAlarm</find>
+      <find>getPgDeviceDtoListByPartition</find>
+      <find>getPgDeviceByDevType</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -263,57 +234,57 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlan.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileHoleManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/planData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/PlanData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
       </list>
     </option>
   </component>
@@ -359,7 +330,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -421,53 +391,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="dto" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="manager" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -479,29 +402,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="rs" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -516,6 +416,7 @@
         </subPane>
       </pane>
       <pane id="Scope" />
+      <pane id="PackagesPane" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -710,7 +611,13 @@
       <workItem from="1574902733573" duration="1829000" />
       <workItem from="1574998240004" duration="7016000" />
       <workItem from="1575247959683" duration="6997000" />
-      <workItem from="1575704345590" duration="40473000" />
+      <workItem from="1575704345590" duration="69381000" />
+      <workItem from="1575869479666" duration="721000" />
+      <workItem from="1575947104878" duration="6101000" />
+      <workItem from="1576128264436" duration="3347000" />
+      <workItem from="1576208571543" duration="22000" />
+      <workItem from="1576227513917" duration="862000" />
+      <workItem from="1576293721220" duration="18246000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -817,11 +724,18 @@
       <option name="project" value="LOCAL" />
       <updated>1575775489149</updated>
     </task>
-    <option name="localTasksCounter" value="16" />
+    <task id="LOCAL-00016" summary="整改施工信息">
+      <created>1575791780774</created>
+      <option name="number" value="00016" />
+      <option name="presentableId" value="LOCAL-00016" />
+      <option name="project" value="LOCAL" />
+      <updated>1575791780774</updated>
+    </task>
+    <option name="localTasksCounter" value="17" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="452131000" />
+    <option name="totallyTimeSpent" value="510338000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -834,9 +748,8 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
-    <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.24205749" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2647504" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -847,7 +760,7 @@
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.3295082" />
       <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.4819672" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.65737706" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.3295082" />
@@ -939,7 +852,8 @@
     <MESSAGE value="重新设计智能规划部分" />
     <MESSAGE value="完成智能规划对接" />
     <MESSAGE value="修改报警统计" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改报警统计" />
+    <MESSAGE value="整改施工信息" />
+    <option name="LAST_COMMIT_MESSAGE" value="整改施工信息" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -951,16 +865,10 @@
           <option name="timeStamp" value="3" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java</url>
-          <line>69</line>
+          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java</url>
+          <line>40</line>
           <properties />
-          <option name="timeStamp" value="21" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java</url>
-          <line>96</line>
-          <properties />
-          <option name="timeStamp" value="38" />
+          <option name="timeStamp" value="122" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
@@ -970,394 +878,452 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <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="2068">
-          <caret line="154" column="35" selection-start-line="154" selection-start-column="35" selection-end-line="154" selection-end-column="35" />
-        </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="3300">
-          <caret line="297" column="22" selection-start-line="297" selection-start-column="22" selection-end-line="297" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/StringUtils.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
-          <caret line="13" column="48" lean-forward="true" selection-start-line="13" selection-start-column="48" selection-end-line="13" selection-end-column="48" />
+          <caret line="11" column="5" selection-start-line="11" selection-start-column="5" selection-end-line="11" selection-end-column="5" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="78" lean-forward="true" selection-start-line="78" selection-end-line="78" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="616">
-          <caret line="41" column="1" selection-start-line="41" selection-start-column="1" selection-end-line="41" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="110">
-          <caret line="12" column="23" selection-start-line="12" selection-start-column="23" selection-end-line="12" selection-end-column="23" />
+        <state relative-caret-position="516">
+          <caret line="114" column="12" selection-start-line="114" selection-start-column="12" selection-end-line="114" selection-end-column="12" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="164">
-          <caret line="56" lean-forward="true" selection-start-line="56" selection-end-line="56" />
+        <state relative-caret-position="418">
+          <caret line="33" column="44" selection-start-line="33" selection-start-column="44" selection-end-line="33" selection-end-column="44" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="258">
-          <caret line="27" column="12" lean-forward="true" selection-start-line="27" selection-start-column="12" selection-end-line="27" selection-end-column="12" />
+        <state relative-caret-position="132">
+          <caret line="11" column="20" lean-forward="true" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="20" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.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="-12">
-          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        <state relative-caret-position="516">
+          <caret line="142" column="54" selection-start-line="142" selection-start-column="54" selection-end-line="142" selection-end-column="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="858">
-          <caret line="55" column="27" lean-forward="true" selection-start-line="55" selection-start-column="27" selection-end-line="55" selection-end-column="27" />
+        <state relative-caret-position="66">
+          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="58">
+          <caret line="18" column="28" selection-start-line="18" selection-start-column="19" selection-end-line="18" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="305">
+          <caret line="24" column="31" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="714">
+          <caret line="58" column="5" lean-forward="true" selection-start-line="58" selection-start-column="5" selection-end-line="58" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="924">
+          <caret line="134" column="92" selection-start-line="134" selection-start-column="92" selection-end-line="134" selection-end-column="92" />
+          <folding>
+            <element signature="method#linkDevice#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkPartitionCamera#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkReservePlan#0;class#PgAlarmLinkRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1066">
+          <caret line="90" lean-forward="true" selection-start-line="90" selection-end-line="90" />
+          <folding>
+            <element signature="method#getTjResultByAlarmType#0;class#PgAlarmTjRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="946">
+          <caret line="148" column="11" lean-forward="true" selection-start-line="148" selection-start-column="11" selection-end-line="148" selection-end-column="11" />
+          <folding>
+            <element signature="method#getAlarmTypeList#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#addAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#editAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#deleteAlarmType#0;class#PgAlarmTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="208">
+          <caret line="46" column="23" lean-forward="true" selection-start-line="46" selection-start-column="23" selection-end-line="46" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="113" column="9" lean-forward="true" selection-start-line="113" selection-start-column="9" selection-end-line="113" selection-end-column="9" />
+          <folding>
+            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
+            <element signature="method#getNewestCh4InfoByDev#0;class#PgCh4Rs#0" />
+            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="145" column="6" lean-forward="true" selection-start-line="145" selection-start-column="6" selection-end-line="145" selection-end-column="6" />
+          <folding>
+            <element signature="method#addAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#editAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#deleteAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#getAuthorityList#0;class#PgAuthorityRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="58" column="1" lean-forward="true" selection-start-line="58" selection-start-column="1" selection-end-line="58" selection-end-column="1" />
+          <folding>
+            <element signature="method#getPgAssetPlanList#0;class#PgAssetPlanRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="370">
+          <caret line="371" column="66" selection-start-line="371" selection-start-column="66" selection-end-line="371" selection-end-column="66" />
+          <folding>
+            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#searchConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionDev#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="139" column="13" lean-forward="true" selection-start-line="139" selection-start-column="13" selection-end-line="139" selection-end-column="13" />
+          <folding>
+            <element signature="method#getCoInfoByDevAndDate#0;class#PgCoRs#0" />
+            <element signature="method#getNewestCoInfoByDev#0;class#PgCoRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="540">
+          <caret line="223" column="5" lean-forward="true" selection-start-line="223" selection-start-column="5" selection-end-line="223" selection-end-column="5" />
+          <folding>
+            <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="682">
+          <caret line="100" lean-forward="true" selection-start-line="100" selection-end-line="100" />
+          <folding>
+            <element signature="method#getDeviceTpeyList#0;class#PgDeviceTypeRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="377">
+          <caret line="225" column="35" selection-start-line="225" selection-start-column="35" selection-end-line="225" selection-end-column="35" />
+          <folding>
+            <element signature="method#addEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#addEquipment#1;class#PgEquipmentRs#0" />
+            <element signature="method#getEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#deleteEquipment#0;class#PgEquipmentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="406">
+          <caret line="109" lean-forward="true" selection-start-line="109" selection-end-line="109" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="154">
+          <caret line="28" column="19" selection-start-line="28" selection-start-column="19" selection-end-line="28" selection-end-column="19" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="748">
-          <caret line="49" column="5" lean-forward="true" selection-start-line="49" selection-start-column="5" selection-end-line="49" selection-end-column="5" />
+        <state relative-caret-position="296">
+          <caret line="161" column="35" selection-start-line="161" selection-start-column="35" selection-end-line="161" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="384">
+          <caret line="99" column="5" lean-forward="true" selection-start-line="99" selection-start-column="5" selection-end-line="99" selection-end-column="5" />
+        </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="362">
+          <caret line="340" column="35" selection-start-line="340" selection-start-column="35" selection-end-line="340" selection-end-column="35" />
+          <folding>
+            <element signature="method#addInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPersonInPg#0;class#PgInPgPersonRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-606">
+          <caret line="76" column="20" lean-forward="true" selection-start-line="76" selection-start-column="20" selection-end-line="76" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="65" column="35" selection-start-line="65" selection-start-column="35" selection-end-line="65" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="101" column="35" selection-start-line="101" selection-start-column="35" selection-end-line="101" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="84" column="35" selection-start-line="84" selection-start-column="35" selection-end-line="84" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="59" lean-forward="true" selection-start-line="59" selection-end-line="59" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="60" column="1" lean-forward="true" selection-start-line="60" selection-start-column="1" selection-end-line="60" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="145" column="35" selection-start-line="145" selection-start-column="35" selection-end-line="145" selection-end-column="35" />
+        </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="274">
+          <caret line="350" column="35" selection-start-line="350" selection-start-column="35" selection-end-line="350" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="121" column="39" selection-start-line="121" selection-start-column="39" selection-end-line="121" selection-end-column="39" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="28" column="8" lean-forward="true" selection-start-line="28" selection-start-column="8" selection-end-line="28" selection-end-column="8" />
+        <state relative-caret-position="340">
+          <caret line="103" selection-start-line="103" selection-end-line="103" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="226" column="35" selection-start-line="226" selection-start-column="35" selection-end-line="226" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="203" column="35" selection-start-line="203" selection-start-column="35" selection-end-line="203" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="241" column="35" selection-start-line="241" selection-start-column="35" selection-end-line="241" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="225" column="1" lean-forward="true" selection-start-line="225" selection-start-column="1" selection-end-line="225" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="176" column="5" lean-forward="true" selection-start-line="176" selection-start-column="5" selection-end-line="176" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="178" column="35" lean-forward="true" selection-start-line="178" selection-start-column="35" selection-end-line="178" selection-end-column="35" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="516">
-          <caret line="94" column="53" selection-start-line="94" selection-start-column="53" selection-end-line="94" selection-end-column="53" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="814">
-          <caret line="52" column="9" lean-forward="true" selection-start-line="52" selection-start-column="9" selection-end-line="52" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="182">
-          <caret line="58" column="12" lean-forward="true" selection-start-line="58" selection-start-column="12" selection-end-line="58" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="34" lean-forward="true" selection-start-line="34" selection-end-line="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="32" lean-forward="true" selection-start-line="32" selection-end-line="32" />
-          <folding>
-            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
-            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="185">
-          <caret line="63" column="13" selection-start-line="63" selection-start-column="13" selection-end-line="63" selection-end-column="13" />
-          <folding>
-            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
-            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
-            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="e#6319#6324#0" />
-            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
-          </folding>
+          <caret line="240" lean-forward="true" selection-start-line="240" selection-end-line="240" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
-          <caret line="58" column="28" lean-forward="true" selection-start-line="58" selection-start-column="28" selection-end-line="58" selection-end-column="28" />
-          <folding>
-            <element signature="method#addTempHumData#0;class#PgTempHumRs#0" />
-          </folding>
+        <state relative-caret-position="340">
+          <caret line="148" column="34" selection-start-line="148" selection-start-column="34" selection-end-line="148" selection-end-column="34" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
+        <state relative-caret-position="458">
+          <caret line="99" column="35" selection-start-line="99" selection-start-column="35" selection-end-line="99" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+        <state relative-caret-position="384">
+          <caret line="145" column="32" lean-forward="true" selection-start-line="145" selection-start-column="32" selection-end-line="145" selection-end-column="32" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="414">
-          <caret line="22" column="46" lean-forward="true" selection-start-line="22" selection-start-column="46" selection-end-line="22" selection-end-column="46" />
-        </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="396">
-          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" column="83" selection-start-line="11" selection-start-column="83" selection-end-line="11" selection-end-column="83" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="26">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
-          <folding>
-            <element signature="method#getPgInPgStatusByPerson#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNumByName#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNum#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPersonListByDay#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPgStatusByPgInPgPerson#0;class#PgInPgStatusManager#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="44">
-          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-12">
-          <caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="87" lean-forward="true" selection-start-line="87" selection-end-line="87" />
-          <folding>
-            <element signature="method#getConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#addConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#deleteConstructionType#0;class#PgConstructionTypeRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
-          <folding>
-            <element signature="method#getConstructionTypeByType#0;class#PgConstructionTypeManager#0" />
-            <element signature="method#getAllConstructionTypeDto#0;class#PgConstructionTypeManager#0" />
-          </folding>
-        </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="145">
-          <caret line="258" column="9" lean-forward="true" selection-start-line="258" selection-start-column="9" selection-end-line="258" selection-end-column="9" />
-          <folding>
-            <element signature="method#getMonthInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayInPgStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgOverViewRs#0" />
-            <element signature="method#getAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getMonthAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayAlarmStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgOverViewRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="103">
-          <caret line="105" column="50" lean-forward="true" selection-start-line="105" selection-start-column="50" selection-end-line="105" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateBasicDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="99">
-          <caret line="125" selection-start-line="125" selection-end-line="125" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="190">
-          <caret line="24" column="35" lean-forward="true" selection-start-line="24" selection-start-column="35" selection-end-line="24" selection-end-column="35" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="436">
-          <caret line="24" lean-forward="true" selection-start-line="24" selection-end-line="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" lean-forward="true" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="300">
-          <caret line="34" column="31" lean-forward="true" selection-start-line="34" selection-start-column="31" selection-end-line="34" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="42" column="13" lean-forward="true" selection-start-line="42" selection-start-column="13" selection-end-line="42" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="120" column="72" lean-forward="true" selection-start-line="120" selection-start-column="72" selection-end-line="120" selection-end-column="72" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="293">
-          <caret line="58" column="73" lean-forward="true" selection-start-line="58" selection-start-column="73" selection-end-line="58" selection-end-column="73" />
-          <folding>
-            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
-            <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
-          </folding>
-        </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="307">
-          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
+        <state relative-caret-position="758">
+          <caret line="130" column="5" lean-forward="true" selection-start-line="130" selection-start-column="5" selection-end-line="130" selection-end-column="5" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1170">
-          <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
+        <state relative-caret-position="494">
+          <caret line="86" column="62" lean-forward="true" selection-start-line="86" selection-start-column="62" selection-end-line="86" selection-end-column="62" />
           <folding>
-            <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-            <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+            <element signature="method#getAllDevice#0;class#PgDeviceManager#0" />
+            <element signature="method#getAllDev#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="195" column="28" lean-forward="true" selection-start-line="195" selection-start-column="28" selection-end-line="195" selection-end-column="28" />
+        <state relative-caret-position="166">
+          <caret line="174" column="13" lean-forward="true" selection-start-line="174" selection-start-column="13" selection-end-line="174" selection-end-column="13" />
           <folding>
-            <element signature="method#getAlarmByTypeAndTime#0;class#PgAlarmManager#0" />
-            <element signature="method#getAlarmNum#0;class#PgAlarmManager#0" />
             <element signature="method#getDayAlarmStatistic#0;class#PgAlarmManager#0" />
+            <element signature="method#getAlarmList#0;class#PgAlarmManager#0" />
             <element signature="method#createDTO#0;class#PgAlarmManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="364">
+          <caret line="46" column="56" lean-forward="true" selection-start-line="46" selection-start-column="56" selection-end-line="46" selection-end-column="56" />
+          <folding>
+            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
+            <element signature="method#getPgDev#0;class#PgDeviceRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
+            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+        <state relative-caret-position="396">
+          <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
           <folding>
             <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
             <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -1365,52 +1331,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="239">
-          <caret line="21" column="33" lean-forward="true" selection-start-line="21" selection-start-column="33" selection-end-line="21" selection-end-column="33" />
-        </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="352">
-          <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-        </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="99">
-          <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-          </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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-          <folding>
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-            <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>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
index c436c93..e913155 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
@@ -132,7 +132,10 @@
             this.setAlarmType("");
         else
             this.setAlarmType(pgAlarm.getAlarmTypeId().getAlarmType());
-        this.setAlarmValue(pgAlarm.getAlarmValue());
+        if(pgAlarm.getAlarmValue()==null)
+            this.setAlarmValue("");
+        else
+            this.setAlarmValue(pgAlarm.getAlarmValue());
         if (pgAlarm.getAlarmDate() != null)
             this.setAlarmDate(sdf.format(pgAlarm.getAlarmDate()));
         else
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
index a43965c..565cb41 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -159,11 +159,21 @@
     }
 
     //获取历史报警消息列表
-    public List<PgAlarmDto> getAllAlarm(String alarmType,String startDay,String endDay,String isNew,int page,int rows) {
-        try {
+    public  Map<String, Object> getAllAlarm(String alarmType,String partition,String startDay,String endDay,String isNew,int page,int rows) {
 
+        Map<String, Object> resultMap = new HashMap<>();
+        String msg="";
+
+        try {
             Criteria criteria = createCriteria(PgAlarm.class);
 
+            if (StringUtils.isNotBlank(partition)) {
+                DetachedCriteria inCriteria = DetachedCriteria.forClass(PgDevice.class);
+                inCriteria.add(Restrictions.eq("partition", partition));
+                inCriteria.setProjection(Property.forName("id"));
+                criteria.add(Property.forName("alarmDevId").in(inCriteria));
+            }
+
             if (StringUtils.isNotBlank(alarmType)&&!alarmType.contains("全部")&&pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
                 criteria.add(Restrictions.eq("alarmTypeId", pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)));
 
@@ -190,8 +200,16 @@
             for (PgAlarm pgAlarm : pgAlarmList) {
                 pgAlarmDtoList.add(new PgAlarmDto(pgAlarm));
             }
-
-            return pgAlarmDtoList;
+            if(pgAlarmDtoList==null||pgAlarmDtoList.size()==0) {
+                resultMap.put("msg", "没有报警信息");
+                resultMap.put("code","0");
+            }else {
+                resultMap.put("code","200");
+                resultMap.put("msg", "报警信息获取成功");
+            }
+            resultMap.put("count",pg.getTotalCount());
+            resultMap.put("result",pgAlarmDtoList);
+            return resultMap;
         }
         catch(Exception ex){
             ex.printStackTrace();
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index 7547560..654f49e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -24,11 +24,11 @@
 
         Criteria criteria = createCriteria(PgDevice.class);
 
-        if(road!=null)
+        if(StringUtils.isNotBlank(road))
             criteria.add(Restrictions.eq("road",road));
-        if(partition!=null)
+        if(StringUtils.isNotBlank(partition))
             criteria.add(Restrictions.eq("partition",partition));
-        if(devType!=null)
+        if(StringUtils.isNotBlank(devType))
             criteria.add(Restrictions.eq("devType",devType));
 
         criteria.add(Restrictions.eq("active", 1));
@@ -43,6 +43,29 @@
         return pgDeviceDtoList;
     }
 
+    public List<PgDeviceDto> getAllDev(String road,String partition,String devType) {
+
+        Criteria criteria = createCriteria(PgDevice.class);
+
+        if(StringUtils.isNotBlank(road))
+            criteria.add(Restrictions.eq("road",road));
+        if(StringUtils.isNotBlank(partition))
+            criteria.add(Restrictions.eq("partition",partition));
+        if(StringUtils.isNotBlank(devType))
+            criteria.add(Restrictions.like("devType","%"+devType+"%"));
+
+        criteria.add(Restrictions.eq("active", 1));
+        criteria.addOrder(Order.desc("id"));
+        List<PgDevice> pgDeviceList = criteria.list();
+
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
+        for (PgDevice pgDevice : pgDeviceList) {
+            pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
+        }
+
+        return pgDeviceDtoList;
+    }
+
     //根据名字获取当前设备
     public PgDevice getDeviceByAssetCode(String assetCode) {
         Criteria criteria=createCriteria(PgDevice.class);
@@ -56,9 +79,9 @@
     }
 
     //根据类型获取设备列表
-    public List<PgDeviceDto> getDeviceByDevTypee(String devType) {
+    public List<PgDeviceDto> getDeviceByDevType(String devType) {
         Criteria criteria=createCriteria(PgDevice.class);
-        criteria.add(Restrictions.eq("devType",devType));
+        criteria.add(Restrictions.like("devType","%"+devType+"%"));
 
         List<PgDevice> pgDeviceList=criteria.list();
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
@@ -106,7 +129,7 @@
         criteria.add(Restrictions.eq("partition",partition));
 
         List<PgDevice> pgDeviceList=criteria.list();
-        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<PgDeviceDto>();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
 
         for (PgDevice pgDevice : pgDeviceList) {
             pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
index 3a3bccd..595730e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
@@ -1,10 +1,13 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.devTable.domain.PgAlarmType;
 import com.casic.PgInterface.devTable.domain.PgPartition;
 import com.casic.PgInterface.devTable.domain.PgRoad;
 import com.casic.PgInterface.devTable.domain.PipeGallery;
 import com.casic.PgInterface.devTable.dto.PgPartitionDto;
+import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
@@ -12,7 +15,9 @@
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Created by yxw on 2017/11/4.
@@ -21,7 +26,8 @@
 public class PgPartitionManager extends HibernateEntityDao<PgPartition> {
 
     @Resource
-    PgRoadManager pgRoadManager;
+    private PgRoadManager pgRoadManager;
+
 
     public PgPartition getPartitionByParName(String parName) {
         Criteria criteria = getSession().createCriteria(PgPartition.class);
@@ -99,4 +105,5 @@
         return pgPartitionDtoList;
     }
 
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
index f216360..a6928f1 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
@@ -5,6 +5,7 @@
 public class PgPlanResultRe {
 
     private String taskKey;
+    private List<String> pileAcuList;
     private List<PgPlanResult> pgPlanResultList;
 
     public String getTaskKey() {
@@ -15,6 +16,14 @@
         this.taskKey = taskKey;
     }
 
+    public List<String> getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(List<String> pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+
     public List<PgPlanResult> getPgPlanResultList() {
         return pgPlanResultList;
     }
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
index 71ea765..47eea07 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
@@ -54,9 +54,7 @@
 
         List<PgLineHole> pgLineHoleList=criteria.list();
         List<PgLineHoleDTO> pgLineHoleDTOList=new ArrayList<>();
-        if(pgLineHoleList==null||pgLineHoleList.size()==0)
-            return null;
-        else
+        if(pgLineHoleList!=null&&pgLineHoleList.size()!=0)
             pgLineHoleDTOList=PgLineHoleDTO.ConvertToDTOList(pgLineHoleList,pgPileAcuManager,pgRoadManager);
         return pgLineHoleDTOList;
     }
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
index 0fd9e1f..841a386 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
@@ -1,12 +1,15 @@
 package com.casic.PgInterface.intelPlan.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.devTable.domain.PgPartition;
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
 import com.casic.PgInterface.intelPlan.domain.PgLineHole;
 import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
 import com.casic.PgInterface.intelPlan.domain.PgSection;
 import com.casic.PgInterface.intelPlan.dto.PgPlanResult;
 import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
 import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -22,6 +25,9 @@
     @Resource
     private PgLineHoleManager pgLineHoleManager;
 
+    @Resource
+    private PgRoadManager pgRoadManager;
+
     public PgPileAcu getPgPileAcuByCode(String acuCode){
         List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
 
@@ -58,7 +64,9 @@
         for(PgPlanTask pgPlanTask:pgPlanTaskList){
             List<PgPlanResult> pgPlanResultList=getPgPlanResultByPlantask(pgPlanTask);
             PgPlanResultRe pgPlanResultRe=new PgPlanResultRe();
+
             pgPlanResultRe.setTaskKey(pgPlanTask.getTaskKey());
+            pgPlanResultRe.setPileAcuList(pgPlanTask.getPileAcuList());
             pgPlanResultRe.setPgPlanResultList(pgPlanResultList);
 
             pgPlanResultReList.add(pgPlanResultRe);
@@ -142,4 +150,57 @@
         return length;
     }
 
+    private PgPileAcu getPgPileAcuByAcuCode(String acuCode){
+        List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
+
+        if(pgPileAcuList==null||pgPileAcuList.size()==0)
+            return null;
+        else
+            return pgPileAcuList.get(0);
+    }
+
+    public List<PgAcuTask> getACUTask(String pileAcuList){
+        String[] acuArray=pileAcuList.split(",");
+        List<PgAcuTask> pgAcuTaskList=new ArrayList<>();
+
+        for(String acu:acuArray){
+            PgPileAcu pgPileAcu=this.getPgPileAcuByCode(acu);
+            String roadName=pgRoadManager.get(pgPileAcu.getRoadId()).getRoadName();
+
+            if(!containRoad(roadName,pgAcuTaskList))
+            {
+                PgAcuTask pgAcuTask=new PgAcuTask();
+                pgAcuTask.setRoadName(roadName);
+                pgAcuTask.setPileAcuList(acu);
+                pgAcuTaskList.add(pgAcuTask);
+            }
+            else{
+                PgAcuTask pgAcuTask=getIndexRoad(roadName,pgAcuTaskList);
+                if(pgAcuTask!=null)
+                    pgAcuTask.setPileAcuList(pgAcuTask.getPileAcuList()+","+acu);
+            }
+        }
+
+        return pgAcuTaskList;
+    }
+
+    private boolean containRoad(String roadName,List<PgAcuTask> pgAcuTaskList){
+        if(pgAcuTaskList==null||pgAcuTaskList.size()==0) return false;
+        for(PgAcuTask pgAcuTask:pgAcuTaskList){
+            if(pgAcuTask.getRoadName().equals(roadName))
+                return true;
+        }
+
+        return false;
+    }
+
+    private PgAcuTask getIndexRoad(String roadName, List<PgAcuTask> pgAcuTaskList){
+        for(PgAcuTask pgAcuTask:pgAcuTaskList){
+            if(pgAcuTask.getRoadName().equals(roadName))
+                return pgAcuTask;
+        }
+
+        return null;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java
new file mode 100644
index 0000000..323f7ef
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java
@@ -0,0 +1,25 @@
+package com.casic.PgInterface.reservePlan.dto;
+
+import java.util.List;
+
+public class PgAcuTask {
+
+    private String roadName;//道路
+    private String pileAcuList;//acu分区
+
+    public String getRoadName() {
+        return roadName;
+    }
+
+    public void setRoadName(String roadName) {
+        this.roadName = roadName;
+    }
+
+    public String getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(String pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
index c25e926..c7d7693 100644
--- a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
@@ -70,9 +70,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(Long.valueOf(inPgPersonId));
         PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("hostName",pgInPgPerson.getAssetCode());
-//        PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode());
-//        long maxId = pgTagPositionManager.getMaxId(pgTagMac.getTagMac());
-//        PGTagPosition pgTagPosition = pgTagPositionManager.get(maxId);
+
         PGTagPosition pgTagPosition = tagmacRun.GetTagStatus(pgTagMac);
         boolean bExist = false;
         bExist = pgTagPositionManager.findTagPosition(pgTagPosition.getPositionUpdatetime(),pgTagPosition.getHostId());
@@ -104,8 +102,7 @@
         PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(Long.valueOf(inPgPersonId));
         PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pgInPgPersonId",pgInPgPerson);
         System.out.println("time:"+pgInPgStatus.getInTime());
-//        PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pgInPgPersonId",inPgPersonId);
-//        PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode());
+
         PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("hostName",pgInPgPerson.getAssetCode());
 
         Map<Object,Object> mapPosition = new HashMap<>();
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
index 082ba5d..3eed00a 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
@@ -48,6 +48,7 @@
     public Map<String, Object> linkDevice(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         PgDeviceDto pgDeviceDto = null;
         try {
@@ -62,6 +63,7 @@
                     else {
                         pgDeviceDto = new PgDeviceDto(pgDevice);
                         msg = "报警关联设备获取成功";
+                        code="200";
                     }
                 }
             }
@@ -71,6 +73,7 @@
             e.printStackTrace();
             msg = "获取关联设备失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceDto);
 
@@ -86,6 +89,7 @@
     public Map<String, Object> linkPartitionCamera(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
         try {
@@ -106,6 +110,7 @@
 
                         pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(partition,position);
                         msg = "关联设备获取成功";
+                        code="200";
                     }
                 }
             }
@@ -115,6 +120,7 @@
             e.printStackTrace();
             msg = "分区设备关联失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceDtoList);
         return resultMap;
@@ -129,6 +135,7 @@
     public Map<String, Object> linkReservePlan(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgReservePlanDto> pgReservePlanDtoList=new ArrayList<>();
         try{
@@ -139,10 +146,12 @@
                 else {
                     pgReservePlanDtoList = pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
 
-                    if(pgReservePlanDtoList==null||pgReservePlanDtoList.size()==0)
-                        msg="不存在关联的报警预案";
-                    else
+                    if (pgReservePlanDtoList == null || pgReservePlanDtoList.size() == 0)
+                        msg = "不存在关联的报警预案";
+                    else {
                         msg = "关联预案获取成功";
+                        code="200";
+                    }
                 }
             }
             else
@@ -153,6 +162,7 @@
             e.printStackTrace();
             msg="预案关联失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgReservePlanDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
index 0ddbc4d..0ce886b 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
@@ -41,25 +41,19 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getAlarmList(@FormParam("alarmType") String alarmType,
                                             @FormParam("startDay") String startDay,
+                                            @FormParam("partition") String partition,
                                             @FormParam("endDay") String endDay,
                                             @FormParam("isNew") String isNew,
                                             @FormParam("page") int page,
                                             @FormParam("rows") int rows) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
         try {
-            pgAlarmDtoList = pgAlarmManager.getAllAlarm(alarmType,startDay,endDay,isNew,page,rows);
-            if (pgAlarmDtoList==null||pgAlarmDtoList.size() == 0)
-                msg = "没有报警信息";
-            else
-                msg = "报警信息获取成功";
+            resultMap = pgAlarmManager.getAllAlarm(alarmType,partition,startDay,endDay,isNew,page,rows);
+
         } catch (Exception e) {
             e.printStackTrace();
-            msg = "报警信息获取失败";
         }
-        resultMap.put("msg", msg);
-        resultMap.put("result", pgAlarmDtoList);
         return resultMap;
     }
 
@@ -71,9 +65,10 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> clearAlarmList(@FormParam("id") String id) throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        String result = "false";
+        String result = "";
+        String code="0";
 
         try {
             PgAlarm pgAlarm = new PgAlarm();
@@ -86,12 +81,14 @@
                 pgAlarmManager.save(pgAlarm);
                 msg = "报警信息清除成功";
                 result = "true";
+                code = "200";
             }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警信息清除失败";
             result = "false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
@@ -106,21 +103,26 @@
     public Map<String, Object> getAlarmByTypeOrTime(@FormParam("alarmType") String alarmType,
                                                     @FormParam("startTime") String startTime,
                                                     @FormParam("endTime") String endTime) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
-        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<PgAlarmDto>();
+        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
         try {
             pgAlarmDtoList = pgAlarmManager.getAlarmByTypeAndTime(alarmType, startTime, endTime);
             if (pgAlarmDtoList == null || pgAlarmDtoList.size() == 0)
                 msg = "报警信息不存在";
             else
+            {
                 msg = "报警信息获取成功";
+                code="200";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警信息获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
index 29ce8a4..ed0bf34 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
@@ -39,8 +39,8 @@
     public Map<String, Object> getAlarmRule(@FormParam("devType") String devType) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
-        System.out.println("devType:"+devType);
         List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<>();
         try {
             pgAlarmRuleDtoList = pgAlarmRuleManager.getAlarmRuleDto(devType);
@@ -52,6 +52,7 @@
             e.printStackTrace();
             msg = "报警阈值信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmRuleDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
index 24ab894..abef1b1 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
@@ -39,16 +39,21 @@
                                                      @FormParam("endDate") String endDate)throws Exception{
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
+
         List<PgAlarmTjDto> pgAlarmTjDtoList=null;
         try{
             pgAlarmTjDtoList=pgAlarmTjManager.getAlarmTjResultByType(startDate,endDate);
             msg="获取成功";
+            code="200";
         }
         catch(Exception ex) {
             msg = "统计失败";
         }
-        resultMap.put("result",pgAlarmTjDtoList);
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
+        resultMap.put("result",pgAlarmTjDtoList);
+
         return resultMap;
     }
 
@@ -61,23 +66,27 @@
     public Map<String, Object> getAlarmByTime(@FormParam("startTime") String startTime,
                                               @FormParam("endTime") String endTime,
                                               @FormParam("statisticType") String statisticType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code = "0";
 
-        List<PgAlarmTjDto> pgAlarmTjDtoList = new ArrayList<PgAlarmTjDto>();
+        List<PgAlarmTjDto> pgAlarmTjDtoList = new ArrayList<>();
         try {
             pgAlarmTjDtoList = pgAlarmTjManager.getAlarmByTime(startTime, endTime, statisticType);
             if(pgAlarmTjDtoList==null)
                 msg="报警统计信息获取失败";
-            else
-                msg="报警统计信息获取成功";
+            else {
+                msg = "报警统计信息获取成功";
+                code="200";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警统计信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmTjDtoList);
         return resultMap;
     }
 
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
index 28bc811..b6278a9 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
@@ -30,7 +30,6 @@
     @Resource
     private PgAlarmTypeManager pgAlarmTypeManager;
 
-
     /**
      * 获取报警类型
      */
@@ -38,19 +37,24 @@
     @Path("getAlarmType")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getAlarmTypeList()throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
-        List<PgAlarmTypeDto> pgAlarmTypeDtoList=new ArrayList<PgAlarmTypeDto>();
+        String code="";
+
+        List<PgAlarmTypeDto> pgAlarmTypeDtoList=new ArrayList<>();
         try {
             pgAlarmTypeDtoList = pgAlarmTypeManager.getAllAlarmTypeDto();
             if(pgAlarmTypeDtoList.size()==0)
                 msg="没有报警类型信息";
-            else
-                msg="报警类型信息获取成功";
+            else {
+                code="200";
+                msg = "报警类型信息获取成功";
+            }
         }catch(Exception e){
             e.printStackTrace();
             msg="报警类型信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAlarmTypeDtoList);
         return resultMap;
@@ -66,6 +70,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
@@ -83,6 +88,7 @@
                 logger.info("成功保存");
                 result = "true";
                 msg = "保存成功";
+                code="200";
             }
         } catch (Exception e) {
             result = "false";
@@ -90,6 +96,7 @@
             e.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -106,6 +113,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try{
             if(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
@@ -119,6 +127,7 @@
                 pgAlarmTypeManager.save(pgAlarmType);
                 result = "true";
                 msg = "编辑成功";
+                code="200";
             }
         }
         catch(Exception e)
@@ -128,6 +137,7 @@
             e.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("result",result);
         resultMap.put("msg",msg);
 
@@ -146,6 +156,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
         String result="false";
+        String code="0";
 
         try {
             PgAlarmType pgAlarmType=pgAlarmTypeManager.get(Long.valueOf(id));
@@ -157,6 +168,7 @@
             {
                 pgAlarmType.setActive(0);
                 pgAlarmTypeManager.save(pgAlarmType);
+                code="200";
                 msg="报警类型删除成功";
                 result="true";
             }
@@ -165,6 +177,7 @@
             msg="报警类型删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
index 4533e1a..85940bb 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
@@ -33,12 +33,15 @@
                                                  @FormParam("inSpectionPlace") String inSpectionPlace){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
         List<PgAssetPlanDto> pgAssetPlanDtoList=new ArrayList<>();
         try{
             pgAssetPlanDtoList=pgAssetPlanManager.getPgAssetPlanDtoList(startDay,endDay,inSpectionPlace);
-            if(pgAssetPlanDtoList!=null&&pgAssetPlanDtoList.size()!=0)
-                msg="巡检信息获取成功";
+            if(pgAssetPlanDtoList!=null&&pgAssetPlanDtoList.size()!=0) {
+                code="200";
+                msg = "巡检信息获取成功";
+            }
             else
                 msg="不存在巡检信息";
         }
@@ -47,6 +50,7 @@
             msg="巡检信息获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAssetPlanDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
index 47ef9d1..5cbdfcb 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
@@ -30,12 +30,15 @@
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
         String result="";
+        String code="0";
 
         List<PgAssetPlanStatic> pgAssetPlanStaticList = null;
         try{
             pgAssetPlanStaticList=pgAssetPlanManager.getPgAssetPlanStaticLisByTime(startTime,endTime,staticType);
-            if(pgAssetPlanStaticList!=null&&pgAssetPlanStaticList.size()!=0)
-                msg="巡检统计信息获取成功";
+            if(pgAssetPlanStaticList!=null&&pgAssetPlanStaticList.size()!=0) {
+                code = "200";
+                msg = "巡检统计信息获取成功";
+            }
             else
                 msg="统计信息获取失败";
         }
@@ -44,6 +47,7 @@
             msg="统计失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAssetPlanStaticList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
index 26f5d6a..503bfe3 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
@@ -40,6 +40,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="";
 
         try{
             PgAuthority pgAuthority=new PgAuthority();
@@ -50,6 +51,7 @@
 
             pgAuthorityManager.save(pgAuthority);
             msg="用户权限保存成功";
+            code="200";
             result="true";
         }
         catch(Exception e) {
@@ -57,6 +59,7 @@
             msg = "新增权限失败";
             result = "false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -65,22 +68,25 @@
 
     /*
        *编辑角权限信息
-        */
+    */
     @POST
     @Path("editAuthority")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> editAuthority(@FormParam("id") String id,
                                        @FormParam("authority") String authority,
                                        @FormParam("concent") String concent) throws Exception{
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
+
         try {
             PgAuthority pgAuthority=pgAuthorityManager.get(Long.valueOf(id));
             pgAuthority.setAuthority(authority);
             pgAuthority.setConcent(concent);
 
             pgAuthorityManager.save(pgAuthority);
+            code="200";
             msg="权限保存成功";
             result="true";
         }
@@ -90,7 +96,7 @@
             msg="权限编辑失败";
             result="false";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -105,9 +111,10 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> deleteAuthority(@FormParam("id") String id)throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
-        String result="false";
+        String result="";
+        String code="0";
 
         try {
             PgAuthority pgAuthority= pgAuthorityManager.get(Long.valueOf(id));
@@ -119,6 +126,7 @@
             {
                 pgAuthority.setActive(0);
                 pgAuthorityManager.save(pgAuthority);
+                code="200";
                 msg="删除权限成功";
                 result="true";
             }
@@ -127,37 +135,40 @@
             msg="删除权限失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
     }
 
     /*
-* 获取权限信息
- */
+    * 获取权限信息
+    */
     @POST
     @Path("getAuthorityList")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> getAuthorityList() {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgAuthorityDto> pgAuthorityDtoList = new ArrayList<PgAuthorityDto>();
         try {
             pgAuthorityDtoList = pgAuthorityManager.getAuthorityList();
             if (pgAuthorityDtoList == null)
                 msg = "不存在权限信息";
-            else
+            else {
+                code = "200";
                 msg = "权限信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "权限信息获取是失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAuthorityDtoList);
         return resultMap;
     }
 
 
-
-
 }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
index a9ef521..a74ecc7 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
@@ -45,6 +45,7 @@
                                                @FormParam("endDate") String endDate)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgHistoryDataDto> pgHistoryDataDtoList=new ArrayList<>();
 
         try {
@@ -55,13 +56,16 @@
                 pgHistoryDataDtoList=pgCh4Manager.getAllCH4Data(pgDevice,startDate,endDate);
                 if(pgHistoryDataDtoList==null)
                     msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+                else {
+                    code = "200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgHistoryDataDtoList);
         return resultMap;
@@ -75,8 +79,9 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getNewestCh4InfoByDev(@FormParam("assetCode") String assetCode)throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
+        String code="0";
         PgCh4Dto pgCh4Dto=new PgCh4Dto(null);
 
         try {
@@ -87,13 +92,17 @@
                 pgCh4Dto=pgCh4Manager.getNewestCH4Data(pgDevice);
                 if(pgCh4Dto==null)
                     msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgCh4Dto);
         return resultMap;
@@ -111,6 +120,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
@@ -127,6 +137,7 @@
                 pgCh4.setPgDeviceId(pgDevice);
 
                 pgCh4Manager.save(pgCh4);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -135,7 +146,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
index a7eac39..dfc8ca5 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
@@ -43,23 +43,27 @@
                                                       @FormParam("endDate") String endDate)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgHistoryDataDto> pgHistoryDataDtoList=new ArrayList<>();
 
         try {
             PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
                 msg="设备不存在";
-            else{
-                pgHistoryDataDtoList=pgCoManager.getAllCoData(pgDevice, startDate, endDate);
-                if(pgHistoryDataDtoList==null)
-                    msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+            else {
+                pgHistoryDataDtoList = pgCoManager.getAllCoData(pgDevice, startDate, endDate);
+                if (pgHistoryDataDtoList == null)
+                    msg = "没有满足要求的数据";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgHistoryDataDtoList);
         return resultMap;
@@ -75,6 +79,7 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         PgCoDto pgCoDto=new PgCoDto(null);
 
         try {
@@ -85,13 +90,16 @@
                 pgCoDto=pgCoManager.getNewestCoData(pgDevice);
                 if(pgCoDto==null)
                     msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgCoDto);
         return resultMap;
@@ -110,6 +118,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         try {
@@ -126,6 +135,7 @@
 
                 pgCoManager.save(pgCo);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
         } catch (Exception e) {
@@ -133,7 +143,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
index b4b826e..9af98a3 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
@@ -60,6 +60,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         try {
 
@@ -80,8 +81,8 @@
                 pgConstruction.setPgConstructionTypeId(pgConstructionType.getId());
                 pgConstruction.setActive(1);
                 pgConstruction.setParName(parName);
-                logger.info("保存成功");
                 pgConstructionManager.save(pgConstruction);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -90,6 +91,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("success", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -116,6 +118,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
@@ -140,6 +143,7 @@
                 pgConstruction.setParName(parName);
 
                 pgConstructionManager.save(pgConstruction);
+                code="200";
                 result = "true";
                 msg = "编辑成功";
             }
@@ -150,7 +154,7 @@
             e.printStackTrace();
 
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -167,6 +171,8 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
+
         try {
             PgConstruction pgConstruction = pgConstructionManager.get(Long.valueOf(id));
             if (pgConstruction == null)
@@ -177,6 +183,7 @@
             {
                 pgConstruction.setActive(0);
                 pgConstructionManager.save(pgConstruction);
+                code="200";
                 result = "true";
                 msg = "成功删除信息";
             }
@@ -185,6 +192,7 @@
             result = "false";
             msg = "删除失败";
         }
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -204,9 +212,11 @@
                                                   @FormParam("rows") int rows)throws Exception{
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
         List<PgConstructionDto> pgConstructionDtoList=new ArrayList<>();
         try{
             pgConstructionDtoList=pgConstructionManager.getPgContructionDto(cs_name,cs_type,startTime,endTime,page,rows);
+            code="200";
             msg="信息获取成功";
         }
         catch(Exception e)
@@ -214,6 +224,7 @@
             e.printStackTrace();
             msg="查询失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
 
@@ -231,18 +242,22 @@
                                                               @FormParam("statisticType") String statisticType) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgConstructionStiatistic> pgConstructionStiatisticList=new ArrayList<>();
         try {
             pgConstructionStiatisticList = pgConstructionManager.getConstructionByTimeAndStatus(startTime, endTime, statisticType);
             if(pgConstructionStiatisticList==null)
                 msg="施工统计信息获取失败";
-            else
-                msg="施工统计信息获取成功";
+            else {
+                code="200";
+                msg = "施工统计信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "施工统计信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgConstructionStiatisticList);
         return resultMap;
@@ -257,6 +272,7 @@
     public Map<String, Object> getConstructionByType(@FormParam("statisticType") String statisticType){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
         List<PgConstructionStiatistic> pgConstructionStiatisticList=new ArrayList<>();
 
         try{
@@ -268,6 +284,7 @@
                 resultMap.put("result",null);
             }
             else {
+                code="200";
                 msg = "统计信息获取成功";
                 resultMap.put("result", pgConstructionStiatisticList);
             }
@@ -278,6 +295,7 @@
             msg="统计失败";
             resultMap.put("result",null);
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         return resultMap;
     }
@@ -291,9 +309,11 @@
     public Map<String, Object> getConstructionToday() throws Exception{
         Map<String,Object> resultMap=new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgConstructionDto> pgConstructionDtoList=new ArrayList<PgConstructionDto>();
         try {
             pgConstructionDtoList = pgConstructionManager.getConstructionToday();
+            code="200";
             msg = "当天施工信息获取成功";
         }
         catch(Exception e)
@@ -301,7 +321,7 @@
             e.printStackTrace();
             msg="获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
         return resultMap;
@@ -316,6 +336,7 @@
     public Map<String, Object> getConstructionDev(@FormParam("id") String id) throws Exception{
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
         List<PgDeviceDto> pgDeviceDtoList =new ArrayList<>();
         try{
@@ -325,14 +346,17 @@
 
             if(pgDeviceDtoList==null)
                 msg="信息获取失败";
-            else
-                msg="信息获取成功";
+            else {
+                code="200";
+                msg = "信息获取成功";
+            }
         }
         catch(Exception e)
         {
             e.printStackTrace();
-            msg="设备信息获取成功";
+            msg="信息获取是被";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgDeviceDtoList);
 
@@ -346,17 +370,21 @@
     @Path("getConstruction")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getConstruction() throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
-        List<PgConstructionDto> pgConstructionDtoList=new ArrayList<PgConstructionDto>();
+        String code="0";
+
+        List<PgConstructionDto> pgConstructionDtoList=new ArrayList<>();
 
         try{
             pgConstructionDtoList=pgConstructionManager.getPgConstructionList();
             if(pgConstructionDtoList==null||pgConstructionDtoList.size()==0)
                 msg="不存在施工记录";
-            else
-                msg="施工信息获取成功";
+            else {
+                code = "200";
+                msg = "施工信息获取成功";
+            }
         }
         catch(Exception e)
         {
@@ -364,6 +392,7 @@
             msg="施工信息获取失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java
index fd3d53e..2019502 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java
@@ -39,12 +39,12 @@
         try {
             pgConstructionTypeDtoList = pgConstructionTypeManager.getAllConstructionTypeDto();
             if (pgConstructionTypeDtoList.size() == 0)
-                msg = "没有项目类型信息";
+                msg = "获取失败";
             else
-                msg = "项目类型获取成功";
+                msg = "获取成功";
         } catch (Exception e) {
             e.printStackTrace();
-            msg = "项目类型信息获取失败";
+            msg = "获取失败";
         }
         resultMap.put("msg", msg);
         resultMap.put("result", pgConstructionTypeDtoList);
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
index 90d001c..037a399 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
@@ -51,6 +51,7 @@
 
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if (StringUtils.isBlank(construct_doc)||StringUtils.isBlank(doc_name))
@@ -65,6 +66,7 @@
             pgCsDocument.setActive(1);
             pgCsDocumentManager.save(pgCsDocument);
 
+            code="200";
             result = "true";
             msg = "保存成功";
 
@@ -74,6 +76,7 @@
             ex.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("success", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -90,6 +93,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             PgCsDocument pgCsDocument = pgCsDocumentManager.get(Long.valueOf(id));
@@ -103,6 +107,7 @@
 
                 pgCsDocumentManager.save(pgCsDocument);
 
+                code="200";
                 result = "true";
                 msg = "编辑成功";
             }
@@ -112,6 +117,7 @@
             msg = "编辑失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -125,9 +131,9 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
         String result="";
+        String code="0";
 
         try{
-
             PgCsDocument pgCsDocument = pgCsDocumentManager.get(Long.valueOf(id));
             if(pgCsDocument==null)
             {
@@ -137,6 +143,7 @@
             else{
                 pgCsDocument.setActive(0);
                 pgCsDocumentManager.save(pgCsDocument);
+                code="200";
                 result="true";
                 msg="删除成功";
             }
@@ -147,7 +154,7 @@
             msg="预案删除失败";
             result="false";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -168,18 +175,21 @@
 
         String msg="";
         String result="";
+        String code="0";
 
         try {
             pgCsDocumentDtoList = pgCsDocumentManager.getAllDocData(cs_name);
-            if (pgCsDocumentDtoList != null)
+            if (pgCsDocumentDtoList != null) {
+                code="200";
                 msg = "获取数据成功";
+            }
             else
                 msg = "没有满足条件的数据";
         }catch (Exception e){
             e.printStackTrace();
             msg = "获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgCsDocumentDtoList);
         return resultMap;
@@ -192,20 +202,22 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
 
         String msg = "";
+        String code="0";
         ResponseEntity<byte[]> path = null;
         try {
             PgCsDocument pgCsDocument = pgCsDocumentManager.get(Long.valueOf(id));
             path = pgCsDocumentManager.downloadFile(pgCsDocument);
             if (path == null)
                 msg = "不存在该文档";
-            else
+            else {
+                code = "200";
                 msg = "下载成功";
-
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "下载失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", path.getBody());
         resultMap.put("msg", msg);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
index 94c5c84..ffc8b95 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
@@ -41,22 +41,24 @@
     public Map<String, Object> getPgDeviceByDevType(@FormParam("devType") String devType) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
         try {
-            pgDeviceDtoList = pgDeviceManager.getDeviceByDevTypee(devType);
+            pgDeviceDtoList = pgDeviceManager.getDeviceByDevType(devType);
             if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0){
                 msg="不存在满足要求的数据";
-                resultMap.put("result",null);
             }
             else{
-                resultMap.put("result", pgDeviceDtoList);
+                code="200";
                 msg = "获取成功";
             }
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", pgDeviceDtoList);
         return resultMap;
     }
 
@@ -69,25 +71,26 @@
     public Map<String, Object> getPgDeviceByAssetCode(@FormParam("assetCode") String assetCode) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         PgDeviceDto pgDeviceDto=null;
         try {
             PgDevice pgDevice = pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
             {
                 msg="不存在设备信息";
-                resultMap.put("result",null);
             }
             else {
                 pgDeviceDto = new PgDeviceDto(pgDevice);
                 msg = "获取成功";
-                resultMap.put("result", pgDeviceDto);
+                code="200";
             }
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", pgDeviceDto);
         return resultMap;
     }
 
@@ -102,27 +105,61 @@
                                              @FormParam("devType") String devType)throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
         try {
             pgDeviceDtoList = pgDeviceManager.getAllDevice(road,partition,devType);
             if(pgDeviceDtoList.size()==0) {
                 msg = "没有找到设备信息";
-                resultMap.put("result",null);
             }
             else {
                 msg = "设备信息获取成功";
-                resultMap.put("result", pgDeviceDtoList);
+                code="200";
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result", pgDeviceDtoList);
         return resultMap;
     }
 
     /**
+     * 显示设备列表
+     */
+    @POST
+    @Path("getPgDev")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String, Object> getPgDev(@FormParam("road") String road,
+                                             @FormParam("partition") String partition,
+                                             @FormParam("devType") String devType)throws Exception {
+        Map<String, Object> resultMap = new HashMap<>();
+        String msg="";
+        String code="0";
+        List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
+        try {
+            pgDeviceDtoList = pgDeviceManager.getAllDev(road,partition,devType);
+            if(pgDeviceDtoList.size()==0) {
+                msg = "没有找到设备信息";
+            }
+            else {
+                code="200";
+                msg = "设备信息获取成功";
+            }
+        }catch(Exception e){
+            e.printStackTrace();
+            msg="设备信息获取失败";
+        }
+        resultMap.put("code",code);
+        resultMap.put("msg",msg);
+        resultMap.put("result", pgDeviceDtoList);
+        return resultMap;
+    }
+
+
+    /**
      * 新增设备
      */
     @POST
@@ -145,6 +182,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if (pgDeviceManager.getDeviceByAssetCode(assetCode)!=null) {
@@ -169,6 +207,7 @@
 
                 pgDeviceManager.save(pgDevice);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
 
@@ -177,10 +216,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -208,14 +246,9 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
-            /*
-            if (pgDeviceManager.getDeviceByAssetCode(assetCode)!=null) {
-                result = "false";
-                msg = "已存在同名设备";
-            } else {
-            */
             PgDevice pgDevice = pgDeviceManager.get(Long.valueOf(id));
             pgDevice.setPipeGallery(pipeGallery);
             pgDevice.setPartition(partition);
@@ -233,14 +266,14 @@
 
             pgDeviceManager.save(pgDevice);
             result = "true";
+            code="200";
             msg = "编辑成功";
-            //}
         } catch (Exception e) {
             result = "false";
             msg = "编辑失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("result",result);
         resultMap.put("msg",msg);
         return resultMap;
@@ -256,7 +289,8 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
-        String result="false";
+        String result="";
+        String code="0";
 
         try {
             PgDevice pgDevice=pgDeviceManager.get(Long.valueOf(id));
@@ -268,6 +302,7 @@
             {
                 pgDevice.setActive(0);
                 pgDeviceManager.save(pgDevice);
+                code="200";
                 msg="设备删除成功";
                 result="true";
             }
@@ -276,6 +311,7 @@
             msg="设备删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -291,18 +327,18 @@
     {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         PgDeviceDto pgDeviceDto=null;
 
         try{
             PgDevice pgDevice=pgDeviceManager.getDeviceBydevCode(devCode);
             if(pgDevice==null) {
                 msg = "设备信息获取失败";
-                resultMap.put("result",null);
             }
             else{
                 pgDeviceDto = new PgDeviceDto(pgDevice);
                 msg = "设备信息获取成功";
-                resultMap.put("result",pgDeviceDto);
+                code="200";
             }
         }
         catch(Exception ex)
@@ -310,8 +346,9 @@
             ex.printStackTrace();
             msg="设备状态获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgDeviceDto);
         return resultMap;
     }
 
@@ -324,17 +361,17 @@
     public Map<String,Object> getDeviceByPartition(@FormParam("partition") String partition) throws Exception{
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<PgDeviceDto>();
 
         try{
             pgDeviceDtoList=pgDeviceManager.getPgDeviceDtoListByPartition(partition);
             if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0) {
                 msg = "设备信息获取失败";
-                resultMap.put("result",null);
             }
             else {
+                code="200";
                 msg = "设备信息获取成功";
-                resultMap.put("result",pgDeviceDtoList);
             }
         }
         catch(Exception e)
@@ -342,8 +379,9 @@
             e.printStackTrace();
             msg="设备信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgDeviceDtoList);
         return resultMap;
     }
 
@@ -353,17 +391,16 @@
     public Map<String,Object> getDeviceByOldDAssetCodeCode(@FormParam("assetCode") String assetCode) throws Exception{
         Map<String, Object> resultMap = new HashMap<>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
 
         try{
             pgDeviceDtoList=pgDeviceManager.getDeviceByOldDAssetCodeCode(assetCode);
-            if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0) {
-                msg = "设备信息获取失败";;
-                resultMap.put("result",null);
-            }
+            if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0)
+                msg = "设备信息获取失败";
             else {
                 msg = "设备信息获取成功";
-                resultMap.put("result",pgDeviceDtoList);
+                code="200";
             }
         }
         catch(Exception e)
@@ -372,8 +409,9 @@
             msg="设备信息获取失败";
             resultMap.put("result",null);
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgDeviceDtoList);
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java
index 421d249..f6f167d 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java
@@ -38,17 +38,21 @@
     public Map<String, Object> getDeviceTpeyList()throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgDeviceTypeDto> pgDeviceTypeDtoList=new ArrayList<PgDeviceTypeDto>();
         try {
             pgDeviceTypeDtoList = pgDeviceTypeManager.getAllDeviceType();
             if(pgDeviceTypeDtoList.size()==0)
                 msg="没有找到设备类型信息";
-            else
-                msg="设备类型信息获取成功";
+            else {
+                code="200";
+                msg = "设备类型信息获取成功";
+            }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备类型信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgDeviceTypeDtoList);
         return resultMap;
@@ -66,6 +70,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if (pgDeviceTypeManager.getDeviceTypeByDeType(devType)!=null) {
@@ -79,6 +84,7 @@
 
                 pgDeviceTypeManager.save(pgDeviceType);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
 
@@ -87,10 +93,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
index c276fb3..c789960 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
@@ -44,6 +44,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 
         try {
@@ -62,6 +63,7 @@
                 pgEquipment.setActive(1);
 
                 pgEquipmentManager.save(pgEquipment);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -70,9 +72,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -89,9 +91,10 @@
                                             @FormParam("ownerUnit") String ownerUnit,
                                             @FormParam("enterDate") String enterDate,
                                             @FormParam("curUser") String curUser) {
-        HashMap<String, Object> resultMap = new HashMap<String, Object>();
+        HashMap<String, Object> resultMap = new HashMap<>();
         String msg = "";
         String result = "";
+        String code="0";
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 
         try {
@@ -111,6 +114,7 @@
                 pgEquipment.setEnterDate(sdf.parse(enterDate));
 
                 pgEquipmentManager.save(pgEquipment);
+                code="200";
                 msg="编辑成功";
                 result="true";
             }
@@ -119,9 +123,9 @@
             result = "false";
             msg = "编辑失败";
         }
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -134,16 +138,19 @@
     public Map<String, Object> getEquipment(@FormParam("eqName") String eqName,
                                             @FormParam("eqCode") String eqCode,
                                             @FormParam("eqType") String eqType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        List<PgEquipmentDto> pgEquipmentDtoList=new ArrayList<PgEquipmentDto>();
+        String code="0";
+        List<PgEquipmentDto> pgEquipmentDtoList=new ArrayList<>();
 
         try{
             pgEquipmentDtoList=pgEquipmentManager.getEquipmentDtiList(eqName,eqCode,eqType);
             if(pgEquipmentDtoList==null||pgEquipmentDtoList.size()==0)
                 msg="不存在工器具记录";
-            else
-                msg="维获取成功";
+            else {
+                code = "200";
+                msg = "维获取成功";
+            }
         }
         catch(Exception e)
         {
@@ -166,6 +173,7 @@
         HashMap<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
         String result = "";
+        String code="";
 
         try {
             PgEquipment pgEquipment=pgEquipmentManager.get(Long.valueOf(id));
@@ -178,6 +186,7 @@
             {
                 pgEquipment.setActive(0);
                 pgEquipmentManager.save(pgEquipment);
+                code="200";
                 msg="删除成功";
                 result="true";
             }
@@ -186,6 +195,7 @@
             msg="设备信息获取失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -201,16 +211,19 @@
             throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=new ArrayList<PgDeviceTypeStatisticDto>();
 
         try {
             pgDeviceTypeStatisticDtoList=pgEquipmentManager.getDeviceStatisticByDevType(eqType);
 
+            code="200";
             msg = "获取成功";
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceTypeStatisticDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
index 05a9709..a90fd6c 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
@@ -4,9 +4,9 @@
 import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
 import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
 import com.casic.PgInterface.intelPlan.manager.PgPileAcuManager;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import com.casic.PgInterface.test.PlanData;
 import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.ModelAttribute;
 
 import javax.annotation.Resource;
 import javax.ws.rs.FormParam;
@@ -32,23 +32,25 @@
     public Map<String,Object> getPlanResult(@FormParam("planParamStr") String planParamStr){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
-        //List<PgPlanTask> pgPlanTaskList=pgPlanParams.getPgPlanTaskList();
         List<PgPlanTask> pgPlanTaskList=new PgPlanParams().getPgPlanParamsByString(planParamStr);
         List<PgPlanResultRe> pgPlanResultReList=new ArrayList<>();
 
-        try{
-                pgPlanResultReList=pgPileAcuManager.getPgPlanResultList(pgPlanTaskList);
-                if(pgPlanResultReList==null)
-                    msg="管线智能规划出错";
-                else
-                    msg="管线智能规划完成";
+        try {
+            pgPlanResultReList = pgPileAcuManager.getPgPlanResultList(pgPlanTaskList);
+            if (pgPlanResultReList == null)
+                msg = "管线智能规划出错";
+            else {
+                code="200";
+                msg = "管线智能规划完成";
+            }
         }
         catch(Exception ex){
             msg="智能规划出错";
             ex.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgPlanResultReList);
 
@@ -80,4 +82,30 @@
         return resultMap;
     }
 
+    @POST
+    @Path("getPlanTask")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getACUTask(@FormParam("pileAcuList") String pileAcuList){
+
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        String code="0";
+        List<PgAcuTask> pgAcuTaskList=new ArrayList<>();
+
+        try{
+            pgAcuTaskList=pgPileAcuManager.getACUTask(pileAcuList);
+            code="200";
+            msg="任务获取成功";
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            msg="任务获取失败";
+        }
+        resultMap.put("code",code);
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgAcuTaskList);
+
+        return resultMap;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
index ff85c61..66eec76 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
@@ -55,13 +55,13 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         try {
             PgInPgPerson pgInPgPerson = null;//pgInPgPersonManager.getPersonByUserName(userName);
             int iHostName = pgTagMacManager.getCount("select count(1) from PGTagMac where hostname = ?",assetCode);
-//            int iTagMac = pgTagMacManager.getCount("select count(1) from PGTagMac where tagmac = ?",assetCode.toUpperCase());
             if (0==iHostName)
             {
                 result = "false";
@@ -92,9 +92,8 @@
 
                 pgInPgStatusManager.save(pgInPgStatus);
 
-//                String syResult=pgInPgPersonManager.synchorizedInPgInfo(assetCode,userCode,userName,personType);
+                code="200";
                 result = "true";
-//                msg = "人员注册保存成功"+syResult;
                 msg = "人员注册保存成功";
             }
             else {
@@ -106,6 +105,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -120,6 +120,7 @@
     public Map<String, Object> getInPgPerson() throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<>();
         try {
@@ -127,11 +128,15 @@
             if (pgInPgInfoDtoList == null || pgInPgInfoDtoList.size() == 0)
                 msg = "没有找到入廊人员信息";
             else
+            {
+                code="200";
                 msg = "入廊人员信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "入廊人员信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
         return resultMap;
@@ -146,18 +151,22 @@
     public Map<String, Object> getInPgPersonInPg() throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
 
-        List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<PgInPgInfoDto>();
+        List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<>();
         try {
             pgInPgInfoDtoList = pgInPgPersonManager.getPgInPersonList(1);
             if (pgInPgInfoDtoList == null || pgInPgInfoDtoList.size() == 0)
                 msg = "没有找到入廊人员信息";
-            else
+            else {
+                code="200";
                 msg = "入廊人员信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "入廊人员信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
         return resultMap;
@@ -172,6 +181,7 @@
     public Map<String, Object> getInPgPersonByName(@FormParam("userName") String userName) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
 
         PgInPgPerson pgInPgPerson = null;
         PgInPgPersonDto pgInPgPersonDto=null;
@@ -184,12 +194,13 @@
                 pgInPgPersonDto=new PgInPgPersonDto(pgInPgPerson);
                 pgInPgPersonDtoList.add(pgInPgPersonDto);
                 msg = "人员信息获取成功";
+                code="200";
             }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "人员信息获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgPersonDtoList);
         return resultMap;
@@ -206,6 +217,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             PgInPgPerson pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName);
@@ -221,6 +233,7 @@
                     pgInPgPersonManager.save(pgInPgPerson);
                     result = "true";
                     msg = "编辑成功";
+                    code="200";
                 }
             }
         } catch (Exception e) {
@@ -228,9 +241,9 @@
             msg = "编辑失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -244,10 +257,12 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         int inPgNum=0;
         String msg = "";
+        String code="0";
 
         try{
             inPgNum=pgInPgStatusManager.getInPgNum();
 
+            code="200";
             msg="人员入廊次数获取成功";
         }
         catch(Exception e)
@@ -255,6 +270,7 @@
             e.printStackTrace();
             msg="人员入廊次数获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",inPgNum);
 
@@ -272,18 +288,22 @@
                                                    @FormParam("statisticType") String statisticType) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
 
         List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<PgInPgInfoDto>();
         try {
             pgInPgInfoDtoList = pgInPgPersonManager.getPgInPersonListByTime(startTime, endTime, statisticType);
             if(pgInPgInfoDtoList==null)
                 msg="入廊人员统计信息获取失败";
-            else
-                msg="入廊人员统计信息获取成功";
+            else {
+                code="200";
+                msg = "入廊人员统计信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "入廊人员统计信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
         return resultMap;
@@ -296,6 +316,7 @@
 
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
 
         try {
@@ -304,8 +325,10 @@
                 pgDeviceDtoList=pgDeviceManager.getPgCameraListByPosition("",apCodeStr);
                 if(pgDeviceDtoList==null)
                     msg="不存在关联摄像机";
-                else
-                    msg="关联摄像机获取成功";
+                else {
+                    code="200";
+                    msg = "关联摄像机获取成功";
+                }
             } else {
                 msg="请输入Ap编号";
             }
@@ -315,6 +338,7 @@
             msg="关联摄像机获取成功";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgDeviceDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java
index 507b3fe..b43f077 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java
@@ -34,6 +34,7 @@
 
         String result="";
         String msg="";
+        String code="";
         try{
             PgInPgStatus pgInPgStatus=new PgInPgStatus();
 
@@ -44,6 +45,7 @@
             pgInPgStatusManager.save(pgInPgStatus);
             msg="入廊时间提交成功";
             result="true";
+            code="200";
         }
         catch (Exception e){
             e.printStackTrace();
@@ -51,6 +53,7 @@
             result="false";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -66,6 +69,7 @@
 
         String result="";
         String msg="";
+        String code="0";
         try{
             PgInPgPerson pgInPgPerson=pgInPgPersonManager.getPgInPgPersonByAssetCode(assetCode);
 
@@ -79,6 +83,7 @@
             pgInPgStatusManager.save(pgInPgStatus);
 
             msg="出廊时间提交成功";
+            code="200";
             result="true";
         }
         catch (Exception e){
@@ -87,6 +92,7 @@
             result="false";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
index 9def330..9c0ba1f 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
@@ -33,17 +33,20 @@
                                             @FormParam("existNum") String existNum) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         String result="";
 
         try {
             pgIntelPlanManager.savePgIntelPlan(parName,lineName,maxNum,existNum);
             msg="规划数据保存成功";
+            code="200";
             result="true";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "规划数据保存失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
@@ -55,15 +58,18 @@
     public Map<String, Object> getIntelLineType() throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgIntelPlanTypeDto> pgIntelPlanTypeDtoList=new ArrayList<>();
         try {
             pgIntelPlanTypeDtoList=pgIntelPlanManager.getIntelPlanType();
+            code="200";
             msg="获取排线类型成功";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "获取排线类型失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgIntelPlanTypeDtoList);
         return resultMap;
@@ -76,6 +82,7 @@
                                             @FormParam("partitionStr") String partitionStr) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgIntelPlanDto> pgIntelPlanDtoList = new ArrayList<>();
 
@@ -83,8 +90,10 @@
             pgIntelPlanDtoList = pgIntelPlanManager.getPgIntelPlanListByPartion(lineName, partitionStr);
             if(pgIntelPlanDtoList==null||pgIntelPlanDtoList.size()==0)
                 msg="请输入正确的规划参数";
-            else
-                msg="规划数据获取成功";
+            else {
+                code="200";
+                msg = "规划数据获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "规划数据获取失败";
@@ -103,10 +112,12 @@
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
         String result="";
+        String code="0";
 
         try {
             boolean bl=pgIntelPlanManager.addLineUse(lineName,partitionStr,num);
             if(bl){
+                code="200";
                 msg="排线入廊成功";
                 result="true";
             }
@@ -119,6 +130,7 @@
             msg = "排线入廊失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
@@ -132,6 +144,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
         String result="";
+        String code="0";
 
         try {
             PgIntelPlan pgIntelPlan=pgIntelPlanManager.getPgIntelPlanByParNameAndLine(lineName,parName);
@@ -140,11 +153,13 @@
             pgIntelPlanManager.save(pgIntelPlan);
             msg="规划数据删除成功";
             result="true";
+            code="200";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "规划数据删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java b/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java
index 378af00..9c39523 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java
@@ -1,5 +1,6 @@
 package com.casic.PgInterface.rs;
 
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
 import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
 import com.casic.PgInterface.intelPlan.dto.PgLineHoleDTO;
 import com.casic.PgInterface.intelPlan.manager.PgLineHoleManager;
@@ -27,6 +28,9 @@
     @Resource
     private PgPileAcuManager pgPileAcuManager;
 
+    @Resource
+    private PgRoadManager pgRoadManager;
+
     @POST
     @Path("getPgLineAcuHole")
     @Produces(MediaType.APPLICATION_JSON)
@@ -34,23 +38,32 @@
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
         String result="";
+        String code="0";
         List<PgLineHoleDTO> pgLineHoleDTOList=new ArrayList<>();
 
         try {
             PgPileAcu pgPileAcu=pgPileAcuManager.getPgPileAcuByCode(acuCode);
             if(pgPileAcu==null){
                 msg="不存在分区";
-            }else{
-                pgLineHoleDTOList=pgLineHoleManager.getCurrentHoleByAcu(pgPileAcu.getId());
-                if(pgLineHoleDTOList!=null&&pgLineHoleDTOList.size()!=0)
-                    msg="获取成功";
-                else
-                    msg="未找到入廊数据";
+            }else {
+                pgLineHoleDTOList = pgLineHoleManager.getCurrentHoleByAcu(pgPileAcu.getId());
+                if (pgLineHoleDTOList != null && pgLineHoleDTOList.size() != 0)
+                {
+                    code="200";
+                    msg = "获取成功";
+                }
+                else {
+                    PgLineHoleDTO pgLineHoleDTO=new PgLineHoleDTO();
+                    pgLineHoleDTO.setRoad(pgRoadManager.get(pgPileAcu.getRoadId()).getRoadName());
+                    pgLineHoleDTOList.add(pgLineHoleDTO);
+                    msg = "未找到入廊数据";
+                }
             }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgLineHoleDTOList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgLogRs.java b/src/main/java/com/casic/PgInterface/rs/PgLogRs.java
index 39cff52..30db63b 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgLogRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgLogRs.java
@@ -45,6 +45,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         PgLog pgLog=new PgLog();
         try {
             PgUser pgUser = new PgUser();
@@ -60,14 +61,15 @@
             pgLogManager.save(pgLog);
             result = "true";
             msg = "保存成功";
-
+            code="200";
         } catch (Exception e) {
             result = "false";
             msg = "保存失败";
             e.printStackTrace();
         }
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -83,17 +85,21 @@
             throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgLogDto> pgLogDtoList = new ArrayList<PgLogDto>();
         try {
             pgLogDtoList = pgLogManager.getAllLogs(userName, startTime, endTime);
             if (pgLogDtoList == null || pgLogDtoList.size() == 0)
                 msg = "没有找到日志信息";
-            else
+            else {
+                code="200";
                 msg = "日志信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "日志信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgLogDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java
index 9fd0a5f..37b72f6 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java
@@ -36,19 +36,23 @@
         Map<String,Object> resultMap=new HashMap<>();
 
         String msg = "";
+        String code="0";
         List<PgMaintainType> pgMaintainTypeList=new ArrayList<>();
         try{
             pgMaintainTypeList=pgMaintainTypeManager.getMaintainType();
             if(pgMaintainTypeList!=null&&pgMaintainTypeList.size()!=0)
                 msg="不存在运维类别";
-            else
-                msg="运维类别获取成功";
+            else {
+                code="200";
+                msg = "运维类别获取成功";
+            }
         }
         catch(Exception ex)
         {
             ex.printStackTrace();
             msg="运维类别获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgMaintainTypeList);
 
@@ -65,10 +69,11 @@
         Map<String,Object> resultMap=new HashMap<>();
 
         String msg = "";
+        String code="0";
         List<PgMaintainTypeDto> pgMaintainTypeDtoList=new ArrayList<PgMaintainTypeDto>();
         try{
             pgMaintainTypeDtoList=pgMaintainTypeManager.getMaintainTypeModel(type);
-
+            code="200";
             msg="维护类型获取成功";
         }
         catch(Exception ex)
@@ -77,9 +82,9 @@
             msg="维护类型获取失败";
         }
 
-        resultMap.put("result",pgMaintainTypeDtoList);
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgMaintainTypeDtoList);
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java
index d735cc9..82ffca4 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java
@@ -33,12 +33,16 @@
                                                  @FormParam("endTime") String endTime){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
         List<PgMaintanceRecordHeadDto> pgMaintanceRecordHeadDtoList=new ArrayList<>();
         try{
             pgMaintanceRecordHeadDtoList=pgMaintanceRecordHeadManager.getPgMaintanceRecordHeadLsit(repairMan,startTime,endTime);
             if(pgMaintanceRecordHeadDtoList!=null&&pgMaintanceRecordHeadDtoList.size()!=0)
+            {
+                code="200";
                 msg="维护信息获取成功";
+            }
             else
                 msg="不存在维护信息";
         }
@@ -47,6 +51,7 @@
             msg="巡检信息获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgMaintanceRecordHeadDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java
index effc9df..9f46fc8 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java
@@ -32,12 +32,16 @@
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
         String result="";
+        String code="0";
 
         List<PgMaintanceRecordHeadStatic> pgMaintanceRecordHeadStaticList=new ArrayList<>();
         try{
             pgMaintanceRecordHeadStaticList=pgMaintanceRecordHeadManager.getPgMaintanceRecordHeadStaticLisByTime(startTime,endTime,staticType);
             if(pgMaintanceRecordHeadStaticList!=null&&pgMaintanceRecordHeadStaticList.size()!=0)
+            {
+                code="200";
                 msg="维护统计信息获取成功";
+            }
             else
                 msg="维护统计失败";
         }
@@ -46,7 +50,7 @@
             ex.printStackTrace();
             msg="统计失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgMaintanceRecordHeadStaticList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java b/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java
index 3a67bf3..6a5f4dc 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java
@@ -39,27 +39,31 @@
     @Path("getO2InfoByDevAndDate")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getO2InfoByDevAndDate(@FormParam("assetCode") String assetCode,
-                                                      @FormParam("startDate") String startDate,
-                                                      @FormParam("endDate") String endDate)throws Exception {
+                                                     @FormParam("startDate") String startDate,
+                                                     @FormParam("endDate") String endDate)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgHistoryDataDto> pgHistoryDataDtoList=new ArrayList<>();
 
         try {
             PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
                 msg="设备不存在";
-            else{
-                pgHistoryDataDtoList=pgO2Manager.getAllO2Data(pgDevice, startDate, endDate);
-                if(pgHistoryDataDtoList==null)
-                    msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+            else {
+                pgHistoryDataDtoList = pgO2Manager.getAllO2Data(pgDevice, startDate, endDate);
+                if (pgHistoryDataDtoList == null)
+                    msg = "没有满足要求的数据";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgHistoryDataDtoList);
         return resultMap;
@@ -75,23 +79,27 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         PgO2Dto pgO2Dto=new PgO2Dto(null);
 
         try {
             PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
                 msg="设备不存在";
-            else{
-                pgO2Dto=pgO2Manager.getNewestO2Data(pgDevice);
-                if(pgO2Dto==null)
-                    msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+            else {
+                pgO2Dto = pgO2Manager.getNewestO2Data(pgDevice);
+                if (pgO2Dto == null)
+                    msg = "没有满足要求的数据";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgO2Dto);
         return resultMap;
@@ -104,11 +112,12 @@
     @Path("addO2Data")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> addO2Data(@FormParam("devCode") String devCode,
-                                          @FormParam("upTime") String upTime,
-                                          @FormParam("o2") String o2)throws Exception {
+                                         @FormParam("upTime") String upTime,
+                                         @FormParam("o2") String o2)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
@@ -125,6 +134,7 @@
                 pgO2.setPgDeviceId(pgDevice);
 
                 pgO2Manager.save(pgO2);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -133,9 +143,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java b/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java
index 6217cde..70b3b41 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java
@@ -30,8 +30,6 @@
 public class PgOverViewRs {
 
     @Resource
-    private PgInPgPersonManager pgInPgPersonManager;
-    @Resource
     private PgInPgStatusManager pgInPgStatusManager;
     @Resource
     private PgAlarmManager pgAlarmManager;
@@ -46,18 +44,21 @@
     @Path("getPersonNumInPgByMonth")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<Object, String> getMonthInPgPersonNum() throws Exception {
-        Map<Object, String> resultMap = new HashMap<Object, String>();
+        Map<Object, String> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         int inNum = 0;
 
         try {
             inNum = pgInPgStatusManager.getMonthInPgPersonNum();
+            code="200";
             msg = "本月入廊人员次数获取成功";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "本月入廊人员次数获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", String.valueOf(inNum));
 
@@ -73,15 +74,18 @@
     public Map<Object, String> getWeekInPgPersonNum() throws Exception {
         Map<Object, String> resultMap = new HashMap<Object, String>();
         String msg = "";
+        String code="0";
         int inNum = 0;
         try {
             inNum = pgInPgStatusManager.getWeekInPgPersonNum();
+            code="200";
             msg = "本周入廊人员次数获取成功";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "本周入廊人员次数获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", String.valueOf(inNum));
 
@@ -97,19 +101,22 @@
     public Map<String, Object> getDayInPgStatistic() throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<>();
         try {
             pgInPgInfoDtoList = pgInPgStatusManager.getPgInPersonListByDay();
             if (pgInPgInfoDtoList == null)
                 msg = "信息获取失败";
-            else
+            else {
+                code="200";
                 msg = "信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "信息获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
         return resultMap;
@@ -124,18 +131,23 @@
     public Map<String, Object> getTodayInPgInfo() throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
 
         List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<PgInPgInfoDto>();
         try {
             pgInPgInfoDtoList = pgInPgStatusManager.getTodayInPgInfo();
             if(pgInPgInfoDtoList!=null||pgInPgInfoDtoList.size()!=0)
+            {
+                code="200";
                 msg = "信息获取成功";
+            }
             else
                 msg="当天没有入廊人员信息";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
 
@@ -149,18 +161,22 @@
     public Map<String, Object> getAlarmNum(@FormParam("isDevFault") String isDevFault) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         int num = 0;
 
         try {
             if(isDevFault!=null){
                 num = pgAlarmManager.getAlarmNum(isDevFault);
-                msg = "报警数量获取成功";}
+                msg = "报警数量获取成功";
+                code="200";
+            }
             else
                 msg="请输入统计参数";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警数量统计失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", num);
 
@@ -176,16 +192,18 @@
     public Map<Object, String> getMonthAlarmNum(@FormParam("isDevFault") String isDevFault) throws Exception {
         Map<Object, String> resultMap = new HashMap<Object, String>();
         String msg = "";
+        String code="0";
         int inNum = 0;
 
         try {
-                inNum = pgAlarmManager.getMonthAlarmNum(isDevFault);
-                msg = "报警次数获取成功";
+            inNum = pgAlarmManager.getMonthAlarmNum(isDevFault);
+            code="200";
+            msg = "报警次数获取成功";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警次数获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", String.valueOf(inNum));
 
@@ -201,15 +219,17 @@
     public Map<Object, String> getWeekAlarmNum(@FormParam("isDevFault") String isDevFault) throws Exception {
         Map<Object, String> resultMap = new HashMap<Object, String>();
         String msg = "";
+        String code="0";
         int inNum = 0;
         try {
             inNum = pgAlarmManager.getWeekAlarmNum(isDevFault);
+            code="200";
             msg = "报警次数获取成功";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警次数获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", String.valueOf(inNum));
 
@@ -225,14 +245,17 @@
     public Map<String, Object> getDayAlarmStatistic() throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgAlarmTjDto> pgAlarmTjDtoList = new ArrayList<PgAlarmTjDto>();
         try {
             pgAlarmTjDtoList = pgAlarmManager.getDayAlarmStatistic();
             if (pgAlarmTjDtoList == null)
                 msg = "信息获取失败";
-            else
+            else {
+                code="200";
                 msg = "信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "信息获取失败";
@@ -252,9 +275,11 @@
     public Map<String, Object> getAlarmList(@FormParam("isDevFault") String isDevFault) throws Exception{
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         List<PgAlarmDto> pgAlarmDtoList=new ArrayList<>();
         try{
             pgAlarmDtoList=pgAlarmManager.getAlarmList(isDevFault);
+            code="200";
             msg="信息获取成功";
         }
         catch(Exception e)
@@ -262,6 +287,7 @@
             e.printStackTrace();
             msg="信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAlarmDtoList);
 
@@ -278,17 +304,19 @@
     public Map<String,Object> getConstructionNum() throws Exception{
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgConstructionTypeNumStatisticDto> pgConstructionTypeNumDtoList=new ArrayList<PgConstructionTypeNumStatisticDto>();
         try{
             pgConstructionTypeNumDtoList=pgConstructionManager.getConstructionNum();
             msg="施工数量获取成功";
+            code="200";
         }
         catch(Exception e)
         {
             e.printStackTrace();
             msg="施工数量统计";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionTypeNumDtoList);
 
@@ -302,21 +330,25 @@
     @Path("getConstructionToday")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> getConstructionToday() throws Exception{
-        Map<String,Object > resultMap = new HashMap<String,Object>();
+        Map<String,Object > resultMap = new HashMap<>();
         String msg = "";
-        List<PgConstructionDto> pgConstructionDtoList=new ArrayList<PgConstructionDto>();
+        String code="0";
+        List<PgConstructionDto> pgConstructionDtoList=new ArrayList<>();
         try {
             pgConstructionDtoList = pgConstructionManager.getConstructionToday();
-            if (pgConstructionDtoList == null&&pgConstructionDtoList.size()==0)
+            if (pgConstructionDtoList == null && pgConstructionDtoList.size() == 0)
                 msg = "不存在施工信息";
-            else
+            else {
+                code="200";
                 msg = "施工信息获取成功";
+            }
         }
         catch(Exception e)
         {
             e.printStackTrace();
             msg="施工信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java b/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java
index d3c10d4..31ffcfc 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java
@@ -48,6 +48,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 
         try {
@@ -66,9 +67,9 @@
                 pgPartition.setMaterial(material);
                 pgPartition.setActive(1);
 
-                logger.info("成功保存");
                 pgPartitionManager.save(pgPartition);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
         } catch (Exception e) {
@@ -76,9 +77,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
         return resultMap;
     }
     /*
@@ -100,6 +101,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         PgPartition partition = new PgPartition();
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
@@ -122,6 +124,7 @@
 
                 pgPartitionManager.save(pgPartition);
                 result = "true";
+                code="200";
                 msg = "编辑成功";
             }
 
@@ -131,8 +134,10 @@
             e.printStackTrace();
         }
 
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
+
         return resultMap;
     }
 
@@ -147,7 +152,8 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
-        String result="false";
+        String result="";
+        String code="0";
 
         try {
             PgPartition pgPartition=pgPartitionManager.get(Long.valueOf(id));
@@ -161,12 +167,14 @@
                 pgPartitionManager.save(pgPartition);
                 msg="分区删除成功";
                 result="true";
+                code="200";
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="分区删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -181,14 +189,17 @@
     public Map<String, Object> getPartition() throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgPartitionDto> pgPartitionDtoList = new ArrayList<PgPartitionDto>();
         try {
             pgPartitionDtoList = pgPartitionManager.getPgPartitionDtoList();
+            code="200";
             msg = "获取成功";
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgPartitionDtoList);
         return resultMap;
@@ -203,14 +214,17 @@
     public Map<String, Object> getPartitionListByName(@FormParam("parName") String parName) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgPartitionDto> pgPartitionDtoList = new ArrayList<PgPartitionDto>();
         try {
             pgPartitionDtoList = pgPartitionManager.getPartitionByName(parName);
+            code="200";
             msg = "获取成功";
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgPartitionDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java b/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java
index 883adf9..cf81b72 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java
@@ -37,6 +37,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
         PgRoad pgRoad=pgRoadManager.getPgRoadByName(road);
         try {
             PgPileAcu pgPileAcu=new PgPileAcu();
@@ -49,6 +50,7 @@
             pgPileAcu.setActive(true);
 
             pgPileAcuManager.save(pgPileAcu);
+            code="200";
             result="true";
             msg="保存成功";
         } catch (Exception e) {
@@ -56,9 +58,10 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
+
         return resultMap;
     }
 
@@ -73,6 +76,7 @@
 
         String result="";
         String msg="";
+        String code="0";
         try{
             PgPileAcu pgPileAcu=pgPileAcuManager.get(id);
             if(pgPileAcu==null){
@@ -83,7 +87,7 @@
             {
                 pgPileAcu.setActive(false);
                 pgPileAcuManager.save(pgPileAcu);
-
+                code="200";
                 result="true";
                 msg="桩号删除成功";
             }
@@ -94,8 +98,9 @@
             ex.printStackTrace();
         }
 
-        resultMap.put("result",result);
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
+        resultMap.put("result",result);
 
         return resultMap;
     }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPileRs.java b/src/main/java/com/casic/PgInterface/rs/PgPileRs.java
index cf62954..c9999ac 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgPileRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgPileRs.java
@@ -33,6 +33,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             PgPile pgPile=new PgPile();
@@ -40,6 +41,7 @@
             pgPile.setActive(true);
 
             pgPileManager.save(pgPile);
+            code="200";
             result="true";
             msg="保存成功";
         } catch (Exception e) {
@@ -47,9 +49,10 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
+
         return resultMap;
     }
 
@@ -64,9 +67,10 @@
         Map<String,Object> resultMap=new HashMap<>();
         List<PgPileDTO> pgPileDTOList=new ArrayList<>();
         String msg="";
+        String code="0";
         try{
             pgPileDTOList=pgPileManager.getPgPileDTOList();
-
+            code="200";
             msg="获取成功";
         }
         catch(Exception ex){
@@ -74,8 +78,9 @@
             msg="获取成失败";
             ex.printStackTrace();
         }
-        resultMap.put("result",pgPileDTOList);
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
+        resultMap.put("result",pgPileDTOList);
 
         return resultMap;
     }
@@ -91,6 +96,7 @@
 
         String result="";
         String msg="";
+        String code="0";
         try{
             PgPile pgPile=pgPileManager.get(id);
             if(pgPile==null){
@@ -101,7 +107,7 @@
             {
                 pgPile.setActive(false);
                 pgPileManager.save(pgPile);
-
+                code="200";
                 result="true";
                 msg="桩号删除成功";
             }
@@ -111,9 +117,9 @@
             msg="桩号删除失败";
             ex.printStackTrace();
         }
-
-        resultMap.put("result",result);
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
+        resultMap.put("result",result);
 
         return resultMap;
     }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
index 6ee63ff..63b5597 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
@@ -53,10 +53,12 @@
         try {
                resultMap = pgPipeLineManager.addPipeLine(lineCode,lineType,secRow,secColumn,pileAcuList);
                resultMap.put("msg","提交成功");
+               resultMap.put("code","200");
                resultMap.put("result","true");
 
         } catch (Exception e) {
             e.printStackTrace();
+            resultMap.put("code","0");
             resultMap.put("result","false");
             resultMap.put("msg","提交失败");
             return  resultMap;
@@ -74,14 +76,17 @@
     public Map<String, Object> getPipeLineByLineType(@FormParam("lineType") String lineType) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgPipeLineDto> pgPipeLineDtoList=new ArrayList<PgPipeLineDto>();
         try {
             pgPipeLineDtoList = pgPipeLineManager.getPipeLineByLineType(lineType);
+            code="200";
             msg = "获取成功";
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgPipeLineDtoList);
         return resultMap;
@@ -96,6 +101,7 @@
     public Map<String, Object> getPipeLineByName(@FormParam("lineCode") String lineCode) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         PgPipeLineDto pgPipeLineDto=null;
         try {
             PgPipeLine pgPipeLine = pgPipeLineManager.getPipeLineBylineName(lineCode);
@@ -103,12 +109,14 @@
                 msg="不存在："+lineCode;
             else {
                 pgPipeLineDto = new PgPipeLineDto(pgPipeLine);
+                code="200";
                 msg = "获取成功";
             }
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgPipeLineDto);
         return resultMap;
@@ -123,15 +131,18 @@
     public Map<String,Object> getPipeLengthStatic()throws Exception{
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         List<PgPipeLineLengthStatic> pgPipeLineLengthStaticList=new ArrayList<PgPipeLineLengthStatic>();
         try {
             pgPipeLineLengthStaticList = pgPipeLineManager.getPipeLengthByName();
+            code="200";
             msg="管线长度获取成功";
         }catch(Exception e)
         {
             e.printStackTrace();
             msg="管线长度统计失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgPipeLineLengthStaticList);
 
@@ -147,14 +158,17 @@
     public Map<String, Object> getPipeLineType() throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgPipeLineTypeDto> pgPipeLineTypeDtoList=new ArrayList<PgPipeLineTypeDto>();
         try {
             pgPipeLineTypeDtoList = pgPipeLineManager.getPipeType();
+            code="200";
             msg = "获取成功";
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgPipeLineTypeDtoList);
         return resultMap;
@@ -170,20 +184,24 @@
         Map<String,Object> resultMap=new HashMap<String, Object>();
 
         String msg="";
+        String code="0";
         List<PgPipeLineTypeNumDto> pgPipeLineTypeNumDtoList=new ArrayList<PgPipeLineTypeNumDto>();
 
-        try{
-            pgPipeLineTypeNumDtoList=pgPipeLineManager.getPipeTypeNum();
+        try {
+            pgPipeLineTypeNumDtoList = pgPipeLineManager.getPipeTypeNum();
 
-            if(pgPipeLineTypeNumDtoList==null)
-                msg="不存在管线类型占比";
-            else
-                msg="管线占比获取成功";
+            if (pgPipeLineTypeNumDtoList == null)
+                msg = "不存在管线类型占比";
+            else {
+                code="200";
+                msg = "管线占比获取成功";
+            }
         }
         catch (Exception e){
             msg="管线占比数量获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgPipeLineTypeNumDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java
index 672b376..7042994 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java
@@ -43,17 +43,21 @@
     public Map<String,Object> getReservePlan() {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgReservePlanDto> pgReservePlanDtoList = new ArrayList<PgReservePlanDto>();
         try {
             pgReservePlanDtoList = pgReservePlanManager.getPgReservePlanDto();
             if (pgReservePlanDtoList == null)
                 msg = "不存在预案信息";
-            else
+            else {
+                code="200";
                 msg = "预案信息获取成功";
-        } catch (Exception e) {
+            }
+        }catch (Exception e) {
             e.printStackTrace();
             msg = "预案信息获取是失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgReservePlanDtoList);
         return resultMap;
@@ -66,6 +70,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
 
         String msg = "";
+        String code="0";
         ResponseEntity<byte[]> path = null;
         try {
             PgReservePlan pgReservePlan = pgReservePlanManager.get(Long.valueOf(id));
@@ -73,15 +78,17 @@
 
             if (path == null)
                 msg = "不存在该文档";
-            else
+            else {
+                code="200";
                 msg = "下载成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "下载失败";
         }
-
-        resultMap.put("result", path.getBody());
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", path.getBody());
         return resultMap;
     }
     /*
@@ -99,6 +106,7 @@
         Map<String,Object> resultMap=new HashMap<String, Object>();
         String msg="";
         String result="";
+        String code="0";
 
         try {
             PgReservePlan pgReservePlan = new PgReservePlan();
@@ -124,6 +132,7 @@
                 pgReservePlanManager.save(pgReservePlan);
                 msg = "新增成功";
                 result = "true";
+                code="200";
             }
         }
         catch(Exception e)
@@ -133,6 +142,7 @@
             result="false";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -152,6 +162,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             PgReservePlan pgReservePlan=pgReservePlanManager.get(Long.valueOf(id));
@@ -177,6 +188,7 @@
 
                     pgReservePlanManager.save(pgReservePlan);
 
+                    code="200";
                     result = "true";
                     msg = "编辑成功";
                 }
@@ -187,6 +199,7 @@
             msg = "编辑失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -201,6 +214,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
         String result="";
+        String code="0";
 
         try{
 
@@ -214,6 +228,7 @@
                 pgReservePlan.setActive(0);;
                 pgReservePlanManager.save(pgReservePlan);
                 result="true";
+                code="200";
                 msg="删除成功";
             }
         }
@@ -224,6 +239,7 @@
             result="false";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java b/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java
index 8f049c8..3c48a8d 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java
@@ -42,19 +42,22 @@
         Map<String,Object> resultMap=new HashMap<String, Object>();
 
         String msg="";
+        String code="0";
         List<PgRoadDto> pgRoadDtoList=new ArrayList<PgRoadDto>();
-        try{
+        try {
             pgRoadDtoList = pgRoadManager.getAllRoad();
             if (pgRoadDtoList.size() == 0)
                 msg = "没有道路信息";
-            else
+            else {
+                code="200";
                 msg = "道路信息获取成功";
+            }
         }
         catch(Exception e){
             msg="道路信息获取失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgRoadDtoList);
 
@@ -71,6 +74,7 @@
         Map<String,Object> resultMap=new HashMap<String, Object>();
         String msg="";
         String result="";
+        String code="0";
 
         try{
             PgRoad pgRoad=new PgRoad();
@@ -78,7 +82,7 @@
             pgRoad.setActive(1);
 
             pgRoadManager.save(pgRoad);
-
+            code="200";
             msg="新增道路成功";
             result="true";
         }
@@ -87,7 +91,7 @@
             result="true";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -107,6 +111,7 @@
 
         String msg="";
         String result="";
+        String code="0";
 
         try {
             PgRoad pgRoad=pgRoadManager.get(Long.valueOf(id));
@@ -123,6 +128,7 @@
                 pgRoadManager.save(pgRoad);
                 msg="道路信息保存成功";
                 result="true";
+                code="200";
             }
         }
         catch(Exception e){
@@ -130,6 +136,7 @@
             result="false";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -147,6 +154,7 @@
 
         String msg="";
         String result="";
+        String code="0";
         PgRoad pgRoad=null;
 
         try{
@@ -159,6 +167,7 @@
                 pgRoad.setActive(0);
                 pgRoadManager.save(pgRoad);
                 msg="道路删除成功";
+                code="200";
                 result="true";
             }
         }
@@ -168,6 +177,7 @@
             e.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -184,26 +194,29 @@
         Map<String,Object> resultMap=new HashMap<String, Object>();
         String msg="";
         String result="";
+        String code="0";
 
         List<PgPartitionDto> pgPartitionDtoList=null;
         try{
             PgRoad pgRoad=pgRoadManager.getPgRoadByName(roadName);
             if(pgRoad==null)
                 msg="不存在道路信息";
-            else
-            {
-                pgPartitionDtoList=pgPartitionManager.getPgPartitonDtoByRoad(pgRoad);
-                if(pgPartitionDtoList==null||pgPartitionDtoList.size()==0)
-                    msg="该道路没有分区信息";
-                else
-                    msg="分区信息获取成功";
+            else {
+                pgPartitionDtoList = pgPartitionManager.getPgPartitonDtoByRoad(pgRoad);
+                if (pgPartitionDtoList == null || pgPartitionDtoList.size() == 0)
+                    msg = "该道路没有分区信息";
+                else {
+                    code="200";
+                    msg = "分区信息获取成功";
+                }
             }
         }
         catch (Exception e)
         {
+            e.printStackTrace();
             msg="分区信息获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgPartitionDtoList);
 

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 25ded8a..283d7ab 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,20 +7,56 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" 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/construction/manager/PgCsDocumentManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/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/manager/PgAlarmManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/~$说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/~$说明20191207.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.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$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/接口说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明20191207.docx" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
@@ -51,7 +87,7 @@
         <counts>
           <entry key="class" value="4" />
           <entry key="iml" value="2" />
-          <entry key="java" value="707" />
+          <entry key="java" value="820" />
           <entry key="properties" value="14" />
           <entry key="xml" value="7" />
         </counts>
@@ -60,7 +96,7 @@
         <counts>
           <entry key="CLASS" value="4" />
           <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="707" />
+          <entry key="JAVA" value="820" />
           <entry key="Properties" value="14" />
           <entry key="XML" value="7" />
         </counts>
@@ -68,32 +104,32 @@
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
           <entry key="dummy" value="38" />
-          <entry key="java" value="30161" />
+          <entry key="java" value="40859" />
           <entry key="properties" value="100" />
-          <entry key="txt" value="176" />
+          <entry key="txt" value="186" />
           <entry key="xml" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="30161" />
-          <entry key="PLAIN_TEXT" value="214" />
+          <entry key="JAVA" value="40859" />
+          <entry key="PLAIN_TEXT" value="224" />
           <entry key="Properties" value="100" />
           <entry key="XML" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="48" />
+          <entry key="project.closed" value="51" />
           <entry key="project.open.time.1" value="5" />
           <entry key="project.open.time.12" value="2" />
           <entry key="project.open.time.13" value="1" />
           <entry key="project.open.time.15" value="1" />
           <entry key="project.open.time.16" value="1" />
           <entry key="project.open.time.17" value="1" />
-          <entry key="project.open.time.2" value="1" />
+          <entry key="project.open.time.2" value="2" />
           <entry key="project.open.time.20" value="1" />
-          <entry key="project.open.time.23" value="1" />
+          <entry key="project.open.time.23" value="2" />
           <entry key="project.open.time.24" value="2" />
           <entry key="project.open.time.251" value="1" />
           <entry key="project.open.time.27" value="2" />
@@ -106,8 +142,8 @@
           <entry key="project.open.time.36" value="1" />
           <entry key="project.open.time.37" value="1" />
           <entry key="project.open.time.39" value="2" />
-          <entry key="project.open.time.4" value="2" />
-          <entry key="project.open.time.40" value="1" />
+          <entry key="project.open.time.4" value="3" />
+          <entry key="project.open.time.40" value="2" />
           <entry key="project.open.time.41" value="2" />
           <entry key="project.open.time.42" value="2" />
           <entry key="project.open.time.43" value="2" />
@@ -122,23 +158,25 @@
           <entry key="project.open.time.6" value="3" />
           <entry key="project.open.time.63" value="2" />
           <entry key="project.open.time.64" value="1" />
+          <entry key="project.open.time.66" value="1" />
           <entry key="project.open.time.71" value="2" />
+          <entry key="project.open.time.74" value="1" />
           <entry key="project.open.time.76" value="1" />
           <entry key="project.open.time.8" value="2" />
           <entry key="project.open.time.9" value="1" />
           <entry key="project.open.time.97" value="1" />
-          <entry key="project.opened" value="78" />
+          <entry key="project.opened" value="84" />
         </counts>
       </usages-collector>
     </session>
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+            <state relative-caret-position="396">
+              <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
               <folding>
                 <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
                 <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -147,73 +185,6 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <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="99">
-              <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-              <folding>
-                <element signature="imports" expanded="true" />
-                <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-1170">
-              <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state>
-              <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
-              <folding>
-                <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-                <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="true">
-        <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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-              <folding>
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-                <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>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <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="352">
-              <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -225,18 +196,9 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>inCriteria</find>
-      <find>getPgPlanResulList</find>
-      <find>getPileAcuListByPileAcuStr</find>
-      <find>distinct</find>
-      <find>order</find>
-      <find>canPlanLine</find>
-      <find>isExistLine</find>
-      <find>getPlanResult</find>
       <find>pgPipeLine</find>
       <find>getPipeLineBylineName</find>
       <find>StringU</find>
-      <find>getAllAlarm</find>
       <find>getAlarmList</find>
       <find>getPgInPersonListByDay</find>
       <find>getDayInPgStatistic</find>
@@ -254,7 +216,16 @@
       <find>getPgContructionByNameOrType</find>
       <find>&quot;&quot;,&quot;&quot;,</find>
       <find>getPgContructionDtoByNameOrType</find>
+      <find>addConstruction</find>
+      <find>getPgLineAcuHole</find>
+      <find>getPlanResult</find>
       <find>getConstruction</find>
+      <find>addPipeLine</find>
+      <find>未找到入廊数据</find>
+      <find>getCurrentHoleByAcu</find>
+      <find>getAllAlarm</find>
+      <find>getPgDeviceDtoListByPartition</find>
+      <find>getPgDeviceByDevType</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -263,57 +234,57 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlan.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileHoleManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/planData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/PlanData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
       </list>
     </option>
   </component>
@@ -359,7 +330,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -421,53 +391,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="dto" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="manager" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -479,29 +402,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="rs" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -516,6 +416,7 @@
         </subPane>
       </pane>
       <pane id="Scope" />
+      <pane id="PackagesPane" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -710,7 +611,13 @@
       <workItem from="1574902733573" duration="1829000" />
       <workItem from="1574998240004" duration="7016000" />
       <workItem from="1575247959683" duration="6997000" />
-      <workItem from="1575704345590" duration="40473000" />
+      <workItem from="1575704345590" duration="69381000" />
+      <workItem from="1575869479666" duration="721000" />
+      <workItem from="1575947104878" duration="6101000" />
+      <workItem from="1576128264436" duration="3347000" />
+      <workItem from="1576208571543" duration="22000" />
+      <workItem from="1576227513917" duration="862000" />
+      <workItem from="1576293721220" duration="18246000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -817,11 +724,18 @@
       <option name="project" value="LOCAL" />
       <updated>1575775489149</updated>
     </task>
-    <option name="localTasksCounter" value="16" />
+    <task id="LOCAL-00016" summary="整改施工信息">
+      <created>1575791780774</created>
+      <option name="number" value="00016" />
+      <option name="presentableId" value="LOCAL-00016" />
+      <option name="project" value="LOCAL" />
+      <updated>1575791780774</updated>
+    </task>
+    <option name="localTasksCounter" value="17" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="452131000" />
+    <option name="totallyTimeSpent" value="510338000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -834,9 +748,8 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
-    <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.24205749" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2647504" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -847,7 +760,7 @@
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.3295082" />
       <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.4819672" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.65737706" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.3295082" />
@@ -939,7 +852,8 @@
     <MESSAGE value="重新设计智能规划部分" />
     <MESSAGE value="完成智能规划对接" />
     <MESSAGE value="修改报警统计" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改报警统计" />
+    <MESSAGE value="整改施工信息" />
+    <option name="LAST_COMMIT_MESSAGE" value="整改施工信息" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -951,16 +865,10 @@
           <option name="timeStamp" value="3" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java</url>
-          <line>69</line>
+          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java</url>
+          <line>40</line>
           <properties />
-          <option name="timeStamp" value="21" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java</url>
-          <line>96</line>
-          <properties />
-          <option name="timeStamp" value="38" />
+          <option name="timeStamp" value="122" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
@@ -970,394 +878,452 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <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="2068">
-          <caret line="154" column="35" selection-start-line="154" selection-start-column="35" selection-end-line="154" selection-end-column="35" />
-        </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="3300">
-          <caret line="297" column="22" selection-start-line="297" selection-start-column="22" selection-end-line="297" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/StringUtils.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
-          <caret line="13" column="48" lean-forward="true" selection-start-line="13" selection-start-column="48" selection-end-line="13" selection-end-column="48" />
+          <caret line="11" column="5" selection-start-line="11" selection-start-column="5" selection-end-line="11" selection-end-column="5" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="78" lean-forward="true" selection-start-line="78" selection-end-line="78" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="616">
-          <caret line="41" column="1" selection-start-line="41" selection-start-column="1" selection-end-line="41" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="110">
-          <caret line="12" column="23" selection-start-line="12" selection-start-column="23" selection-end-line="12" selection-end-column="23" />
+        <state relative-caret-position="516">
+          <caret line="114" column="12" selection-start-line="114" selection-start-column="12" selection-end-line="114" selection-end-column="12" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="164">
-          <caret line="56" lean-forward="true" selection-start-line="56" selection-end-line="56" />
+        <state relative-caret-position="418">
+          <caret line="33" column="44" selection-start-line="33" selection-start-column="44" selection-end-line="33" selection-end-column="44" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="258">
-          <caret line="27" column="12" lean-forward="true" selection-start-line="27" selection-start-column="12" selection-end-line="27" selection-end-column="12" />
+        <state relative-caret-position="132">
+          <caret line="11" column="20" lean-forward="true" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="20" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.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="-12">
-          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        <state relative-caret-position="516">
+          <caret line="142" column="54" selection-start-line="142" selection-start-column="54" selection-end-line="142" selection-end-column="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="858">
-          <caret line="55" column="27" lean-forward="true" selection-start-line="55" selection-start-column="27" selection-end-line="55" selection-end-column="27" />
+        <state relative-caret-position="66">
+          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="58">
+          <caret line="18" column="28" selection-start-line="18" selection-start-column="19" selection-end-line="18" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="305">
+          <caret line="24" column="31" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="714">
+          <caret line="58" column="5" lean-forward="true" selection-start-line="58" selection-start-column="5" selection-end-line="58" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="924">
+          <caret line="134" column="92" selection-start-line="134" selection-start-column="92" selection-end-line="134" selection-end-column="92" />
+          <folding>
+            <element signature="method#linkDevice#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkPartitionCamera#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkReservePlan#0;class#PgAlarmLinkRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1066">
+          <caret line="90" lean-forward="true" selection-start-line="90" selection-end-line="90" />
+          <folding>
+            <element signature="method#getTjResultByAlarmType#0;class#PgAlarmTjRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="946">
+          <caret line="148" column="11" lean-forward="true" selection-start-line="148" selection-start-column="11" selection-end-line="148" selection-end-column="11" />
+          <folding>
+            <element signature="method#getAlarmTypeList#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#addAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#editAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#deleteAlarmType#0;class#PgAlarmTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="208">
+          <caret line="46" column="23" lean-forward="true" selection-start-line="46" selection-start-column="23" selection-end-line="46" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="113" column="9" lean-forward="true" selection-start-line="113" selection-start-column="9" selection-end-line="113" selection-end-column="9" />
+          <folding>
+            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
+            <element signature="method#getNewestCh4InfoByDev#0;class#PgCh4Rs#0" />
+            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="145" column="6" lean-forward="true" selection-start-line="145" selection-start-column="6" selection-end-line="145" selection-end-column="6" />
+          <folding>
+            <element signature="method#addAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#editAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#deleteAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#getAuthorityList#0;class#PgAuthorityRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="58" column="1" lean-forward="true" selection-start-line="58" selection-start-column="1" selection-end-line="58" selection-end-column="1" />
+          <folding>
+            <element signature="method#getPgAssetPlanList#0;class#PgAssetPlanRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="370">
+          <caret line="371" column="66" selection-start-line="371" selection-start-column="66" selection-end-line="371" selection-end-column="66" />
+          <folding>
+            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#searchConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionDev#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="139" column="13" lean-forward="true" selection-start-line="139" selection-start-column="13" selection-end-line="139" selection-end-column="13" />
+          <folding>
+            <element signature="method#getCoInfoByDevAndDate#0;class#PgCoRs#0" />
+            <element signature="method#getNewestCoInfoByDev#0;class#PgCoRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="540">
+          <caret line="223" column="5" lean-forward="true" selection-start-line="223" selection-start-column="5" selection-end-line="223" selection-end-column="5" />
+          <folding>
+            <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="682">
+          <caret line="100" lean-forward="true" selection-start-line="100" selection-end-line="100" />
+          <folding>
+            <element signature="method#getDeviceTpeyList#0;class#PgDeviceTypeRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="377">
+          <caret line="225" column="35" selection-start-line="225" selection-start-column="35" selection-end-line="225" selection-end-column="35" />
+          <folding>
+            <element signature="method#addEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#addEquipment#1;class#PgEquipmentRs#0" />
+            <element signature="method#getEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#deleteEquipment#0;class#PgEquipmentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="406">
+          <caret line="109" lean-forward="true" selection-start-line="109" selection-end-line="109" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="154">
+          <caret line="28" column="19" selection-start-line="28" selection-start-column="19" selection-end-line="28" selection-end-column="19" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="748">
-          <caret line="49" column="5" lean-forward="true" selection-start-line="49" selection-start-column="5" selection-end-line="49" selection-end-column="5" />
+        <state relative-caret-position="296">
+          <caret line="161" column="35" selection-start-line="161" selection-start-column="35" selection-end-line="161" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="384">
+          <caret line="99" column="5" lean-forward="true" selection-start-line="99" selection-start-column="5" selection-end-line="99" selection-end-column="5" />
+        </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="362">
+          <caret line="340" column="35" selection-start-line="340" selection-start-column="35" selection-end-line="340" selection-end-column="35" />
+          <folding>
+            <element signature="method#addInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPersonInPg#0;class#PgInPgPersonRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-606">
+          <caret line="76" column="20" lean-forward="true" selection-start-line="76" selection-start-column="20" selection-end-line="76" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="65" column="35" selection-start-line="65" selection-start-column="35" selection-end-line="65" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="101" column="35" selection-start-line="101" selection-start-column="35" selection-end-line="101" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="84" column="35" selection-start-line="84" selection-start-column="35" selection-end-line="84" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="59" lean-forward="true" selection-start-line="59" selection-end-line="59" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="60" column="1" lean-forward="true" selection-start-line="60" selection-start-column="1" selection-end-line="60" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="145" column="35" selection-start-line="145" selection-start-column="35" selection-end-line="145" selection-end-column="35" />
+        </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="274">
+          <caret line="350" column="35" selection-start-line="350" selection-start-column="35" selection-end-line="350" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="121" column="39" selection-start-line="121" selection-start-column="39" selection-end-line="121" selection-end-column="39" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="28" column="8" lean-forward="true" selection-start-line="28" selection-start-column="8" selection-end-line="28" selection-end-column="8" />
+        <state relative-caret-position="340">
+          <caret line="103" selection-start-line="103" selection-end-line="103" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="226" column="35" selection-start-line="226" selection-start-column="35" selection-end-line="226" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="203" column="35" selection-start-line="203" selection-start-column="35" selection-end-line="203" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="241" column="35" selection-start-line="241" selection-start-column="35" selection-end-line="241" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="225" column="1" lean-forward="true" selection-start-line="225" selection-start-column="1" selection-end-line="225" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="176" column="5" lean-forward="true" selection-start-line="176" selection-start-column="5" selection-end-line="176" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="178" column="35" lean-forward="true" selection-start-line="178" selection-start-column="35" selection-end-line="178" selection-end-column="35" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="516">
-          <caret line="94" column="53" selection-start-line="94" selection-start-column="53" selection-end-line="94" selection-end-column="53" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="814">
-          <caret line="52" column="9" lean-forward="true" selection-start-line="52" selection-start-column="9" selection-end-line="52" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="182">
-          <caret line="58" column="12" lean-forward="true" selection-start-line="58" selection-start-column="12" selection-end-line="58" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="34" lean-forward="true" selection-start-line="34" selection-end-line="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="32" lean-forward="true" selection-start-line="32" selection-end-line="32" />
-          <folding>
-            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
-            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="185">
-          <caret line="63" column="13" selection-start-line="63" selection-start-column="13" selection-end-line="63" selection-end-column="13" />
-          <folding>
-            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
-            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
-            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="e#6319#6324#0" />
-            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
-          </folding>
+          <caret line="240" lean-forward="true" selection-start-line="240" selection-end-line="240" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
-          <caret line="58" column="28" lean-forward="true" selection-start-line="58" selection-start-column="28" selection-end-line="58" selection-end-column="28" />
-          <folding>
-            <element signature="method#addTempHumData#0;class#PgTempHumRs#0" />
-          </folding>
+        <state relative-caret-position="340">
+          <caret line="148" column="34" selection-start-line="148" selection-start-column="34" selection-end-line="148" selection-end-column="34" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
+        <state relative-caret-position="458">
+          <caret line="99" column="35" selection-start-line="99" selection-start-column="35" selection-end-line="99" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+        <state relative-caret-position="384">
+          <caret line="145" column="32" lean-forward="true" selection-start-line="145" selection-start-column="32" selection-end-line="145" selection-end-column="32" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="414">
-          <caret line="22" column="46" lean-forward="true" selection-start-line="22" selection-start-column="46" selection-end-line="22" selection-end-column="46" />
-        </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="396">
-          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" column="83" selection-start-line="11" selection-start-column="83" selection-end-line="11" selection-end-column="83" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="26">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
-          <folding>
-            <element signature="method#getPgInPgStatusByPerson#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNumByName#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNum#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPersonListByDay#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPgStatusByPgInPgPerson#0;class#PgInPgStatusManager#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="44">
-          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-12">
-          <caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="87" lean-forward="true" selection-start-line="87" selection-end-line="87" />
-          <folding>
-            <element signature="method#getConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#addConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#deleteConstructionType#0;class#PgConstructionTypeRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
-          <folding>
-            <element signature="method#getConstructionTypeByType#0;class#PgConstructionTypeManager#0" />
-            <element signature="method#getAllConstructionTypeDto#0;class#PgConstructionTypeManager#0" />
-          </folding>
-        </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="145">
-          <caret line="258" column="9" lean-forward="true" selection-start-line="258" selection-start-column="9" selection-end-line="258" selection-end-column="9" />
-          <folding>
-            <element signature="method#getMonthInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayInPgStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgOverViewRs#0" />
-            <element signature="method#getAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getMonthAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayAlarmStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgOverViewRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="103">
-          <caret line="105" column="50" lean-forward="true" selection-start-line="105" selection-start-column="50" selection-end-line="105" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateBasicDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="99">
-          <caret line="125" selection-start-line="125" selection-end-line="125" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="190">
-          <caret line="24" column="35" lean-forward="true" selection-start-line="24" selection-start-column="35" selection-end-line="24" selection-end-column="35" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="436">
-          <caret line="24" lean-forward="true" selection-start-line="24" selection-end-line="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" lean-forward="true" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="300">
-          <caret line="34" column="31" lean-forward="true" selection-start-line="34" selection-start-column="31" selection-end-line="34" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="42" column="13" lean-forward="true" selection-start-line="42" selection-start-column="13" selection-end-line="42" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="120" column="72" lean-forward="true" selection-start-line="120" selection-start-column="72" selection-end-line="120" selection-end-column="72" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="293">
-          <caret line="58" column="73" lean-forward="true" selection-start-line="58" selection-start-column="73" selection-end-line="58" selection-end-column="73" />
-          <folding>
-            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
-            <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
-          </folding>
-        </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="307">
-          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
+        <state relative-caret-position="758">
+          <caret line="130" column="5" lean-forward="true" selection-start-line="130" selection-start-column="5" selection-end-line="130" selection-end-column="5" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1170">
-          <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
+        <state relative-caret-position="494">
+          <caret line="86" column="62" lean-forward="true" selection-start-line="86" selection-start-column="62" selection-end-line="86" selection-end-column="62" />
           <folding>
-            <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-            <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+            <element signature="method#getAllDevice#0;class#PgDeviceManager#0" />
+            <element signature="method#getAllDev#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="195" column="28" lean-forward="true" selection-start-line="195" selection-start-column="28" selection-end-line="195" selection-end-column="28" />
+        <state relative-caret-position="166">
+          <caret line="174" column="13" lean-forward="true" selection-start-line="174" selection-start-column="13" selection-end-line="174" selection-end-column="13" />
           <folding>
-            <element signature="method#getAlarmByTypeAndTime#0;class#PgAlarmManager#0" />
-            <element signature="method#getAlarmNum#0;class#PgAlarmManager#0" />
             <element signature="method#getDayAlarmStatistic#0;class#PgAlarmManager#0" />
+            <element signature="method#getAlarmList#0;class#PgAlarmManager#0" />
             <element signature="method#createDTO#0;class#PgAlarmManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="364">
+          <caret line="46" column="56" lean-forward="true" selection-start-line="46" selection-start-column="56" selection-end-line="46" selection-end-column="56" />
+          <folding>
+            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
+            <element signature="method#getPgDev#0;class#PgDeviceRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
+            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+        <state relative-caret-position="396">
+          <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
           <folding>
             <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
             <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -1365,52 +1331,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="239">
-          <caret line="21" column="33" lean-forward="true" selection-start-line="21" selection-start-column="33" selection-end-line="21" selection-end-column="33" />
-        </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="352">
-          <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-        </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="99">
-          <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-          </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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-          <folding>
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-            <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>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
index c436c93..e913155 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
@@ -132,7 +132,10 @@
             this.setAlarmType("");
         else
             this.setAlarmType(pgAlarm.getAlarmTypeId().getAlarmType());
-        this.setAlarmValue(pgAlarm.getAlarmValue());
+        if(pgAlarm.getAlarmValue()==null)
+            this.setAlarmValue("");
+        else
+            this.setAlarmValue(pgAlarm.getAlarmValue());
         if (pgAlarm.getAlarmDate() != null)
             this.setAlarmDate(sdf.format(pgAlarm.getAlarmDate()));
         else
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
index a43965c..565cb41 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -159,11 +159,21 @@
     }
 
     //获取历史报警消息列表
-    public List<PgAlarmDto> getAllAlarm(String alarmType,String startDay,String endDay,String isNew,int page,int rows) {
-        try {
+    public  Map<String, Object> getAllAlarm(String alarmType,String partition,String startDay,String endDay,String isNew,int page,int rows) {
 
+        Map<String, Object> resultMap = new HashMap<>();
+        String msg="";
+
+        try {
             Criteria criteria = createCriteria(PgAlarm.class);
 
+            if (StringUtils.isNotBlank(partition)) {
+                DetachedCriteria inCriteria = DetachedCriteria.forClass(PgDevice.class);
+                inCriteria.add(Restrictions.eq("partition", partition));
+                inCriteria.setProjection(Property.forName("id"));
+                criteria.add(Property.forName("alarmDevId").in(inCriteria));
+            }
+
             if (StringUtils.isNotBlank(alarmType)&&!alarmType.contains("全部")&&pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
                 criteria.add(Restrictions.eq("alarmTypeId", pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)));
 
@@ -190,8 +200,16 @@
             for (PgAlarm pgAlarm : pgAlarmList) {
                 pgAlarmDtoList.add(new PgAlarmDto(pgAlarm));
             }
-
-            return pgAlarmDtoList;
+            if(pgAlarmDtoList==null||pgAlarmDtoList.size()==0) {
+                resultMap.put("msg", "没有报警信息");
+                resultMap.put("code","0");
+            }else {
+                resultMap.put("code","200");
+                resultMap.put("msg", "报警信息获取成功");
+            }
+            resultMap.put("count",pg.getTotalCount());
+            resultMap.put("result",pgAlarmDtoList);
+            return resultMap;
         }
         catch(Exception ex){
             ex.printStackTrace();
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index 7547560..654f49e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -24,11 +24,11 @@
 
         Criteria criteria = createCriteria(PgDevice.class);
 
-        if(road!=null)
+        if(StringUtils.isNotBlank(road))
             criteria.add(Restrictions.eq("road",road));
-        if(partition!=null)
+        if(StringUtils.isNotBlank(partition))
             criteria.add(Restrictions.eq("partition",partition));
-        if(devType!=null)
+        if(StringUtils.isNotBlank(devType))
             criteria.add(Restrictions.eq("devType",devType));
 
         criteria.add(Restrictions.eq("active", 1));
@@ -43,6 +43,29 @@
         return pgDeviceDtoList;
     }
 
+    public List<PgDeviceDto> getAllDev(String road,String partition,String devType) {
+
+        Criteria criteria = createCriteria(PgDevice.class);
+
+        if(StringUtils.isNotBlank(road))
+            criteria.add(Restrictions.eq("road",road));
+        if(StringUtils.isNotBlank(partition))
+            criteria.add(Restrictions.eq("partition",partition));
+        if(StringUtils.isNotBlank(devType))
+            criteria.add(Restrictions.like("devType","%"+devType+"%"));
+
+        criteria.add(Restrictions.eq("active", 1));
+        criteria.addOrder(Order.desc("id"));
+        List<PgDevice> pgDeviceList = criteria.list();
+
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
+        for (PgDevice pgDevice : pgDeviceList) {
+            pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
+        }
+
+        return pgDeviceDtoList;
+    }
+
     //根据名字获取当前设备
     public PgDevice getDeviceByAssetCode(String assetCode) {
         Criteria criteria=createCriteria(PgDevice.class);
@@ -56,9 +79,9 @@
     }
 
     //根据类型获取设备列表
-    public List<PgDeviceDto> getDeviceByDevTypee(String devType) {
+    public List<PgDeviceDto> getDeviceByDevType(String devType) {
         Criteria criteria=createCriteria(PgDevice.class);
-        criteria.add(Restrictions.eq("devType",devType));
+        criteria.add(Restrictions.like("devType","%"+devType+"%"));
 
         List<PgDevice> pgDeviceList=criteria.list();
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
@@ -106,7 +129,7 @@
         criteria.add(Restrictions.eq("partition",partition));
 
         List<PgDevice> pgDeviceList=criteria.list();
-        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<PgDeviceDto>();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
 
         for (PgDevice pgDevice : pgDeviceList) {
             pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
index 3a3bccd..595730e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
@@ -1,10 +1,13 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.devTable.domain.PgAlarmType;
 import com.casic.PgInterface.devTable.domain.PgPartition;
 import com.casic.PgInterface.devTable.domain.PgRoad;
 import com.casic.PgInterface.devTable.domain.PipeGallery;
 import com.casic.PgInterface.devTable.dto.PgPartitionDto;
+import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
@@ -12,7 +15,9 @@
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Created by yxw on 2017/11/4.
@@ -21,7 +26,8 @@
 public class PgPartitionManager extends HibernateEntityDao<PgPartition> {
 
     @Resource
-    PgRoadManager pgRoadManager;
+    private PgRoadManager pgRoadManager;
+
 
     public PgPartition getPartitionByParName(String parName) {
         Criteria criteria = getSession().createCriteria(PgPartition.class);
@@ -99,4 +105,5 @@
         return pgPartitionDtoList;
     }
 
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
index f216360..a6928f1 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
@@ -5,6 +5,7 @@
 public class PgPlanResultRe {
 
     private String taskKey;
+    private List<String> pileAcuList;
     private List<PgPlanResult> pgPlanResultList;
 
     public String getTaskKey() {
@@ -15,6 +16,14 @@
         this.taskKey = taskKey;
     }
 
+    public List<String> getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(List<String> pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+
     public List<PgPlanResult> getPgPlanResultList() {
         return pgPlanResultList;
     }
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
index 71ea765..47eea07 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
@@ -54,9 +54,7 @@
 
         List<PgLineHole> pgLineHoleList=criteria.list();
         List<PgLineHoleDTO> pgLineHoleDTOList=new ArrayList<>();
-        if(pgLineHoleList==null||pgLineHoleList.size()==0)
-            return null;
-        else
+        if(pgLineHoleList!=null&&pgLineHoleList.size()!=0)
             pgLineHoleDTOList=PgLineHoleDTO.ConvertToDTOList(pgLineHoleList,pgPileAcuManager,pgRoadManager);
         return pgLineHoleDTOList;
     }
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
index 0fd9e1f..841a386 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
@@ -1,12 +1,15 @@
 package com.casic.PgInterface.intelPlan.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.devTable.domain.PgPartition;
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
 import com.casic.PgInterface.intelPlan.domain.PgLineHole;
 import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
 import com.casic.PgInterface.intelPlan.domain.PgSection;
 import com.casic.PgInterface.intelPlan.dto.PgPlanResult;
 import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
 import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -22,6 +25,9 @@
     @Resource
     private PgLineHoleManager pgLineHoleManager;
 
+    @Resource
+    private PgRoadManager pgRoadManager;
+
     public PgPileAcu getPgPileAcuByCode(String acuCode){
         List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
 
@@ -58,7 +64,9 @@
         for(PgPlanTask pgPlanTask:pgPlanTaskList){
             List<PgPlanResult> pgPlanResultList=getPgPlanResultByPlantask(pgPlanTask);
             PgPlanResultRe pgPlanResultRe=new PgPlanResultRe();
+
             pgPlanResultRe.setTaskKey(pgPlanTask.getTaskKey());
+            pgPlanResultRe.setPileAcuList(pgPlanTask.getPileAcuList());
             pgPlanResultRe.setPgPlanResultList(pgPlanResultList);
 
             pgPlanResultReList.add(pgPlanResultRe);
@@ -142,4 +150,57 @@
         return length;
     }
 
+    private PgPileAcu getPgPileAcuByAcuCode(String acuCode){
+        List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
+
+        if(pgPileAcuList==null||pgPileAcuList.size()==0)
+            return null;
+        else
+            return pgPileAcuList.get(0);
+    }
+
+    public List<PgAcuTask> getACUTask(String pileAcuList){
+        String[] acuArray=pileAcuList.split(",");
+        List<PgAcuTask> pgAcuTaskList=new ArrayList<>();
+
+        for(String acu:acuArray){
+            PgPileAcu pgPileAcu=this.getPgPileAcuByCode(acu);
+            String roadName=pgRoadManager.get(pgPileAcu.getRoadId()).getRoadName();
+
+            if(!containRoad(roadName,pgAcuTaskList))
+            {
+                PgAcuTask pgAcuTask=new PgAcuTask();
+                pgAcuTask.setRoadName(roadName);
+                pgAcuTask.setPileAcuList(acu);
+                pgAcuTaskList.add(pgAcuTask);
+            }
+            else{
+                PgAcuTask pgAcuTask=getIndexRoad(roadName,pgAcuTaskList);
+                if(pgAcuTask!=null)
+                    pgAcuTask.setPileAcuList(pgAcuTask.getPileAcuList()+","+acu);
+            }
+        }
+
+        return pgAcuTaskList;
+    }
+
+    private boolean containRoad(String roadName,List<PgAcuTask> pgAcuTaskList){
+        if(pgAcuTaskList==null||pgAcuTaskList.size()==0) return false;
+        for(PgAcuTask pgAcuTask:pgAcuTaskList){
+            if(pgAcuTask.getRoadName().equals(roadName))
+                return true;
+        }
+
+        return false;
+    }
+
+    private PgAcuTask getIndexRoad(String roadName, List<PgAcuTask> pgAcuTaskList){
+        for(PgAcuTask pgAcuTask:pgAcuTaskList){
+            if(pgAcuTask.getRoadName().equals(roadName))
+                return pgAcuTask;
+        }
+
+        return null;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java
new file mode 100644
index 0000000..323f7ef
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java
@@ -0,0 +1,25 @@
+package com.casic.PgInterface.reservePlan.dto;
+
+import java.util.List;
+
+public class PgAcuTask {
+
+    private String roadName;//道路
+    private String pileAcuList;//acu分区
+
+    public String getRoadName() {
+        return roadName;
+    }
+
+    public void setRoadName(String roadName) {
+        this.roadName = roadName;
+    }
+
+    public String getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(String pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
index c25e926..c7d7693 100644
--- a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
@@ -70,9 +70,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(Long.valueOf(inPgPersonId));
         PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("hostName",pgInPgPerson.getAssetCode());
-//        PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode());
-//        long maxId = pgTagPositionManager.getMaxId(pgTagMac.getTagMac());
-//        PGTagPosition pgTagPosition = pgTagPositionManager.get(maxId);
+
         PGTagPosition pgTagPosition = tagmacRun.GetTagStatus(pgTagMac);
         boolean bExist = false;
         bExist = pgTagPositionManager.findTagPosition(pgTagPosition.getPositionUpdatetime(),pgTagPosition.getHostId());
@@ -104,8 +102,7 @@
         PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(Long.valueOf(inPgPersonId));
         PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pgInPgPersonId",pgInPgPerson);
         System.out.println("time:"+pgInPgStatus.getInTime());
-//        PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pgInPgPersonId",inPgPersonId);
-//        PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode());
+
         PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("hostName",pgInPgPerson.getAssetCode());
 
         Map<Object,Object> mapPosition = new HashMap<>();
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
index 082ba5d..3eed00a 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
@@ -48,6 +48,7 @@
     public Map<String, Object> linkDevice(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         PgDeviceDto pgDeviceDto = null;
         try {
@@ -62,6 +63,7 @@
                     else {
                         pgDeviceDto = new PgDeviceDto(pgDevice);
                         msg = "报警关联设备获取成功";
+                        code="200";
                     }
                 }
             }
@@ -71,6 +73,7 @@
             e.printStackTrace();
             msg = "获取关联设备失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceDto);
 
@@ -86,6 +89,7 @@
     public Map<String, Object> linkPartitionCamera(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
         try {
@@ -106,6 +110,7 @@
 
                         pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(partition,position);
                         msg = "关联设备获取成功";
+                        code="200";
                     }
                 }
             }
@@ -115,6 +120,7 @@
             e.printStackTrace();
             msg = "分区设备关联失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceDtoList);
         return resultMap;
@@ -129,6 +135,7 @@
     public Map<String, Object> linkReservePlan(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgReservePlanDto> pgReservePlanDtoList=new ArrayList<>();
         try{
@@ -139,10 +146,12 @@
                 else {
                     pgReservePlanDtoList = pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
 
-                    if(pgReservePlanDtoList==null||pgReservePlanDtoList.size()==0)
-                        msg="不存在关联的报警预案";
-                    else
+                    if (pgReservePlanDtoList == null || pgReservePlanDtoList.size() == 0)
+                        msg = "不存在关联的报警预案";
+                    else {
                         msg = "关联预案获取成功";
+                        code="200";
+                    }
                 }
             }
             else
@@ -153,6 +162,7 @@
             e.printStackTrace();
             msg="预案关联失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgReservePlanDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
index 0ddbc4d..0ce886b 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
@@ -41,25 +41,19 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getAlarmList(@FormParam("alarmType") String alarmType,
                                             @FormParam("startDay") String startDay,
+                                            @FormParam("partition") String partition,
                                             @FormParam("endDay") String endDay,
                                             @FormParam("isNew") String isNew,
                                             @FormParam("page") int page,
                                             @FormParam("rows") int rows) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
         try {
-            pgAlarmDtoList = pgAlarmManager.getAllAlarm(alarmType,startDay,endDay,isNew,page,rows);
-            if (pgAlarmDtoList==null||pgAlarmDtoList.size() == 0)
-                msg = "没有报警信息";
-            else
-                msg = "报警信息获取成功";
+            resultMap = pgAlarmManager.getAllAlarm(alarmType,partition,startDay,endDay,isNew,page,rows);
+
         } catch (Exception e) {
             e.printStackTrace();
-            msg = "报警信息获取失败";
         }
-        resultMap.put("msg", msg);
-        resultMap.put("result", pgAlarmDtoList);
         return resultMap;
     }
 
@@ -71,9 +65,10 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> clearAlarmList(@FormParam("id") String id) throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        String result = "false";
+        String result = "";
+        String code="0";
 
         try {
             PgAlarm pgAlarm = new PgAlarm();
@@ -86,12 +81,14 @@
                 pgAlarmManager.save(pgAlarm);
                 msg = "报警信息清除成功";
                 result = "true";
+                code = "200";
             }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警信息清除失败";
             result = "false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
@@ -106,21 +103,26 @@
     public Map<String, Object> getAlarmByTypeOrTime(@FormParam("alarmType") String alarmType,
                                                     @FormParam("startTime") String startTime,
                                                     @FormParam("endTime") String endTime) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
-        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<PgAlarmDto>();
+        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
         try {
             pgAlarmDtoList = pgAlarmManager.getAlarmByTypeAndTime(alarmType, startTime, endTime);
             if (pgAlarmDtoList == null || pgAlarmDtoList.size() == 0)
                 msg = "报警信息不存在";
             else
+            {
                 msg = "报警信息获取成功";
+                code="200";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警信息获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
index 29ce8a4..ed0bf34 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
@@ -39,8 +39,8 @@
     public Map<String, Object> getAlarmRule(@FormParam("devType") String devType) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
-        System.out.println("devType:"+devType);
         List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<>();
         try {
             pgAlarmRuleDtoList = pgAlarmRuleManager.getAlarmRuleDto(devType);
@@ -52,6 +52,7 @@
             e.printStackTrace();
             msg = "报警阈值信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmRuleDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
index 24ab894..abef1b1 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
@@ -39,16 +39,21 @@
                                                      @FormParam("endDate") String endDate)throws Exception{
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
+
         List<PgAlarmTjDto> pgAlarmTjDtoList=null;
         try{
             pgAlarmTjDtoList=pgAlarmTjManager.getAlarmTjResultByType(startDate,endDate);
             msg="获取成功";
+            code="200";
         }
         catch(Exception ex) {
             msg = "统计失败";
         }
-        resultMap.put("result",pgAlarmTjDtoList);
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
+        resultMap.put("result",pgAlarmTjDtoList);
+
         return resultMap;
     }
 
@@ -61,23 +66,27 @@
     public Map<String, Object> getAlarmByTime(@FormParam("startTime") String startTime,
                                               @FormParam("endTime") String endTime,
                                               @FormParam("statisticType") String statisticType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code = "0";
 
-        List<PgAlarmTjDto> pgAlarmTjDtoList = new ArrayList<PgAlarmTjDto>();
+        List<PgAlarmTjDto> pgAlarmTjDtoList = new ArrayList<>();
         try {
             pgAlarmTjDtoList = pgAlarmTjManager.getAlarmByTime(startTime, endTime, statisticType);
             if(pgAlarmTjDtoList==null)
                 msg="报警统计信息获取失败";
-            else
-                msg="报警统计信息获取成功";
+            else {
+                msg = "报警统计信息获取成功";
+                code="200";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警统计信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmTjDtoList);
         return resultMap;
     }
 
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
index 28bc811..b6278a9 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
@@ -30,7 +30,6 @@
     @Resource
     private PgAlarmTypeManager pgAlarmTypeManager;
 
-
     /**
      * 获取报警类型
      */
@@ -38,19 +37,24 @@
     @Path("getAlarmType")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getAlarmTypeList()throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
-        List<PgAlarmTypeDto> pgAlarmTypeDtoList=new ArrayList<PgAlarmTypeDto>();
+        String code="";
+
+        List<PgAlarmTypeDto> pgAlarmTypeDtoList=new ArrayList<>();
         try {
             pgAlarmTypeDtoList = pgAlarmTypeManager.getAllAlarmTypeDto();
             if(pgAlarmTypeDtoList.size()==0)
                 msg="没有报警类型信息";
-            else
-                msg="报警类型信息获取成功";
+            else {
+                code="200";
+                msg = "报警类型信息获取成功";
+            }
         }catch(Exception e){
             e.printStackTrace();
             msg="报警类型信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAlarmTypeDtoList);
         return resultMap;
@@ -66,6 +70,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
@@ -83,6 +88,7 @@
                 logger.info("成功保存");
                 result = "true";
                 msg = "保存成功";
+                code="200";
             }
         } catch (Exception e) {
             result = "false";
@@ -90,6 +96,7 @@
             e.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -106,6 +113,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try{
             if(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
@@ -119,6 +127,7 @@
                 pgAlarmTypeManager.save(pgAlarmType);
                 result = "true";
                 msg = "编辑成功";
+                code="200";
             }
         }
         catch(Exception e)
@@ -128,6 +137,7 @@
             e.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("result",result);
         resultMap.put("msg",msg);
 
@@ -146,6 +156,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
         String result="false";
+        String code="0";
 
         try {
             PgAlarmType pgAlarmType=pgAlarmTypeManager.get(Long.valueOf(id));
@@ -157,6 +168,7 @@
             {
                 pgAlarmType.setActive(0);
                 pgAlarmTypeManager.save(pgAlarmType);
+                code="200";
                 msg="报警类型删除成功";
                 result="true";
             }
@@ -165,6 +177,7 @@
             msg="报警类型删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
index 4533e1a..85940bb 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
@@ -33,12 +33,15 @@
                                                  @FormParam("inSpectionPlace") String inSpectionPlace){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
         List<PgAssetPlanDto> pgAssetPlanDtoList=new ArrayList<>();
         try{
             pgAssetPlanDtoList=pgAssetPlanManager.getPgAssetPlanDtoList(startDay,endDay,inSpectionPlace);
-            if(pgAssetPlanDtoList!=null&&pgAssetPlanDtoList.size()!=0)
-                msg="巡检信息获取成功";
+            if(pgAssetPlanDtoList!=null&&pgAssetPlanDtoList.size()!=0) {
+                code="200";
+                msg = "巡检信息获取成功";
+            }
             else
                 msg="不存在巡检信息";
         }
@@ -47,6 +50,7 @@
             msg="巡检信息获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAssetPlanDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
index 47ef9d1..5cbdfcb 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
@@ -30,12 +30,15 @@
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
         String result="";
+        String code="0";
 
         List<PgAssetPlanStatic> pgAssetPlanStaticList = null;
         try{
             pgAssetPlanStaticList=pgAssetPlanManager.getPgAssetPlanStaticLisByTime(startTime,endTime,staticType);
-            if(pgAssetPlanStaticList!=null&&pgAssetPlanStaticList.size()!=0)
-                msg="巡检统计信息获取成功";
+            if(pgAssetPlanStaticList!=null&&pgAssetPlanStaticList.size()!=0) {
+                code = "200";
+                msg = "巡检统计信息获取成功";
+            }
             else
                 msg="统计信息获取失败";
         }
@@ -44,6 +47,7 @@
             msg="统计失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAssetPlanStaticList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
index 26f5d6a..503bfe3 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
@@ -40,6 +40,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="";
 
         try{
             PgAuthority pgAuthority=new PgAuthority();
@@ -50,6 +51,7 @@
 
             pgAuthorityManager.save(pgAuthority);
             msg="用户权限保存成功";
+            code="200";
             result="true";
         }
         catch(Exception e) {
@@ -57,6 +59,7 @@
             msg = "新增权限失败";
             result = "false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -65,22 +68,25 @@
 
     /*
        *编辑角权限信息
-        */
+    */
     @POST
     @Path("editAuthority")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> editAuthority(@FormParam("id") String id,
                                        @FormParam("authority") String authority,
                                        @FormParam("concent") String concent) throws Exception{
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
+
         try {
             PgAuthority pgAuthority=pgAuthorityManager.get(Long.valueOf(id));
             pgAuthority.setAuthority(authority);
             pgAuthority.setConcent(concent);
 
             pgAuthorityManager.save(pgAuthority);
+            code="200";
             msg="权限保存成功";
             result="true";
         }
@@ -90,7 +96,7 @@
             msg="权限编辑失败";
             result="false";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -105,9 +111,10 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> deleteAuthority(@FormParam("id") String id)throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
-        String result="false";
+        String result="";
+        String code="0";
 
         try {
             PgAuthority pgAuthority= pgAuthorityManager.get(Long.valueOf(id));
@@ -119,6 +126,7 @@
             {
                 pgAuthority.setActive(0);
                 pgAuthorityManager.save(pgAuthority);
+                code="200";
                 msg="删除权限成功";
                 result="true";
             }
@@ -127,37 +135,40 @@
             msg="删除权限失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
     }
 
     /*
-* 获取权限信息
- */
+    * 获取权限信息
+    */
     @POST
     @Path("getAuthorityList")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> getAuthorityList() {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgAuthorityDto> pgAuthorityDtoList = new ArrayList<PgAuthorityDto>();
         try {
             pgAuthorityDtoList = pgAuthorityManager.getAuthorityList();
             if (pgAuthorityDtoList == null)
                 msg = "不存在权限信息";
-            else
+            else {
+                code = "200";
                 msg = "权限信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "权限信息获取是失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAuthorityDtoList);
         return resultMap;
     }
 
 
-
-
 }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
index a9ef521..a74ecc7 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
@@ -45,6 +45,7 @@
                                                @FormParam("endDate") String endDate)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgHistoryDataDto> pgHistoryDataDtoList=new ArrayList<>();
 
         try {
@@ -55,13 +56,16 @@
                 pgHistoryDataDtoList=pgCh4Manager.getAllCH4Data(pgDevice,startDate,endDate);
                 if(pgHistoryDataDtoList==null)
                     msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+                else {
+                    code = "200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgHistoryDataDtoList);
         return resultMap;
@@ -75,8 +79,9 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getNewestCh4InfoByDev(@FormParam("assetCode") String assetCode)throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
+        String code="0";
         PgCh4Dto pgCh4Dto=new PgCh4Dto(null);
 
         try {
@@ -87,13 +92,17 @@
                 pgCh4Dto=pgCh4Manager.getNewestCH4Data(pgDevice);
                 if(pgCh4Dto==null)
                     msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgCh4Dto);
         return resultMap;
@@ -111,6 +120,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
@@ -127,6 +137,7 @@
                 pgCh4.setPgDeviceId(pgDevice);
 
                 pgCh4Manager.save(pgCh4);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -135,7 +146,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
index a7eac39..dfc8ca5 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
@@ -43,23 +43,27 @@
                                                       @FormParam("endDate") String endDate)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgHistoryDataDto> pgHistoryDataDtoList=new ArrayList<>();
 
         try {
             PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
                 msg="设备不存在";
-            else{
-                pgHistoryDataDtoList=pgCoManager.getAllCoData(pgDevice, startDate, endDate);
-                if(pgHistoryDataDtoList==null)
-                    msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+            else {
+                pgHistoryDataDtoList = pgCoManager.getAllCoData(pgDevice, startDate, endDate);
+                if (pgHistoryDataDtoList == null)
+                    msg = "没有满足要求的数据";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgHistoryDataDtoList);
         return resultMap;
@@ -75,6 +79,7 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         PgCoDto pgCoDto=new PgCoDto(null);
 
         try {
@@ -85,13 +90,16 @@
                 pgCoDto=pgCoManager.getNewestCoData(pgDevice);
                 if(pgCoDto==null)
                     msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgCoDto);
         return resultMap;
@@ -110,6 +118,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         try {
@@ -126,6 +135,7 @@
 
                 pgCoManager.save(pgCo);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
         } catch (Exception e) {
@@ -133,7 +143,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
index b4b826e..9af98a3 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
@@ -60,6 +60,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         try {
 
@@ -80,8 +81,8 @@
                 pgConstruction.setPgConstructionTypeId(pgConstructionType.getId());
                 pgConstruction.setActive(1);
                 pgConstruction.setParName(parName);
-                logger.info("保存成功");
                 pgConstructionManager.save(pgConstruction);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -90,6 +91,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("success", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -116,6 +118,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
@@ -140,6 +143,7 @@
                 pgConstruction.setParName(parName);
 
                 pgConstructionManager.save(pgConstruction);
+                code="200";
                 result = "true";
                 msg = "编辑成功";
             }
@@ -150,7 +154,7 @@
             e.printStackTrace();
 
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -167,6 +171,8 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
+
         try {
             PgConstruction pgConstruction = pgConstructionManager.get(Long.valueOf(id));
             if (pgConstruction == null)
@@ -177,6 +183,7 @@
             {
                 pgConstruction.setActive(0);
                 pgConstructionManager.save(pgConstruction);
+                code="200";
                 result = "true";
                 msg = "成功删除信息";
             }
@@ -185,6 +192,7 @@
             result = "false";
             msg = "删除失败";
         }
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -204,9 +212,11 @@
                                                   @FormParam("rows") int rows)throws Exception{
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
         List<PgConstructionDto> pgConstructionDtoList=new ArrayList<>();
         try{
             pgConstructionDtoList=pgConstructionManager.getPgContructionDto(cs_name,cs_type,startTime,endTime,page,rows);
+            code="200";
             msg="信息获取成功";
         }
         catch(Exception e)
@@ -214,6 +224,7 @@
             e.printStackTrace();
             msg="查询失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
 
@@ -231,18 +242,22 @@
                                                               @FormParam("statisticType") String statisticType) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgConstructionStiatistic> pgConstructionStiatisticList=new ArrayList<>();
         try {
             pgConstructionStiatisticList = pgConstructionManager.getConstructionByTimeAndStatus(startTime, endTime, statisticType);
             if(pgConstructionStiatisticList==null)
                 msg="施工统计信息获取失败";
-            else
-                msg="施工统计信息获取成功";
+            else {
+                code="200";
+                msg = "施工统计信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "施工统计信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgConstructionStiatisticList);
         return resultMap;
@@ -257,6 +272,7 @@
     public Map<String, Object> getConstructionByType(@FormParam("statisticType") String statisticType){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
         List<PgConstructionStiatistic> pgConstructionStiatisticList=new ArrayList<>();
 
         try{
@@ -268,6 +284,7 @@
                 resultMap.put("result",null);
             }
             else {
+                code="200";
                 msg = "统计信息获取成功";
                 resultMap.put("result", pgConstructionStiatisticList);
             }
@@ -278,6 +295,7 @@
             msg="统计失败";
             resultMap.put("result",null);
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         return resultMap;
     }
@@ -291,9 +309,11 @@
     public Map<String, Object> getConstructionToday() throws Exception{
         Map<String,Object> resultMap=new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgConstructionDto> pgConstructionDtoList=new ArrayList<PgConstructionDto>();
         try {
             pgConstructionDtoList = pgConstructionManager.getConstructionToday();
+            code="200";
             msg = "当天施工信息获取成功";
         }
         catch(Exception e)
@@ -301,7 +321,7 @@
             e.printStackTrace();
             msg="获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
         return resultMap;
@@ -316,6 +336,7 @@
     public Map<String, Object> getConstructionDev(@FormParam("id") String id) throws Exception{
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
         List<PgDeviceDto> pgDeviceDtoList =new ArrayList<>();
         try{
@@ -325,14 +346,17 @@
 
             if(pgDeviceDtoList==null)
                 msg="信息获取失败";
-            else
-                msg="信息获取成功";
+            else {
+                code="200";
+                msg = "信息获取成功";
+            }
         }
         catch(Exception e)
         {
             e.printStackTrace();
-            msg="设备信息获取成功";
+            msg="信息获取是被";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgDeviceDtoList);
 
@@ -346,17 +370,21 @@
     @Path("getConstruction")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getConstruction() throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
-        List<PgConstructionDto> pgConstructionDtoList=new ArrayList<PgConstructionDto>();
+        String code="0";
+
+        List<PgConstructionDto> pgConstructionDtoList=new ArrayList<>();
 
         try{
             pgConstructionDtoList=pgConstructionManager.getPgConstructionList();
             if(pgConstructionDtoList==null||pgConstructionDtoList.size()==0)
                 msg="不存在施工记录";
-            else
-                msg="施工信息获取成功";
+            else {
+                code = "200";
+                msg = "施工信息获取成功";
+            }
         }
         catch(Exception e)
         {
@@ -364,6 +392,7 @@
             msg="施工信息获取失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java
index fd3d53e..2019502 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java
@@ -39,12 +39,12 @@
         try {
             pgConstructionTypeDtoList = pgConstructionTypeManager.getAllConstructionTypeDto();
             if (pgConstructionTypeDtoList.size() == 0)
-                msg = "没有项目类型信息";
+                msg = "获取失败";
             else
-                msg = "项目类型获取成功";
+                msg = "获取成功";
         } catch (Exception e) {
             e.printStackTrace();
-            msg = "项目类型信息获取失败";
+            msg = "获取失败";
         }
         resultMap.put("msg", msg);
         resultMap.put("result", pgConstructionTypeDtoList);
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
index 90d001c..037a399 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
@@ -51,6 +51,7 @@
 
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if (StringUtils.isBlank(construct_doc)||StringUtils.isBlank(doc_name))
@@ -65,6 +66,7 @@
             pgCsDocument.setActive(1);
             pgCsDocumentManager.save(pgCsDocument);
 
+            code="200";
             result = "true";
             msg = "保存成功";
 
@@ -74,6 +76,7 @@
             ex.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("success", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -90,6 +93,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             PgCsDocument pgCsDocument = pgCsDocumentManager.get(Long.valueOf(id));
@@ -103,6 +107,7 @@
 
                 pgCsDocumentManager.save(pgCsDocument);
 
+                code="200";
                 result = "true";
                 msg = "编辑成功";
             }
@@ -112,6 +117,7 @@
             msg = "编辑失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -125,9 +131,9 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
         String result="";
+        String code="0";
 
         try{
-
             PgCsDocument pgCsDocument = pgCsDocumentManager.get(Long.valueOf(id));
             if(pgCsDocument==null)
             {
@@ -137,6 +143,7 @@
             else{
                 pgCsDocument.setActive(0);
                 pgCsDocumentManager.save(pgCsDocument);
+                code="200";
                 result="true";
                 msg="删除成功";
             }
@@ -147,7 +154,7 @@
             msg="预案删除失败";
             result="false";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -168,18 +175,21 @@
 
         String msg="";
         String result="";
+        String code="0";
 
         try {
             pgCsDocumentDtoList = pgCsDocumentManager.getAllDocData(cs_name);
-            if (pgCsDocumentDtoList != null)
+            if (pgCsDocumentDtoList != null) {
+                code="200";
                 msg = "获取数据成功";
+            }
             else
                 msg = "没有满足条件的数据";
         }catch (Exception e){
             e.printStackTrace();
             msg = "获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgCsDocumentDtoList);
         return resultMap;
@@ -192,20 +202,22 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
 
         String msg = "";
+        String code="0";
         ResponseEntity<byte[]> path = null;
         try {
             PgCsDocument pgCsDocument = pgCsDocumentManager.get(Long.valueOf(id));
             path = pgCsDocumentManager.downloadFile(pgCsDocument);
             if (path == null)
                 msg = "不存在该文档";
-            else
+            else {
+                code = "200";
                 msg = "下载成功";
-
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "下载失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", path.getBody());
         resultMap.put("msg", msg);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
index 94c5c84..ffc8b95 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
@@ -41,22 +41,24 @@
     public Map<String, Object> getPgDeviceByDevType(@FormParam("devType") String devType) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
         try {
-            pgDeviceDtoList = pgDeviceManager.getDeviceByDevTypee(devType);
+            pgDeviceDtoList = pgDeviceManager.getDeviceByDevType(devType);
             if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0){
                 msg="不存在满足要求的数据";
-                resultMap.put("result",null);
             }
             else{
-                resultMap.put("result", pgDeviceDtoList);
+                code="200";
                 msg = "获取成功";
             }
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", pgDeviceDtoList);
         return resultMap;
     }
 
@@ -69,25 +71,26 @@
     public Map<String, Object> getPgDeviceByAssetCode(@FormParam("assetCode") String assetCode) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         PgDeviceDto pgDeviceDto=null;
         try {
             PgDevice pgDevice = pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
             {
                 msg="不存在设备信息";
-                resultMap.put("result",null);
             }
             else {
                 pgDeviceDto = new PgDeviceDto(pgDevice);
                 msg = "获取成功";
-                resultMap.put("result", pgDeviceDto);
+                code="200";
             }
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", pgDeviceDto);
         return resultMap;
     }
 
@@ -102,27 +105,61 @@
                                              @FormParam("devType") String devType)throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
         try {
             pgDeviceDtoList = pgDeviceManager.getAllDevice(road,partition,devType);
             if(pgDeviceDtoList.size()==0) {
                 msg = "没有找到设备信息";
-                resultMap.put("result",null);
             }
             else {
                 msg = "设备信息获取成功";
-                resultMap.put("result", pgDeviceDtoList);
+                code="200";
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result", pgDeviceDtoList);
         return resultMap;
     }
 
     /**
+     * 显示设备列表
+     */
+    @POST
+    @Path("getPgDev")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String, Object> getPgDev(@FormParam("road") String road,
+                                             @FormParam("partition") String partition,
+                                             @FormParam("devType") String devType)throws Exception {
+        Map<String, Object> resultMap = new HashMap<>();
+        String msg="";
+        String code="0";
+        List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
+        try {
+            pgDeviceDtoList = pgDeviceManager.getAllDev(road,partition,devType);
+            if(pgDeviceDtoList.size()==0) {
+                msg = "没有找到设备信息";
+            }
+            else {
+                code="200";
+                msg = "设备信息获取成功";
+            }
+        }catch(Exception e){
+            e.printStackTrace();
+            msg="设备信息获取失败";
+        }
+        resultMap.put("code",code);
+        resultMap.put("msg",msg);
+        resultMap.put("result", pgDeviceDtoList);
+        return resultMap;
+    }
+
+
+    /**
      * 新增设备
      */
     @POST
@@ -145,6 +182,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if (pgDeviceManager.getDeviceByAssetCode(assetCode)!=null) {
@@ -169,6 +207,7 @@
 
                 pgDeviceManager.save(pgDevice);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
 
@@ -177,10 +216,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -208,14 +246,9 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
-            /*
-            if (pgDeviceManager.getDeviceByAssetCode(assetCode)!=null) {
-                result = "false";
-                msg = "已存在同名设备";
-            } else {
-            */
             PgDevice pgDevice = pgDeviceManager.get(Long.valueOf(id));
             pgDevice.setPipeGallery(pipeGallery);
             pgDevice.setPartition(partition);
@@ -233,14 +266,14 @@
 
             pgDeviceManager.save(pgDevice);
             result = "true";
+            code="200";
             msg = "编辑成功";
-            //}
         } catch (Exception e) {
             result = "false";
             msg = "编辑失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("result",result);
         resultMap.put("msg",msg);
         return resultMap;
@@ -256,7 +289,8 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
-        String result="false";
+        String result="";
+        String code="0";
 
         try {
             PgDevice pgDevice=pgDeviceManager.get(Long.valueOf(id));
@@ -268,6 +302,7 @@
             {
                 pgDevice.setActive(0);
                 pgDeviceManager.save(pgDevice);
+                code="200";
                 msg="设备删除成功";
                 result="true";
             }
@@ -276,6 +311,7 @@
             msg="设备删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -291,18 +327,18 @@
     {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         PgDeviceDto pgDeviceDto=null;
 
         try{
             PgDevice pgDevice=pgDeviceManager.getDeviceBydevCode(devCode);
             if(pgDevice==null) {
                 msg = "设备信息获取失败";
-                resultMap.put("result",null);
             }
             else{
                 pgDeviceDto = new PgDeviceDto(pgDevice);
                 msg = "设备信息获取成功";
-                resultMap.put("result",pgDeviceDto);
+                code="200";
             }
         }
         catch(Exception ex)
@@ -310,8 +346,9 @@
             ex.printStackTrace();
             msg="设备状态获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgDeviceDto);
         return resultMap;
     }
 
@@ -324,17 +361,17 @@
     public Map<String,Object> getDeviceByPartition(@FormParam("partition") String partition) throws Exception{
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<PgDeviceDto>();
 
         try{
             pgDeviceDtoList=pgDeviceManager.getPgDeviceDtoListByPartition(partition);
             if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0) {
                 msg = "设备信息获取失败";
-                resultMap.put("result",null);
             }
             else {
+                code="200";
                 msg = "设备信息获取成功";
-                resultMap.put("result",pgDeviceDtoList);
             }
         }
         catch(Exception e)
@@ -342,8 +379,9 @@
             e.printStackTrace();
             msg="设备信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgDeviceDtoList);
         return resultMap;
     }
 
@@ -353,17 +391,16 @@
     public Map<String,Object> getDeviceByOldDAssetCodeCode(@FormParam("assetCode") String assetCode) throws Exception{
         Map<String, Object> resultMap = new HashMap<>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
 
         try{
             pgDeviceDtoList=pgDeviceManager.getDeviceByOldDAssetCodeCode(assetCode);
-            if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0) {
-                msg = "设备信息获取失败";;
-                resultMap.put("result",null);
-            }
+            if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0)
+                msg = "设备信息获取失败";
             else {
                 msg = "设备信息获取成功";
-                resultMap.put("result",pgDeviceDtoList);
+                code="200";
             }
         }
         catch(Exception e)
@@ -372,8 +409,9 @@
             msg="设备信息获取失败";
             resultMap.put("result",null);
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgDeviceDtoList);
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java
index 421d249..f6f167d 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java
@@ -38,17 +38,21 @@
     public Map<String, Object> getDeviceTpeyList()throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgDeviceTypeDto> pgDeviceTypeDtoList=new ArrayList<PgDeviceTypeDto>();
         try {
             pgDeviceTypeDtoList = pgDeviceTypeManager.getAllDeviceType();
             if(pgDeviceTypeDtoList.size()==0)
                 msg="没有找到设备类型信息";
-            else
-                msg="设备类型信息获取成功";
+            else {
+                code="200";
+                msg = "设备类型信息获取成功";
+            }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备类型信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgDeviceTypeDtoList);
         return resultMap;
@@ -66,6 +70,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if (pgDeviceTypeManager.getDeviceTypeByDeType(devType)!=null) {
@@ -79,6 +84,7 @@
 
                 pgDeviceTypeManager.save(pgDeviceType);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
 
@@ -87,10 +93,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
index c276fb3..c789960 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
@@ -44,6 +44,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 
         try {
@@ -62,6 +63,7 @@
                 pgEquipment.setActive(1);
 
                 pgEquipmentManager.save(pgEquipment);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -70,9 +72,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -89,9 +91,10 @@
                                             @FormParam("ownerUnit") String ownerUnit,
                                             @FormParam("enterDate") String enterDate,
                                             @FormParam("curUser") String curUser) {
-        HashMap<String, Object> resultMap = new HashMap<String, Object>();
+        HashMap<String, Object> resultMap = new HashMap<>();
         String msg = "";
         String result = "";
+        String code="0";
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 
         try {
@@ -111,6 +114,7 @@
                 pgEquipment.setEnterDate(sdf.parse(enterDate));
 
                 pgEquipmentManager.save(pgEquipment);
+                code="200";
                 msg="编辑成功";
                 result="true";
             }
@@ -119,9 +123,9 @@
             result = "false";
             msg = "编辑失败";
         }
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -134,16 +138,19 @@
     public Map<String, Object> getEquipment(@FormParam("eqName") String eqName,
                                             @FormParam("eqCode") String eqCode,
                                             @FormParam("eqType") String eqType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        List<PgEquipmentDto> pgEquipmentDtoList=new ArrayList<PgEquipmentDto>();
+        String code="0";
+        List<PgEquipmentDto> pgEquipmentDtoList=new ArrayList<>();
 
         try{
             pgEquipmentDtoList=pgEquipmentManager.getEquipmentDtiList(eqName,eqCode,eqType);
             if(pgEquipmentDtoList==null||pgEquipmentDtoList.size()==0)
                 msg="不存在工器具记录";
-            else
-                msg="维获取成功";
+            else {
+                code = "200";
+                msg = "维获取成功";
+            }
         }
         catch(Exception e)
         {
@@ -166,6 +173,7 @@
         HashMap<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
         String result = "";
+        String code="";
 
         try {
             PgEquipment pgEquipment=pgEquipmentManager.get(Long.valueOf(id));
@@ -178,6 +186,7 @@
             {
                 pgEquipment.setActive(0);
                 pgEquipmentManager.save(pgEquipment);
+                code="200";
                 msg="删除成功";
                 result="true";
             }
@@ -186,6 +195,7 @@
             msg="设备信息获取失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -201,16 +211,19 @@
             throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=new ArrayList<PgDeviceTypeStatisticDto>();
 
         try {
             pgDeviceTypeStatisticDtoList=pgEquipmentManager.getDeviceStatisticByDevType(eqType);
 
+            code="200";
             msg = "获取成功";
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceTypeStatisticDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
index 05a9709..a90fd6c 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
@@ -4,9 +4,9 @@
 import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
 import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
 import com.casic.PgInterface.intelPlan.manager.PgPileAcuManager;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import com.casic.PgInterface.test.PlanData;
 import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.ModelAttribute;
 
 import javax.annotation.Resource;
 import javax.ws.rs.FormParam;
@@ -32,23 +32,25 @@
     public Map<String,Object> getPlanResult(@FormParam("planParamStr") String planParamStr){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
-        //List<PgPlanTask> pgPlanTaskList=pgPlanParams.getPgPlanTaskList();
         List<PgPlanTask> pgPlanTaskList=new PgPlanParams().getPgPlanParamsByString(planParamStr);
         List<PgPlanResultRe> pgPlanResultReList=new ArrayList<>();
 
-        try{
-                pgPlanResultReList=pgPileAcuManager.getPgPlanResultList(pgPlanTaskList);
-                if(pgPlanResultReList==null)
-                    msg="管线智能规划出错";
-                else
-                    msg="管线智能规划完成";
+        try {
+            pgPlanResultReList = pgPileAcuManager.getPgPlanResultList(pgPlanTaskList);
+            if (pgPlanResultReList == null)
+                msg = "管线智能规划出错";
+            else {
+                code="200";
+                msg = "管线智能规划完成";
+            }
         }
         catch(Exception ex){
             msg="智能规划出错";
             ex.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgPlanResultReList);
 
@@ -80,4 +82,30 @@
         return resultMap;
     }
 
+    @POST
+    @Path("getPlanTask")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getACUTask(@FormParam("pileAcuList") String pileAcuList){
+
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        String code="0";
+        List<PgAcuTask> pgAcuTaskList=new ArrayList<>();
+
+        try{
+            pgAcuTaskList=pgPileAcuManager.getACUTask(pileAcuList);
+            code="200";
+            msg="任务获取成功";
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            msg="任务获取失败";
+        }
+        resultMap.put("code",code);
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgAcuTaskList);
+
+        return resultMap;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
index ff85c61..66eec76 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
@@ -55,13 +55,13 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         try {
             PgInPgPerson pgInPgPerson = null;//pgInPgPersonManager.getPersonByUserName(userName);
             int iHostName = pgTagMacManager.getCount("select count(1) from PGTagMac where hostname = ?",assetCode);
-//            int iTagMac = pgTagMacManager.getCount("select count(1) from PGTagMac where tagmac = ?",assetCode.toUpperCase());
             if (0==iHostName)
             {
                 result = "false";
@@ -92,9 +92,8 @@
 
                 pgInPgStatusManager.save(pgInPgStatus);
 
-//                String syResult=pgInPgPersonManager.synchorizedInPgInfo(assetCode,userCode,userName,personType);
+                code="200";
                 result = "true";
-//                msg = "人员注册保存成功"+syResult;
                 msg = "人员注册保存成功";
             }
             else {
@@ -106,6 +105,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -120,6 +120,7 @@
     public Map<String, Object> getInPgPerson() throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<>();
         try {
@@ -127,11 +128,15 @@
             if (pgInPgInfoDtoList == null || pgInPgInfoDtoList.size() == 0)
                 msg = "没有找到入廊人员信息";
             else
+            {
+                code="200";
                 msg = "入廊人员信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "入廊人员信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
         return resultMap;
@@ -146,18 +151,22 @@
     public Map<String, Object> getInPgPersonInPg() throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
 
-        List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<PgInPgInfoDto>();
+        List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<>();
         try {
             pgInPgInfoDtoList = pgInPgPersonManager.getPgInPersonList(1);
             if (pgInPgInfoDtoList == null || pgInPgInfoDtoList.size() == 0)
                 msg = "没有找到入廊人员信息";
-            else
+            else {
+                code="200";
                 msg = "入廊人员信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "入廊人员信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
         return resultMap;
@@ -172,6 +181,7 @@
     public Map<String, Object> getInPgPersonByName(@FormParam("userName") String userName) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
 
         PgInPgPerson pgInPgPerson = null;
         PgInPgPersonDto pgInPgPersonDto=null;
@@ -184,12 +194,13 @@
                 pgInPgPersonDto=new PgInPgPersonDto(pgInPgPerson);
                 pgInPgPersonDtoList.add(pgInPgPersonDto);
                 msg = "人员信息获取成功";
+                code="200";
             }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "人员信息获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgPersonDtoList);
         return resultMap;
@@ -206,6 +217,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             PgInPgPerson pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName);
@@ -221,6 +233,7 @@
                     pgInPgPersonManager.save(pgInPgPerson);
                     result = "true";
                     msg = "编辑成功";
+                    code="200";
                 }
             }
         } catch (Exception e) {
@@ -228,9 +241,9 @@
             msg = "编辑失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -244,10 +257,12 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         int inPgNum=0;
         String msg = "";
+        String code="0";
 
         try{
             inPgNum=pgInPgStatusManager.getInPgNum();
 
+            code="200";
             msg="人员入廊次数获取成功";
         }
         catch(Exception e)
@@ -255,6 +270,7 @@
             e.printStackTrace();
             msg="人员入廊次数获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",inPgNum);
 
@@ -272,18 +288,22 @@
                                                    @FormParam("statisticType") String statisticType) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
 
         List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<PgInPgInfoDto>();
         try {
             pgInPgInfoDtoList = pgInPgPersonManager.getPgInPersonListByTime(startTime, endTime, statisticType);
             if(pgInPgInfoDtoList==null)
                 msg="入廊人员统计信息获取失败";
-            else
-                msg="入廊人员统计信息获取成功";
+            else {
+                code="200";
+                msg = "入廊人员统计信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "入廊人员统计信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
         return resultMap;
@@ -296,6 +316,7 @@
 
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
 
         try {
@@ -304,8 +325,10 @@
                 pgDeviceDtoList=pgDeviceManager.getPgCameraListByPosition("",apCodeStr);
                 if(pgDeviceDtoList==null)
                     msg="不存在关联摄像机";
-                else
-                    msg="关联摄像机获取成功";
+                else {
+                    code="200";
+                    msg = "关联摄像机获取成功";
+                }
             } else {
                 msg="请输入Ap编号";
             }
@@ -315,6 +338,7 @@
             msg="关联摄像机获取成功";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgDeviceDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java
index 507b3fe..b43f077 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java
@@ -34,6 +34,7 @@
 
         String result="";
         String msg="";
+        String code="";
         try{
             PgInPgStatus pgInPgStatus=new PgInPgStatus();
 
@@ -44,6 +45,7 @@
             pgInPgStatusManager.save(pgInPgStatus);
             msg="入廊时间提交成功";
             result="true";
+            code="200";
         }
         catch (Exception e){
             e.printStackTrace();
@@ -51,6 +53,7 @@
             result="false";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -66,6 +69,7 @@
 
         String result="";
         String msg="";
+        String code="0";
         try{
             PgInPgPerson pgInPgPerson=pgInPgPersonManager.getPgInPgPersonByAssetCode(assetCode);
 
@@ -79,6 +83,7 @@
             pgInPgStatusManager.save(pgInPgStatus);
 
             msg="出廊时间提交成功";
+            code="200";
             result="true";
         }
         catch (Exception e){
@@ -87,6 +92,7 @@
             result="false";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
index 9def330..9c0ba1f 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
@@ -33,17 +33,20 @@
                                             @FormParam("existNum") String existNum) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         String result="";
 
         try {
             pgIntelPlanManager.savePgIntelPlan(parName,lineName,maxNum,existNum);
             msg="规划数据保存成功";
+            code="200";
             result="true";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "规划数据保存失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
@@ -55,15 +58,18 @@
     public Map<String, Object> getIntelLineType() throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgIntelPlanTypeDto> pgIntelPlanTypeDtoList=new ArrayList<>();
         try {
             pgIntelPlanTypeDtoList=pgIntelPlanManager.getIntelPlanType();
+            code="200";
             msg="获取排线类型成功";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "获取排线类型失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgIntelPlanTypeDtoList);
         return resultMap;
@@ -76,6 +82,7 @@
                                             @FormParam("partitionStr") String partitionStr) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgIntelPlanDto> pgIntelPlanDtoList = new ArrayList<>();
 
@@ -83,8 +90,10 @@
             pgIntelPlanDtoList = pgIntelPlanManager.getPgIntelPlanListByPartion(lineName, partitionStr);
             if(pgIntelPlanDtoList==null||pgIntelPlanDtoList.size()==0)
                 msg="请输入正确的规划参数";
-            else
-                msg="规划数据获取成功";
+            else {
+                code="200";
+                msg = "规划数据获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "规划数据获取失败";
@@ -103,10 +112,12 @@
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
         String result="";
+        String code="0";
 
         try {
             boolean bl=pgIntelPlanManager.addLineUse(lineName,partitionStr,num);
             if(bl){
+                code="200";
                 msg="排线入廊成功";
                 result="true";
             }
@@ -119,6 +130,7 @@
             msg = "排线入廊失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
@@ -132,6 +144,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
         String result="";
+        String code="0";
 
         try {
             PgIntelPlan pgIntelPlan=pgIntelPlanManager.getPgIntelPlanByParNameAndLine(lineName,parName);
@@ -140,11 +153,13 @@
             pgIntelPlanManager.save(pgIntelPlan);
             msg="规划数据删除成功";
             result="true";
+            code="200";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "规划数据删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java b/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java
index 378af00..9c39523 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java
@@ -1,5 +1,6 @@
 package com.casic.PgInterface.rs;
 
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
 import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
 import com.casic.PgInterface.intelPlan.dto.PgLineHoleDTO;
 import com.casic.PgInterface.intelPlan.manager.PgLineHoleManager;
@@ -27,6 +28,9 @@
     @Resource
     private PgPileAcuManager pgPileAcuManager;
 
+    @Resource
+    private PgRoadManager pgRoadManager;
+
     @POST
     @Path("getPgLineAcuHole")
     @Produces(MediaType.APPLICATION_JSON)
@@ -34,23 +38,32 @@
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
         String result="";
+        String code="0";
         List<PgLineHoleDTO> pgLineHoleDTOList=new ArrayList<>();
 
         try {
             PgPileAcu pgPileAcu=pgPileAcuManager.getPgPileAcuByCode(acuCode);
             if(pgPileAcu==null){
                 msg="不存在分区";
-            }else{
-                pgLineHoleDTOList=pgLineHoleManager.getCurrentHoleByAcu(pgPileAcu.getId());
-                if(pgLineHoleDTOList!=null&&pgLineHoleDTOList.size()!=0)
-                    msg="获取成功";
-                else
-                    msg="未找到入廊数据";
+            }else {
+                pgLineHoleDTOList = pgLineHoleManager.getCurrentHoleByAcu(pgPileAcu.getId());
+                if (pgLineHoleDTOList != null && pgLineHoleDTOList.size() != 0)
+                {
+                    code="200";
+                    msg = "获取成功";
+                }
+                else {
+                    PgLineHoleDTO pgLineHoleDTO=new PgLineHoleDTO();
+                    pgLineHoleDTO.setRoad(pgRoadManager.get(pgPileAcu.getRoadId()).getRoadName());
+                    pgLineHoleDTOList.add(pgLineHoleDTO);
+                    msg = "未找到入廊数据";
+                }
             }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgLineHoleDTOList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgLogRs.java b/src/main/java/com/casic/PgInterface/rs/PgLogRs.java
index 39cff52..30db63b 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgLogRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgLogRs.java
@@ -45,6 +45,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         PgLog pgLog=new PgLog();
         try {
             PgUser pgUser = new PgUser();
@@ -60,14 +61,15 @@
             pgLogManager.save(pgLog);
             result = "true";
             msg = "保存成功";
-
+            code="200";
         } catch (Exception e) {
             result = "false";
             msg = "保存失败";
             e.printStackTrace();
         }
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -83,17 +85,21 @@
             throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgLogDto> pgLogDtoList = new ArrayList<PgLogDto>();
         try {
             pgLogDtoList = pgLogManager.getAllLogs(userName, startTime, endTime);
             if (pgLogDtoList == null || pgLogDtoList.size() == 0)
                 msg = "没有找到日志信息";
-            else
+            else {
+                code="200";
                 msg = "日志信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "日志信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgLogDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java
index 9fd0a5f..37b72f6 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java
@@ -36,19 +36,23 @@
         Map<String,Object> resultMap=new HashMap<>();
 
         String msg = "";
+        String code="0";
         List<PgMaintainType> pgMaintainTypeList=new ArrayList<>();
         try{
             pgMaintainTypeList=pgMaintainTypeManager.getMaintainType();
             if(pgMaintainTypeList!=null&&pgMaintainTypeList.size()!=0)
                 msg="不存在运维类别";
-            else
-                msg="运维类别获取成功";
+            else {
+                code="200";
+                msg = "运维类别获取成功";
+            }
         }
         catch(Exception ex)
         {
             ex.printStackTrace();
             msg="运维类别获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgMaintainTypeList);
 
@@ -65,10 +69,11 @@
         Map<String,Object> resultMap=new HashMap<>();
 
         String msg = "";
+        String code="0";
         List<PgMaintainTypeDto> pgMaintainTypeDtoList=new ArrayList<PgMaintainTypeDto>();
         try{
             pgMaintainTypeDtoList=pgMaintainTypeManager.getMaintainTypeModel(type);
-
+            code="200";
             msg="维护类型获取成功";
         }
         catch(Exception ex)
@@ -77,9 +82,9 @@
             msg="维护类型获取失败";
         }
 
-        resultMap.put("result",pgMaintainTypeDtoList);
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgMaintainTypeDtoList);
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java
index d735cc9..82ffca4 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java
@@ -33,12 +33,16 @@
                                                  @FormParam("endTime") String endTime){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
         List<PgMaintanceRecordHeadDto> pgMaintanceRecordHeadDtoList=new ArrayList<>();
         try{
             pgMaintanceRecordHeadDtoList=pgMaintanceRecordHeadManager.getPgMaintanceRecordHeadLsit(repairMan,startTime,endTime);
             if(pgMaintanceRecordHeadDtoList!=null&&pgMaintanceRecordHeadDtoList.size()!=0)
+            {
+                code="200";
                 msg="维护信息获取成功";
+            }
             else
                 msg="不存在维护信息";
         }
@@ -47,6 +51,7 @@
             msg="巡检信息获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgMaintanceRecordHeadDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java
index effc9df..9f46fc8 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java
@@ -32,12 +32,16 @@
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
         String result="";
+        String code="0";
 
         List<PgMaintanceRecordHeadStatic> pgMaintanceRecordHeadStaticList=new ArrayList<>();
         try{
             pgMaintanceRecordHeadStaticList=pgMaintanceRecordHeadManager.getPgMaintanceRecordHeadStaticLisByTime(startTime,endTime,staticType);
             if(pgMaintanceRecordHeadStaticList!=null&&pgMaintanceRecordHeadStaticList.size()!=0)
+            {
+                code="200";
                 msg="维护统计信息获取成功";
+            }
             else
                 msg="维护统计失败";
         }
@@ -46,7 +50,7 @@
             ex.printStackTrace();
             msg="统计失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgMaintanceRecordHeadStaticList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java b/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java
index 3a67bf3..6a5f4dc 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java
@@ -39,27 +39,31 @@
     @Path("getO2InfoByDevAndDate")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getO2InfoByDevAndDate(@FormParam("assetCode") String assetCode,
-                                                      @FormParam("startDate") String startDate,
-                                                      @FormParam("endDate") String endDate)throws Exception {
+                                                     @FormParam("startDate") String startDate,
+                                                     @FormParam("endDate") String endDate)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgHistoryDataDto> pgHistoryDataDtoList=new ArrayList<>();
 
         try {
             PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
                 msg="设备不存在";
-            else{
-                pgHistoryDataDtoList=pgO2Manager.getAllO2Data(pgDevice, startDate, endDate);
-                if(pgHistoryDataDtoList==null)
-                    msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+            else {
+                pgHistoryDataDtoList = pgO2Manager.getAllO2Data(pgDevice, startDate, endDate);
+                if (pgHistoryDataDtoList == null)
+                    msg = "没有满足要求的数据";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgHistoryDataDtoList);
         return resultMap;
@@ -75,23 +79,27 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         PgO2Dto pgO2Dto=new PgO2Dto(null);
 
         try {
             PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
                 msg="设备不存在";
-            else{
-                pgO2Dto=pgO2Manager.getNewestO2Data(pgDevice);
-                if(pgO2Dto==null)
-                    msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+            else {
+                pgO2Dto = pgO2Manager.getNewestO2Data(pgDevice);
+                if (pgO2Dto == null)
+                    msg = "没有满足要求的数据";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgO2Dto);
         return resultMap;
@@ -104,11 +112,12 @@
     @Path("addO2Data")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> addO2Data(@FormParam("devCode") String devCode,
-                                          @FormParam("upTime") String upTime,
-                                          @FormParam("o2") String o2)throws Exception {
+                                         @FormParam("upTime") String upTime,
+                                         @FormParam("o2") String o2)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
@@ -125,6 +134,7 @@
                 pgO2.setPgDeviceId(pgDevice);
 
                 pgO2Manager.save(pgO2);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -133,9 +143,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java b/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java
index 6217cde..70b3b41 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java
@@ -30,8 +30,6 @@
 public class PgOverViewRs {
 
     @Resource
-    private PgInPgPersonManager pgInPgPersonManager;
-    @Resource
     private PgInPgStatusManager pgInPgStatusManager;
     @Resource
     private PgAlarmManager pgAlarmManager;
@@ -46,18 +44,21 @@
     @Path("getPersonNumInPgByMonth")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<Object, String> getMonthInPgPersonNum() throws Exception {
-        Map<Object, String> resultMap = new HashMap<Object, String>();
+        Map<Object, String> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         int inNum = 0;
 
         try {
             inNum = pgInPgStatusManager.getMonthInPgPersonNum();
+            code="200";
             msg = "本月入廊人员次数获取成功";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "本月入廊人员次数获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", String.valueOf(inNum));
 
@@ -73,15 +74,18 @@
     public Map<Object, String> getWeekInPgPersonNum() throws Exception {
         Map<Object, String> resultMap = new HashMap<Object, String>();
         String msg = "";
+        String code="0";
         int inNum = 0;
         try {
             inNum = pgInPgStatusManager.getWeekInPgPersonNum();
+            code="200";
             msg = "本周入廊人员次数获取成功";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "本周入廊人员次数获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", String.valueOf(inNum));
 
@@ -97,19 +101,22 @@
     public Map<String, Object> getDayInPgStatistic() throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<>();
         try {
             pgInPgInfoDtoList = pgInPgStatusManager.getPgInPersonListByDay();
             if (pgInPgInfoDtoList == null)
                 msg = "信息获取失败";
-            else
+            else {
+                code="200";
                 msg = "信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "信息获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
         return resultMap;
@@ -124,18 +131,23 @@
     public Map<String, Object> getTodayInPgInfo() throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
 
         List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<PgInPgInfoDto>();
         try {
             pgInPgInfoDtoList = pgInPgStatusManager.getTodayInPgInfo();
             if(pgInPgInfoDtoList!=null||pgInPgInfoDtoList.size()!=0)
+            {
+                code="200";
                 msg = "信息获取成功";
+            }
             else
                 msg="当天没有入廊人员信息";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
 
@@ -149,18 +161,22 @@
     public Map<String, Object> getAlarmNum(@FormParam("isDevFault") String isDevFault) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         int num = 0;
 
         try {
             if(isDevFault!=null){
                 num = pgAlarmManager.getAlarmNum(isDevFault);
-                msg = "报警数量获取成功";}
+                msg = "报警数量获取成功";
+                code="200";
+            }
             else
                 msg="请输入统计参数";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警数量统计失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", num);
 
@@ -176,16 +192,18 @@
     public Map<Object, String> getMonthAlarmNum(@FormParam("isDevFault") String isDevFault) throws Exception {
         Map<Object, String> resultMap = new HashMap<Object, String>();
         String msg = "";
+        String code="0";
         int inNum = 0;
 
         try {
-                inNum = pgAlarmManager.getMonthAlarmNum(isDevFault);
-                msg = "报警次数获取成功";
+            inNum = pgAlarmManager.getMonthAlarmNum(isDevFault);
+            code="200";
+            msg = "报警次数获取成功";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警次数获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", String.valueOf(inNum));
 
@@ -201,15 +219,17 @@
     public Map<Object, String> getWeekAlarmNum(@FormParam("isDevFault") String isDevFault) throws Exception {
         Map<Object, String> resultMap = new HashMap<Object, String>();
         String msg = "";
+        String code="0";
         int inNum = 0;
         try {
             inNum = pgAlarmManager.getWeekAlarmNum(isDevFault);
+            code="200";
             msg = "报警次数获取成功";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警次数获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", String.valueOf(inNum));
 
@@ -225,14 +245,17 @@
     public Map<String, Object> getDayAlarmStatistic() throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgAlarmTjDto> pgAlarmTjDtoList = new ArrayList<PgAlarmTjDto>();
         try {
             pgAlarmTjDtoList = pgAlarmManager.getDayAlarmStatistic();
             if (pgAlarmTjDtoList == null)
                 msg = "信息获取失败";
-            else
+            else {
+                code="200";
                 msg = "信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "信息获取失败";
@@ -252,9 +275,11 @@
     public Map<String, Object> getAlarmList(@FormParam("isDevFault") String isDevFault) throws Exception{
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         List<PgAlarmDto> pgAlarmDtoList=new ArrayList<>();
         try{
             pgAlarmDtoList=pgAlarmManager.getAlarmList(isDevFault);
+            code="200";
             msg="信息获取成功";
         }
         catch(Exception e)
@@ -262,6 +287,7 @@
             e.printStackTrace();
             msg="信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAlarmDtoList);
 
@@ -278,17 +304,19 @@
     public Map<String,Object> getConstructionNum() throws Exception{
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgConstructionTypeNumStatisticDto> pgConstructionTypeNumDtoList=new ArrayList<PgConstructionTypeNumStatisticDto>();
         try{
             pgConstructionTypeNumDtoList=pgConstructionManager.getConstructionNum();
             msg="施工数量获取成功";
+            code="200";
         }
         catch(Exception e)
         {
             e.printStackTrace();
             msg="施工数量统计";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionTypeNumDtoList);
 
@@ -302,21 +330,25 @@
     @Path("getConstructionToday")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> getConstructionToday() throws Exception{
-        Map<String,Object > resultMap = new HashMap<String,Object>();
+        Map<String,Object > resultMap = new HashMap<>();
         String msg = "";
-        List<PgConstructionDto> pgConstructionDtoList=new ArrayList<PgConstructionDto>();
+        String code="0";
+        List<PgConstructionDto> pgConstructionDtoList=new ArrayList<>();
         try {
             pgConstructionDtoList = pgConstructionManager.getConstructionToday();
-            if (pgConstructionDtoList == null&&pgConstructionDtoList.size()==0)
+            if (pgConstructionDtoList == null && pgConstructionDtoList.size() == 0)
                 msg = "不存在施工信息";
-            else
+            else {
+                code="200";
                 msg = "施工信息获取成功";
+            }
         }
         catch(Exception e)
         {
             e.printStackTrace();
             msg="施工信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java b/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java
index d3c10d4..31ffcfc 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java
@@ -48,6 +48,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 
         try {
@@ -66,9 +67,9 @@
                 pgPartition.setMaterial(material);
                 pgPartition.setActive(1);
 
-                logger.info("成功保存");
                 pgPartitionManager.save(pgPartition);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
         } catch (Exception e) {
@@ -76,9 +77,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
         return resultMap;
     }
     /*
@@ -100,6 +101,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         PgPartition partition = new PgPartition();
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
@@ -122,6 +124,7 @@
 
                 pgPartitionManager.save(pgPartition);
                 result = "true";
+                code="200";
                 msg = "编辑成功";
             }
 
@@ -131,8 +134,10 @@
             e.printStackTrace();
         }
 
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
+
         return resultMap;
     }
 
@@ -147,7 +152,8 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
-        String result="false";
+        String result="";
+        String code="0";
 
         try {
             PgPartition pgPartition=pgPartitionManager.get(Long.valueOf(id));
@@ -161,12 +167,14 @@
                 pgPartitionManager.save(pgPartition);
                 msg="分区删除成功";
                 result="true";
+                code="200";
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="分区删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -181,14 +189,17 @@
     public Map<String, Object> getPartition() throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgPartitionDto> pgPartitionDtoList = new ArrayList<PgPartitionDto>();
         try {
             pgPartitionDtoList = pgPartitionManager.getPgPartitionDtoList();
+            code="200";
             msg = "获取成功";
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgPartitionDtoList);
         return resultMap;
@@ -203,14 +214,17 @@
     public Map<String, Object> getPartitionListByName(@FormParam("parName") String parName) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgPartitionDto> pgPartitionDtoList = new ArrayList<PgPartitionDto>();
         try {
             pgPartitionDtoList = pgPartitionManager.getPartitionByName(parName);
+            code="200";
             msg = "获取成功";
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgPartitionDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java b/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java
index 883adf9..cf81b72 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java
@@ -37,6 +37,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
         PgRoad pgRoad=pgRoadManager.getPgRoadByName(road);
         try {
             PgPileAcu pgPileAcu=new PgPileAcu();
@@ -49,6 +50,7 @@
             pgPileAcu.setActive(true);
 
             pgPileAcuManager.save(pgPileAcu);
+            code="200";
             result="true";
             msg="保存成功";
         } catch (Exception e) {
@@ -56,9 +58,10 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
+
         return resultMap;
     }
 
@@ -73,6 +76,7 @@
 
         String result="";
         String msg="";
+        String code="0";
         try{
             PgPileAcu pgPileAcu=pgPileAcuManager.get(id);
             if(pgPileAcu==null){
@@ -83,7 +87,7 @@
             {
                 pgPileAcu.setActive(false);
                 pgPileAcuManager.save(pgPileAcu);
-
+                code="200";
                 result="true";
                 msg="桩号删除成功";
             }
@@ -94,8 +98,9 @@
             ex.printStackTrace();
         }
 
-        resultMap.put("result",result);
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
+        resultMap.put("result",result);
 
         return resultMap;
     }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPileRs.java b/src/main/java/com/casic/PgInterface/rs/PgPileRs.java
index cf62954..c9999ac 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgPileRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgPileRs.java
@@ -33,6 +33,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             PgPile pgPile=new PgPile();
@@ -40,6 +41,7 @@
             pgPile.setActive(true);
 
             pgPileManager.save(pgPile);
+            code="200";
             result="true";
             msg="保存成功";
         } catch (Exception e) {
@@ -47,9 +49,10 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
+
         return resultMap;
     }
 
@@ -64,9 +67,10 @@
         Map<String,Object> resultMap=new HashMap<>();
         List<PgPileDTO> pgPileDTOList=new ArrayList<>();
         String msg="";
+        String code="0";
         try{
             pgPileDTOList=pgPileManager.getPgPileDTOList();
-
+            code="200";
             msg="获取成功";
         }
         catch(Exception ex){
@@ -74,8 +78,9 @@
             msg="获取成失败";
             ex.printStackTrace();
         }
-        resultMap.put("result",pgPileDTOList);
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
+        resultMap.put("result",pgPileDTOList);
 
         return resultMap;
     }
@@ -91,6 +96,7 @@
 
         String result="";
         String msg="";
+        String code="0";
         try{
             PgPile pgPile=pgPileManager.get(id);
             if(pgPile==null){
@@ -101,7 +107,7 @@
             {
                 pgPile.setActive(false);
                 pgPileManager.save(pgPile);
-
+                code="200";
                 result="true";
                 msg="桩号删除成功";
             }
@@ -111,9 +117,9 @@
             msg="桩号删除失败";
             ex.printStackTrace();
         }
-
-        resultMap.put("result",result);
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
+        resultMap.put("result",result);
 
         return resultMap;
     }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
index 6ee63ff..63b5597 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
@@ -53,10 +53,12 @@
         try {
                resultMap = pgPipeLineManager.addPipeLine(lineCode,lineType,secRow,secColumn,pileAcuList);
                resultMap.put("msg","提交成功");
+               resultMap.put("code","200");
                resultMap.put("result","true");
 
         } catch (Exception e) {
             e.printStackTrace();
+            resultMap.put("code","0");
             resultMap.put("result","false");
             resultMap.put("msg","提交失败");
             return  resultMap;
@@ -74,14 +76,17 @@
     public Map<String, Object> getPipeLineByLineType(@FormParam("lineType") String lineType) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgPipeLineDto> pgPipeLineDtoList=new ArrayList<PgPipeLineDto>();
         try {
             pgPipeLineDtoList = pgPipeLineManager.getPipeLineByLineType(lineType);
+            code="200";
             msg = "获取成功";
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgPipeLineDtoList);
         return resultMap;
@@ -96,6 +101,7 @@
     public Map<String, Object> getPipeLineByName(@FormParam("lineCode") String lineCode) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         PgPipeLineDto pgPipeLineDto=null;
         try {
             PgPipeLine pgPipeLine = pgPipeLineManager.getPipeLineBylineName(lineCode);
@@ -103,12 +109,14 @@
                 msg="不存在："+lineCode;
             else {
                 pgPipeLineDto = new PgPipeLineDto(pgPipeLine);
+                code="200";
                 msg = "获取成功";
             }
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgPipeLineDto);
         return resultMap;
@@ -123,15 +131,18 @@
     public Map<String,Object> getPipeLengthStatic()throws Exception{
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         List<PgPipeLineLengthStatic> pgPipeLineLengthStaticList=new ArrayList<PgPipeLineLengthStatic>();
         try {
             pgPipeLineLengthStaticList = pgPipeLineManager.getPipeLengthByName();
+            code="200";
             msg="管线长度获取成功";
         }catch(Exception e)
         {
             e.printStackTrace();
             msg="管线长度统计失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgPipeLineLengthStaticList);
 
@@ -147,14 +158,17 @@
     public Map<String, Object> getPipeLineType() throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgPipeLineTypeDto> pgPipeLineTypeDtoList=new ArrayList<PgPipeLineTypeDto>();
         try {
             pgPipeLineTypeDtoList = pgPipeLineManager.getPipeType();
+            code="200";
             msg = "获取成功";
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgPipeLineTypeDtoList);
         return resultMap;
@@ -170,20 +184,24 @@
         Map<String,Object> resultMap=new HashMap<String, Object>();
 
         String msg="";
+        String code="0";
         List<PgPipeLineTypeNumDto> pgPipeLineTypeNumDtoList=new ArrayList<PgPipeLineTypeNumDto>();
 
-        try{
-            pgPipeLineTypeNumDtoList=pgPipeLineManager.getPipeTypeNum();
+        try {
+            pgPipeLineTypeNumDtoList = pgPipeLineManager.getPipeTypeNum();
 
-            if(pgPipeLineTypeNumDtoList==null)
-                msg="不存在管线类型占比";
-            else
-                msg="管线占比获取成功";
+            if (pgPipeLineTypeNumDtoList == null)
+                msg = "不存在管线类型占比";
+            else {
+                code="200";
+                msg = "管线占比获取成功";
+            }
         }
         catch (Exception e){
             msg="管线占比数量获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgPipeLineTypeNumDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java
index 672b376..7042994 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java
@@ -43,17 +43,21 @@
     public Map<String,Object> getReservePlan() {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgReservePlanDto> pgReservePlanDtoList = new ArrayList<PgReservePlanDto>();
         try {
             pgReservePlanDtoList = pgReservePlanManager.getPgReservePlanDto();
             if (pgReservePlanDtoList == null)
                 msg = "不存在预案信息";
-            else
+            else {
+                code="200";
                 msg = "预案信息获取成功";
-        } catch (Exception e) {
+            }
+        }catch (Exception e) {
             e.printStackTrace();
             msg = "预案信息获取是失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgReservePlanDtoList);
         return resultMap;
@@ -66,6 +70,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
 
         String msg = "";
+        String code="0";
         ResponseEntity<byte[]> path = null;
         try {
             PgReservePlan pgReservePlan = pgReservePlanManager.get(Long.valueOf(id));
@@ -73,15 +78,17 @@
 
             if (path == null)
                 msg = "不存在该文档";
-            else
+            else {
+                code="200";
                 msg = "下载成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "下载失败";
         }
-
-        resultMap.put("result", path.getBody());
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", path.getBody());
         return resultMap;
     }
     /*
@@ -99,6 +106,7 @@
         Map<String,Object> resultMap=new HashMap<String, Object>();
         String msg="";
         String result="";
+        String code="0";
 
         try {
             PgReservePlan pgReservePlan = new PgReservePlan();
@@ -124,6 +132,7 @@
                 pgReservePlanManager.save(pgReservePlan);
                 msg = "新增成功";
                 result = "true";
+                code="200";
             }
         }
         catch(Exception e)
@@ -133,6 +142,7 @@
             result="false";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -152,6 +162,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             PgReservePlan pgReservePlan=pgReservePlanManager.get(Long.valueOf(id));
@@ -177,6 +188,7 @@
 
                     pgReservePlanManager.save(pgReservePlan);
 
+                    code="200";
                     result = "true";
                     msg = "编辑成功";
                 }
@@ -187,6 +199,7 @@
             msg = "编辑失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -201,6 +214,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
         String result="";
+        String code="0";
 
         try{
 
@@ -214,6 +228,7 @@
                 pgReservePlan.setActive(0);;
                 pgReservePlanManager.save(pgReservePlan);
                 result="true";
+                code="200";
                 msg="删除成功";
             }
         }
@@ -224,6 +239,7 @@
             result="false";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java b/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java
index 8f049c8..3c48a8d 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java
@@ -42,19 +42,22 @@
         Map<String,Object> resultMap=new HashMap<String, Object>();
 
         String msg="";
+        String code="0";
         List<PgRoadDto> pgRoadDtoList=new ArrayList<PgRoadDto>();
-        try{
+        try {
             pgRoadDtoList = pgRoadManager.getAllRoad();
             if (pgRoadDtoList.size() == 0)
                 msg = "没有道路信息";
-            else
+            else {
+                code="200";
                 msg = "道路信息获取成功";
+            }
         }
         catch(Exception e){
             msg="道路信息获取失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgRoadDtoList);
 
@@ -71,6 +74,7 @@
         Map<String,Object> resultMap=new HashMap<String, Object>();
         String msg="";
         String result="";
+        String code="0";
 
         try{
             PgRoad pgRoad=new PgRoad();
@@ -78,7 +82,7 @@
             pgRoad.setActive(1);
 
             pgRoadManager.save(pgRoad);
-
+            code="200";
             msg="新增道路成功";
             result="true";
         }
@@ -87,7 +91,7 @@
             result="true";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -107,6 +111,7 @@
 
         String msg="";
         String result="";
+        String code="0";
 
         try {
             PgRoad pgRoad=pgRoadManager.get(Long.valueOf(id));
@@ -123,6 +128,7 @@
                 pgRoadManager.save(pgRoad);
                 msg="道路信息保存成功";
                 result="true";
+                code="200";
             }
         }
         catch(Exception e){
@@ -130,6 +136,7 @@
             result="false";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -147,6 +154,7 @@
 
         String msg="";
         String result="";
+        String code="0";
         PgRoad pgRoad=null;
 
         try{
@@ -159,6 +167,7 @@
                 pgRoad.setActive(0);
                 pgRoadManager.save(pgRoad);
                 msg="道路删除成功";
+                code="200";
                 result="true";
             }
         }
@@ -168,6 +177,7 @@
             e.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -184,26 +194,29 @@
         Map<String,Object> resultMap=new HashMap<String, Object>();
         String msg="";
         String result="";
+        String code="0";
 
         List<PgPartitionDto> pgPartitionDtoList=null;
         try{
             PgRoad pgRoad=pgRoadManager.getPgRoadByName(roadName);
             if(pgRoad==null)
                 msg="不存在道路信息";
-            else
-            {
-                pgPartitionDtoList=pgPartitionManager.getPgPartitonDtoByRoad(pgRoad);
-                if(pgPartitionDtoList==null||pgPartitionDtoList.size()==0)
-                    msg="该道路没有分区信息";
-                else
-                    msg="分区信息获取成功";
+            else {
+                pgPartitionDtoList = pgPartitionManager.getPgPartitonDtoByRoad(pgRoad);
+                if (pgPartitionDtoList == null || pgPartitionDtoList.size() == 0)
+                    msg = "该道路没有分区信息";
+                else {
+                    code="200";
+                    msg = "分区信息获取成功";
+                }
             }
         }
         catch (Exception e)
         {
+            e.printStackTrace();
             msg="分区信息获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgPartitionDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java b/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java
index 90d709a..7a713bf 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java
@@ -42,17 +42,21 @@
     public Map<String,Object> getRoleList() {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgRoleDto> pgRoleDtoList = new ArrayList<PgRoleDto>();
         try {
             pgRoleDtoList = pgRoleManager.getPgRoleDtoList();
             if (pgRoleDtoList == null)
                 msg = "不存在角色信息";
-            else
+            else {
+                code="200";
                 msg = "角色信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "角色信息获取是失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgRoleDtoList);
         return resultMap;
@@ -69,6 +73,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try{
             PgAuthority pgAuthority=pgAuthorityManager.getAuthorityByAuthority(authority);
@@ -79,6 +84,7 @@
 
             pgRoleManager.save(pgRole);
             msg="用户角色保存成功";
+            code="200";
             result="true";
         }
         catch(Exception e) {
@@ -86,6 +92,7 @@
             msg = "新增角色失败";
             result = "false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -104,6 +111,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         try {
             PgRole pgRole = pgRoleManager.get(Long.valueOf(id));
 
@@ -112,6 +120,7 @@
             pgRole.setPgAuthorityId(pgAuthority);
             pgRoleManager.save(pgRole);
 
+            code="200";
             msg="角色保存成功";
             result="true";
         }
@@ -122,6 +131,7 @@
             result="false";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -138,7 +148,8 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
-        String result="false";
+        String result="";
+        String code="0";
 
         try {
             PgRole pgRole= pgRoleManager.get(Long.valueOf(id));
@@ -152,12 +163,14 @@
                 pgRoleManager.save(pgRole);
                 msg="删除角色成功";
                 result="true";
+                code="200";
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="删除角色失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 25ded8a..283d7ab 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,20 +7,56 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" 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/construction/manager/PgCsDocumentManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/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/manager/PgAlarmManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/~$说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/~$说明20191207.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.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$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/接口说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明20191207.docx" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
@@ -51,7 +87,7 @@
         <counts>
           <entry key="class" value="4" />
           <entry key="iml" value="2" />
-          <entry key="java" value="707" />
+          <entry key="java" value="820" />
           <entry key="properties" value="14" />
           <entry key="xml" value="7" />
         </counts>
@@ -60,7 +96,7 @@
         <counts>
           <entry key="CLASS" value="4" />
           <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="707" />
+          <entry key="JAVA" value="820" />
           <entry key="Properties" value="14" />
           <entry key="XML" value="7" />
         </counts>
@@ -68,32 +104,32 @@
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
           <entry key="dummy" value="38" />
-          <entry key="java" value="30161" />
+          <entry key="java" value="40859" />
           <entry key="properties" value="100" />
-          <entry key="txt" value="176" />
+          <entry key="txt" value="186" />
           <entry key="xml" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="30161" />
-          <entry key="PLAIN_TEXT" value="214" />
+          <entry key="JAVA" value="40859" />
+          <entry key="PLAIN_TEXT" value="224" />
           <entry key="Properties" value="100" />
           <entry key="XML" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="48" />
+          <entry key="project.closed" value="51" />
           <entry key="project.open.time.1" value="5" />
           <entry key="project.open.time.12" value="2" />
           <entry key="project.open.time.13" value="1" />
           <entry key="project.open.time.15" value="1" />
           <entry key="project.open.time.16" value="1" />
           <entry key="project.open.time.17" value="1" />
-          <entry key="project.open.time.2" value="1" />
+          <entry key="project.open.time.2" value="2" />
           <entry key="project.open.time.20" value="1" />
-          <entry key="project.open.time.23" value="1" />
+          <entry key="project.open.time.23" value="2" />
           <entry key="project.open.time.24" value="2" />
           <entry key="project.open.time.251" value="1" />
           <entry key="project.open.time.27" value="2" />
@@ -106,8 +142,8 @@
           <entry key="project.open.time.36" value="1" />
           <entry key="project.open.time.37" value="1" />
           <entry key="project.open.time.39" value="2" />
-          <entry key="project.open.time.4" value="2" />
-          <entry key="project.open.time.40" value="1" />
+          <entry key="project.open.time.4" value="3" />
+          <entry key="project.open.time.40" value="2" />
           <entry key="project.open.time.41" value="2" />
           <entry key="project.open.time.42" value="2" />
           <entry key="project.open.time.43" value="2" />
@@ -122,23 +158,25 @@
           <entry key="project.open.time.6" value="3" />
           <entry key="project.open.time.63" value="2" />
           <entry key="project.open.time.64" value="1" />
+          <entry key="project.open.time.66" value="1" />
           <entry key="project.open.time.71" value="2" />
+          <entry key="project.open.time.74" value="1" />
           <entry key="project.open.time.76" value="1" />
           <entry key="project.open.time.8" value="2" />
           <entry key="project.open.time.9" value="1" />
           <entry key="project.open.time.97" value="1" />
-          <entry key="project.opened" value="78" />
+          <entry key="project.opened" value="84" />
         </counts>
       </usages-collector>
     </session>
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+            <state relative-caret-position="396">
+              <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
               <folding>
                 <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
                 <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -147,73 +185,6 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <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="99">
-              <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-              <folding>
-                <element signature="imports" expanded="true" />
-                <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-1170">
-              <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state>
-              <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
-              <folding>
-                <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-                <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="true">
-        <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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-              <folding>
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-                <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>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <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="352">
-              <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -225,18 +196,9 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>inCriteria</find>
-      <find>getPgPlanResulList</find>
-      <find>getPileAcuListByPileAcuStr</find>
-      <find>distinct</find>
-      <find>order</find>
-      <find>canPlanLine</find>
-      <find>isExistLine</find>
-      <find>getPlanResult</find>
       <find>pgPipeLine</find>
       <find>getPipeLineBylineName</find>
       <find>StringU</find>
-      <find>getAllAlarm</find>
       <find>getAlarmList</find>
       <find>getPgInPersonListByDay</find>
       <find>getDayInPgStatistic</find>
@@ -254,7 +216,16 @@
       <find>getPgContructionByNameOrType</find>
       <find>&quot;&quot;,&quot;&quot;,</find>
       <find>getPgContructionDtoByNameOrType</find>
+      <find>addConstruction</find>
+      <find>getPgLineAcuHole</find>
+      <find>getPlanResult</find>
       <find>getConstruction</find>
+      <find>addPipeLine</find>
+      <find>未找到入廊数据</find>
+      <find>getCurrentHoleByAcu</find>
+      <find>getAllAlarm</find>
+      <find>getPgDeviceDtoListByPartition</find>
+      <find>getPgDeviceByDevType</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -263,57 +234,57 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlan.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileHoleManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/planData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/PlanData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
       </list>
     </option>
   </component>
@@ -359,7 +330,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -421,53 +391,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="dto" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="manager" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -479,29 +402,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="rs" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -516,6 +416,7 @@
         </subPane>
       </pane>
       <pane id="Scope" />
+      <pane id="PackagesPane" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -710,7 +611,13 @@
       <workItem from="1574902733573" duration="1829000" />
       <workItem from="1574998240004" duration="7016000" />
       <workItem from="1575247959683" duration="6997000" />
-      <workItem from="1575704345590" duration="40473000" />
+      <workItem from="1575704345590" duration="69381000" />
+      <workItem from="1575869479666" duration="721000" />
+      <workItem from="1575947104878" duration="6101000" />
+      <workItem from="1576128264436" duration="3347000" />
+      <workItem from="1576208571543" duration="22000" />
+      <workItem from="1576227513917" duration="862000" />
+      <workItem from="1576293721220" duration="18246000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -817,11 +724,18 @@
       <option name="project" value="LOCAL" />
       <updated>1575775489149</updated>
     </task>
-    <option name="localTasksCounter" value="16" />
+    <task id="LOCAL-00016" summary="整改施工信息">
+      <created>1575791780774</created>
+      <option name="number" value="00016" />
+      <option name="presentableId" value="LOCAL-00016" />
+      <option name="project" value="LOCAL" />
+      <updated>1575791780774</updated>
+    </task>
+    <option name="localTasksCounter" value="17" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="452131000" />
+    <option name="totallyTimeSpent" value="510338000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -834,9 +748,8 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
-    <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.24205749" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2647504" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -847,7 +760,7 @@
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.3295082" />
       <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.4819672" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.65737706" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.3295082" />
@@ -939,7 +852,8 @@
     <MESSAGE value="重新设计智能规划部分" />
     <MESSAGE value="完成智能规划对接" />
     <MESSAGE value="修改报警统计" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改报警统计" />
+    <MESSAGE value="整改施工信息" />
+    <option name="LAST_COMMIT_MESSAGE" value="整改施工信息" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -951,16 +865,10 @@
           <option name="timeStamp" value="3" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java</url>
-          <line>69</line>
+          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java</url>
+          <line>40</line>
           <properties />
-          <option name="timeStamp" value="21" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java</url>
-          <line>96</line>
-          <properties />
-          <option name="timeStamp" value="38" />
+          <option name="timeStamp" value="122" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
@@ -970,394 +878,452 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <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="2068">
-          <caret line="154" column="35" selection-start-line="154" selection-start-column="35" selection-end-line="154" selection-end-column="35" />
-        </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="3300">
-          <caret line="297" column="22" selection-start-line="297" selection-start-column="22" selection-end-line="297" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/StringUtils.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
-          <caret line="13" column="48" lean-forward="true" selection-start-line="13" selection-start-column="48" selection-end-line="13" selection-end-column="48" />
+          <caret line="11" column="5" selection-start-line="11" selection-start-column="5" selection-end-line="11" selection-end-column="5" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="78" lean-forward="true" selection-start-line="78" selection-end-line="78" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="616">
-          <caret line="41" column="1" selection-start-line="41" selection-start-column="1" selection-end-line="41" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="110">
-          <caret line="12" column="23" selection-start-line="12" selection-start-column="23" selection-end-line="12" selection-end-column="23" />
+        <state relative-caret-position="516">
+          <caret line="114" column="12" selection-start-line="114" selection-start-column="12" selection-end-line="114" selection-end-column="12" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="164">
-          <caret line="56" lean-forward="true" selection-start-line="56" selection-end-line="56" />
+        <state relative-caret-position="418">
+          <caret line="33" column="44" selection-start-line="33" selection-start-column="44" selection-end-line="33" selection-end-column="44" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="258">
-          <caret line="27" column="12" lean-forward="true" selection-start-line="27" selection-start-column="12" selection-end-line="27" selection-end-column="12" />
+        <state relative-caret-position="132">
+          <caret line="11" column="20" lean-forward="true" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="20" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.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="-12">
-          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        <state relative-caret-position="516">
+          <caret line="142" column="54" selection-start-line="142" selection-start-column="54" selection-end-line="142" selection-end-column="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="858">
-          <caret line="55" column="27" lean-forward="true" selection-start-line="55" selection-start-column="27" selection-end-line="55" selection-end-column="27" />
+        <state relative-caret-position="66">
+          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="58">
+          <caret line="18" column="28" selection-start-line="18" selection-start-column="19" selection-end-line="18" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="305">
+          <caret line="24" column="31" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="714">
+          <caret line="58" column="5" lean-forward="true" selection-start-line="58" selection-start-column="5" selection-end-line="58" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="924">
+          <caret line="134" column="92" selection-start-line="134" selection-start-column="92" selection-end-line="134" selection-end-column="92" />
+          <folding>
+            <element signature="method#linkDevice#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkPartitionCamera#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkReservePlan#0;class#PgAlarmLinkRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1066">
+          <caret line="90" lean-forward="true" selection-start-line="90" selection-end-line="90" />
+          <folding>
+            <element signature="method#getTjResultByAlarmType#0;class#PgAlarmTjRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="946">
+          <caret line="148" column="11" lean-forward="true" selection-start-line="148" selection-start-column="11" selection-end-line="148" selection-end-column="11" />
+          <folding>
+            <element signature="method#getAlarmTypeList#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#addAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#editAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#deleteAlarmType#0;class#PgAlarmTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="208">
+          <caret line="46" column="23" lean-forward="true" selection-start-line="46" selection-start-column="23" selection-end-line="46" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="113" column="9" lean-forward="true" selection-start-line="113" selection-start-column="9" selection-end-line="113" selection-end-column="9" />
+          <folding>
+            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
+            <element signature="method#getNewestCh4InfoByDev#0;class#PgCh4Rs#0" />
+            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="145" column="6" lean-forward="true" selection-start-line="145" selection-start-column="6" selection-end-line="145" selection-end-column="6" />
+          <folding>
+            <element signature="method#addAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#editAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#deleteAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#getAuthorityList#0;class#PgAuthorityRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="58" column="1" lean-forward="true" selection-start-line="58" selection-start-column="1" selection-end-line="58" selection-end-column="1" />
+          <folding>
+            <element signature="method#getPgAssetPlanList#0;class#PgAssetPlanRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="370">
+          <caret line="371" column="66" selection-start-line="371" selection-start-column="66" selection-end-line="371" selection-end-column="66" />
+          <folding>
+            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#searchConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionDev#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="139" column="13" lean-forward="true" selection-start-line="139" selection-start-column="13" selection-end-line="139" selection-end-column="13" />
+          <folding>
+            <element signature="method#getCoInfoByDevAndDate#0;class#PgCoRs#0" />
+            <element signature="method#getNewestCoInfoByDev#0;class#PgCoRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="540">
+          <caret line="223" column="5" lean-forward="true" selection-start-line="223" selection-start-column="5" selection-end-line="223" selection-end-column="5" />
+          <folding>
+            <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="682">
+          <caret line="100" lean-forward="true" selection-start-line="100" selection-end-line="100" />
+          <folding>
+            <element signature="method#getDeviceTpeyList#0;class#PgDeviceTypeRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="377">
+          <caret line="225" column="35" selection-start-line="225" selection-start-column="35" selection-end-line="225" selection-end-column="35" />
+          <folding>
+            <element signature="method#addEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#addEquipment#1;class#PgEquipmentRs#0" />
+            <element signature="method#getEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#deleteEquipment#0;class#PgEquipmentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="406">
+          <caret line="109" lean-forward="true" selection-start-line="109" selection-end-line="109" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="154">
+          <caret line="28" column="19" selection-start-line="28" selection-start-column="19" selection-end-line="28" selection-end-column="19" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="748">
-          <caret line="49" column="5" lean-forward="true" selection-start-line="49" selection-start-column="5" selection-end-line="49" selection-end-column="5" />
+        <state relative-caret-position="296">
+          <caret line="161" column="35" selection-start-line="161" selection-start-column="35" selection-end-line="161" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="384">
+          <caret line="99" column="5" lean-forward="true" selection-start-line="99" selection-start-column="5" selection-end-line="99" selection-end-column="5" />
+        </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="362">
+          <caret line="340" column="35" selection-start-line="340" selection-start-column="35" selection-end-line="340" selection-end-column="35" />
+          <folding>
+            <element signature="method#addInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPersonInPg#0;class#PgInPgPersonRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-606">
+          <caret line="76" column="20" lean-forward="true" selection-start-line="76" selection-start-column="20" selection-end-line="76" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="65" column="35" selection-start-line="65" selection-start-column="35" selection-end-line="65" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="101" column="35" selection-start-line="101" selection-start-column="35" selection-end-line="101" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="84" column="35" selection-start-line="84" selection-start-column="35" selection-end-line="84" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="59" lean-forward="true" selection-start-line="59" selection-end-line="59" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="60" column="1" lean-forward="true" selection-start-line="60" selection-start-column="1" selection-end-line="60" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="145" column="35" selection-start-line="145" selection-start-column="35" selection-end-line="145" selection-end-column="35" />
+        </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="274">
+          <caret line="350" column="35" selection-start-line="350" selection-start-column="35" selection-end-line="350" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="121" column="39" selection-start-line="121" selection-start-column="39" selection-end-line="121" selection-end-column="39" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="28" column="8" lean-forward="true" selection-start-line="28" selection-start-column="8" selection-end-line="28" selection-end-column="8" />
+        <state relative-caret-position="340">
+          <caret line="103" selection-start-line="103" selection-end-line="103" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="226" column="35" selection-start-line="226" selection-start-column="35" selection-end-line="226" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="203" column="35" selection-start-line="203" selection-start-column="35" selection-end-line="203" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="241" column="35" selection-start-line="241" selection-start-column="35" selection-end-line="241" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="225" column="1" lean-forward="true" selection-start-line="225" selection-start-column="1" selection-end-line="225" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="176" column="5" lean-forward="true" selection-start-line="176" selection-start-column="5" selection-end-line="176" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="178" column="35" lean-forward="true" selection-start-line="178" selection-start-column="35" selection-end-line="178" selection-end-column="35" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="516">
-          <caret line="94" column="53" selection-start-line="94" selection-start-column="53" selection-end-line="94" selection-end-column="53" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="814">
-          <caret line="52" column="9" lean-forward="true" selection-start-line="52" selection-start-column="9" selection-end-line="52" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="182">
-          <caret line="58" column="12" lean-forward="true" selection-start-line="58" selection-start-column="12" selection-end-line="58" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="34" lean-forward="true" selection-start-line="34" selection-end-line="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="32" lean-forward="true" selection-start-line="32" selection-end-line="32" />
-          <folding>
-            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
-            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="185">
-          <caret line="63" column="13" selection-start-line="63" selection-start-column="13" selection-end-line="63" selection-end-column="13" />
-          <folding>
-            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
-            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
-            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="e#6319#6324#0" />
-            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
-          </folding>
+          <caret line="240" lean-forward="true" selection-start-line="240" selection-end-line="240" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
-          <caret line="58" column="28" lean-forward="true" selection-start-line="58" selection-start-column="28" selection-end-line="58" selection-end-column="28" />
-          <folding>
-            <element signature="method#addTempHumData#0;class#PgTempHumRs#0" />
-          </folding>
+        <state relative-caret-position="340">
+          <caret line="148" column="34" selection-start-line="148" selection-start-column="34" selection-end-line="148" selection-end-column="34" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
+        <state relative-caret-position="458">
+          <caret line="99" column="35" selection-start-line="99" selection-start-column="35" selection-end-line="99" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+        <state relative-caret-position="384">
+          <caret line="145" column="32" lean-forward="true" selection-start-line="145" selection-start-column="32" selection-end-line="145" selection-end-column="32" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="414">
-          <caret line="22" column="46" lean-forward="true" selection-start-line="22" selection-start-column="46" selection-end-line="22" selection-end-column="46" />
-        </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="396">
-          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" column="83" selection-start-line="11" selection-start-column="83" selection-end-line="11" selection-end-column="83" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="26">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
-          <folding>
-            <element signature="method#getPgInPgStatusByPerson#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNumByName#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNum#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPersonListByDay#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPgStatusByPgInPgPerson#0;class#PgInPgStatusManager#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="44">
-          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-12">
-          <caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="87" lean-forward="true" selection-start-line="87" selection-end-line="87" />
-          <folding>
-            <element signature="method#getConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#addConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#deleteConstructionType#0;class#PgConstructionTypeRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
-          <folding>
-            <element signature="method#getConstructionTypeByType#0;class#PgConstructionTypeManager#0" />
-            <element signature="method#getAllConstructionTypeDto#0;class#PgConstructionTypeManager#0" />
-          </folding>
-        </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="145">
-          <caret line="258" column="9" lean-forward="true" selection-start-line="258" selection-start-column="9" selection-end-line="258" selection-end-column="9" />
-          <folding>
-            <element signature="method#getMonthInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayInPgStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgOverViewRs#0" />
-            <element signature="method#getAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getMonthAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayAlarmStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgOverViewRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="103">
-          <caret line="105" column="50" lean-forward="true" selection-start-line="105" selection-start-column="50" selection-end-line="105" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateBasicDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="99">
-          <caret line="125" selection-start-line="125" selection-end-line="125" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="190">
-          <caret line="24" column="35" lean-forward="true" selection-start-line="24" selection-start-column="35" selection-end-line="24" selection-end-column="35" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="436">
-          <caret line="24" lean-forward="true" selection-start-line="24" selection-end-line="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" lean-forward="true" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="300">
-          <caret line="34" column="31" lean-forward="true" selection-start-line="34" selection-start-column="31" selection-end-line="34" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="42" column="13" lean-forward="true" selection-start-line="42" selection-start-column="13" selection-end-line="42" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="120" column="72" lean-forward="true" selection-start-line="120" selection-start-column="72" selection-end-line="120" selection-end-column="72" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="293">
-          <caret line="58" column="73" lean-forward="true" selection-start-line="58" selection-start-column="73" selection-end-line="58" selection-end-column="73" />
-          <folding>
-            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
-            <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
-          </folding>
-        </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="307">
-          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
+        <state relative-caret-position="758">
+          <caret line="130" column="5" lean-forward="true" selection-start-line="130" selection-start-column="5" selection-end-line="130" selection-end-column="5" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1170">
-          <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
+        <state relative-caret-position="494">
+          <caret line="86" column="62" lean-forward="true" selection-start-line="86" selection-start-column="62" selection-end-line="86" selection-end-column="62" />
           <folding>
-            <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-            <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+            <element signature="method#getAllDevice#0;class#PgDeviceManager#0" />
+            <element signature="method#getAllDev#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="195" column="28" lean-forward="true" selection-start-line="195" selection-start-column="28" selection-end-line="195" selection-end-column="28" />
+        <state relative-caret-position="166">
+          <caret line="174" column="13" lean-forward="true" selection-start-line="174" selection-start-column="13" selection-end-line="174" selection-end-column="13" />
           <folding>
-            <element signature="method#getAlarmByTypeAndTime#0;class#PgAlarmManager#0" />
-            <element signature="method#getAlarmNum#0;class#PgAlarmManager#0" />
             <element signature="method#getDayAlarmStatistic#0;class#PgAlarmManager#0" />
+            <element signature="method#getAlarmList#0;class#PgAlarmManager#0" />
             <element signature="method#createDTO#0;class#PgAlarmManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="364">
+          <caret line="46" column="56" lean-forward="true" selection-start-line="46" selection-start-column="56" selection-end-line="46" selection-end-column="56" />
+          <folding>
+            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
+            <element signature="method#getPgDev#0;class#PgDeviceRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
+            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+        <state relative-caret-position="396">
+          <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
           <folding>
             <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
             <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -1365,52 +1331,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="239">
-          <caret line="21" column="33" lean-forward="true" selection-start-line="21" selection-start-column="33" selection-end-line="21" selection-end-column="33" />
-        </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="352">
-          <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-        </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="99">
-          <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-          </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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-          <folding>
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-            <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>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
index c436c93..e913155 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
@@ -132,7 +132,10 @@
             this.setAlarmType("");
         else
             this.setAlarmType(pgAlarm.getAlarmTypeId().getAlarmType());
-        this.setAlarmValue(pgAlarm.getAlarmValue());
+        if(pgAlarm.getAlarmValue()==null)
+            this.setAlarmValue("");
+        else
+            this.setAlarmValue(pgAlarm.getAlarmValue());
         if (pgAlarm.getAlarmDate() != null)
             this.setAlarmDate(sdf.format(pgAlarm.getAlarmDate()));
         else
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
index a43965c..565cb41 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -159,11 +159,21 @@
     }
 
     //获取历史报警消息列表
-    public List<PgAlarmDto> getAllAlarm(String alarmType,String startDay,String endDay,String isNew,int page,int rows) {
-        try {
+    public  Map<String, Object> getAllAlarm(String alarmType,String partition,String startDay,String endDay,String isNew,int page,int rows) {
 
+        Map<String, Object> resultMap = new HashMap<>();
+        String msg="";
+
+        try {
             Criteria criteria = createCriteria(PgAlarm.class);
 
+            if (StringUtils.isNotBlank(partition)) {
+                DetachedCriteria inCriteria = DetachedCriteria.forClass(PgDevice.class);
+                inCriteria.add(Restrictions.eq("partition", partition));
+                inCriteria.setProjection(Property.forName("id"));
+                criteria.add(Property.forName("alarmDevId").in(inCriteria));
+            }
+
             if (StringUtils.isNotBlank(alarmType)&&!alarmType.contains("全部")&&pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
                 criteria.add(Restrictions.eq("alarmTypeId", pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)));
 
@@ -190,8 +200,16 @@
             for (PgAlarm pgAlarm : pgAlarmList) {
                 pgAlarmDtoList.add(new PgAlarmDto(pgAlarm));
             }
-
-            return pgAlarmDtoList;
+            if(pgAlarmDtoList==null||pgAlarmDtoList.size()==0) {
+                resultMap.put("msg", "没有报警信息");
+                resultMap.put("code","0");
+            }else {
+                resultMap.put("code","200");
+                resultMap.put("msg", "报警信息获取成功");
+            }
+            resultMap.put("count",pg.getTotalCount());
+            resultMap.put("result",pgAlarmDtoList);
+            return resultMap;
         }
         catch(Exception ex){
             ex.printStackTrace();
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index 7547560..654f49e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -24,11 +24,11 @@
 
         Criteria criteria = createCriteria(PgDevice.class);
 
-        if(road!=null)
+        if(StringUtils.isNotBlank(road))
             criteria.add(Restrictions.eq("road",road));
-        if(partition!=null)
+        if(StringUtils.isNotBlank(partition))
             criteria.add(Restrictions.eq("partition",partition));
-        if(devType!=null)
+        if(StringUtils.isNotBlank(devType))
             criteria.add(Restrictions.eq("devType",devType));
 
         criteria.add(Restrictions.eq("active", 1));
@@ -43,6 +43,29 @@
         return pgDeviceDtoList;
     }
 
+    public List<PgDeviceDto> getAllDev(String road,String partition,String devType) {
+
+        Criteria criteria = createCriteria(PgDevice.class);
+
+        if(StringUtils.isNotBlank(road))
+            criteria.add(Restrictions.eq("road",road));
+        if(StringUtils.isNotBlank(partition))
+            criteria.add(Restrictions.eq("partition",partition));
+        if(StringUtils.isNotBlank(devType))
+            criteria.add(Restrictions.like("devType","%"+devType+"%"));
+
+        criteria.add(Restrictions.eq("active", 1));
+        criteria.addOrder(Order.desc("id"));
+        List<PgDevice> pgDeviceList = criteria.list();
+
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
+        for (PgDevice pgDevice : pgDeviceList) {
+            pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
+        }
+
+        return pgDeviceDtoList;
+    }
+
     //根据名字获取当前设备
     public PgDevice getDeviceByAssetCode(String assetCode) {
         Criteria criteria=createCriteria(PgDevice.class);
@@ -56,9 +79,9 @@
     }
 
     //根据类型获取设备列表
-    public List<PgDeviceDto> getDeviceByDevTypee(String devType) {
+    public List<PgDeviceDto> getDeviceByDevType(String devType) {
         Criteria criteria=createCriteria(PgDevice.class);
-        criteria.add(Restrictions.eq("devType",devType));
+        criteria.add(Restrictions.like("devType","%"+devType+"%"));
 
         List<PgDevice> pgDeviceList=criteria.list();
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
@@ -106,7 +129,7 @@
         criteria.add(Restrictions.eq("partition",partition));
 
         List<PgDevice> pgDeviceList=criteria.list();
-        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<PgDeviceDto>();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
 
         for (PgDevice pgDevice : pgDeviceList) {
             pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
index 3a3bccd..595730e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
@@ -1,10 +1,13 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.devTable.domain.PgAlarmType;
 import com.casic.PgInterface.devTable.domain.PgPartition;
 import com.casic.PgInterface.devTable.domain.PgRoad;
 import com.casic.PgInterface.devTable.domain.PipeGallery;
 import com.casic.PgInterface.devTable.dto.PgPartitionDto;
+import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
@@ -12,7 +15,9 @@
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Created by yxw on 2017/11/4.
@@ -21,7 +26,8 @@
 public class PgPartitionManager extends HibernateEntityDao<PgPartition> {
 
     @Resource
-    PgRoadManager pgRoadManager;
+    private PgRoadManager pgRoadManager;
+
 
     public PgPartition getPartitionByParName(String parName) {
         Criteria criteria = getSession().createCriteria(PgPartition.class);
@@ -99,4 +105,5 @@
         return pgPartitionDtoList;
     }
 
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
index f216360..a6928f1 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
@@ -5,6 +5,7 @@
 public class PgPlanResultRe {
 
     private String taskKey;
+    private List<String> pileAcuList;
     private List<PgPlanResult> pgPlanResultList;
 
     public String getTaskKey() {
@@ -15,6 +16,14 @@
         this.taskKey = taskKey;
     }
 
+    public List<String> getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(List<String> pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+
     public List<PgPlanResult> getPgPlanResultList() {
         return pgPlanResultList;
     }
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
index 71ea765..47eea07 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
@@ -54,9 +54,7 @@
 
         List<PgLineHole> pgLineHoleList=criteria.list();
         List<PgLineHoleDTO> pgLineHoleDTOList=new ArrayList<>();
-        if(pgLineHoleList==null||pgLineHoleList.size()==0)
-            return null;
-        else
+        if(pgLineHoleList!=null&&pgLineHoleList.size()!=0)
             pgLineHoleDTOList=PgLineHoleDTO.ConvertToDTOList(pgLineHoleList,pgPileAcuManager,pgRoadManager);
         return pgLineHoleDTOList;
     }
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
index 0fd9e1f..841a386 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
@@ -1,12 +1,15 @@
 package com.casic.PgInterface.intelPlan.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.devTable.domain.PgPartition;
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
 import com.casic.PgInterface.intelPlan.domain.PgLineHole;
 import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
 import com.casic.PgInterface.intelPlan.domain.PgSection;
 import com.casic.PgInterface.intelPlan.dto.PgPlanResult;
 import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
 import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -22,6 +25,9 @@
     @Resource
     private PgLineHoleManager pgLineHoleManager;
 
+    @Resource
+    private PgRoadManager pgRoadManager;
+
     public PgPileAcu getPgPileAcuByCode(String acuCode){
         List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
 
@@ -58,7 +64,9 @@
         for(PgPlanTask pgPlanTask:pgPlanTaskList){
             List<PgPlanResult> pgPlanResultList=getPgPlanResultByPlantask(pgPlanTask);
             PgPlanResultRe pgPlanResultRe=new PgPlanResultRe();
+
             pgPlanResultRe.setTaskKey(pgPlanTask.getTaskKey());
+            pgPlanResultRe.setPileAcuList(pgPlanTask.getPileAcuList());
             pgPlanResultRe.setPgPlanResultList(pgPlanResultList);
 
             pgPlanResultReList.add(pgPlanResultRe);
@@ -142,4 +150,57 @@
         return length;
     }
 
+    private PgPileAcu getPgPileAcuByAcuCode(String acuCode){
+        List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
+
+        if(pgPileAcuList==null||pgPileAcuList.size()==0)
+            return null;
+        else
+            return pgPileAcuList.get(0);
+    }
+
+    public List<PgAcuTask> getACUTask(String pileAcuList){
+        String[] acuArray=pileAcuList.split(",");
+        List<PgAcuTask> pgAcuTaskList=new ArrayList<>();
+
+        for(String acu:acuArray){
+            PgPileAcu pgPileAcu=this.getPgPileAcuByCode(acu);
+            String roadName=pgRoadManager.get(pgPileAcu.getRoadId()).getRoadName();
+
+            if(!containRoad(roadName,pgAcuTaskList))
+            {
+                PgAcuTask pgAcuTask=new PgAcuTask();
+                pgAcuTask.setRoadName(roadName);
+                pgAcuTask.setPileAcuList(acu);
+                pgAcuTaskList.add(pgAcuTask);
+            }
+            else{
+                PgAcuTask pgAcuTask=getIndexRoad(roadName,pgAcuTaskList);
+                if(pgAcuTask!=null)
+                    pgAcuTask.setPileAcuList(pgAcuTask.getPileAcuList()+","+acu);
+            }
+        }
+
+        return pgAcuTaskList;
+    }
+
+    private boolean containRoad(String roadName,List<PgAcuTask> pgAcuTaskList){
+        if(pgAcuTaskList==null||pgAcuTaskList.size()==0) return false;
+        for(PgAcuTask pgAcuTask:pgAcuTaskList){
+            if(pgAcuTask.getRoadName().equals(roadName))
+                return true;
+        }
+
+        return false;
+    }
+
+    private PgAcuTask getIndexRoad(String roadName, List<PgAcuTask> pgAcuTaskList){
+        for(PgAcuTask pgAcuTask:pgAcuTaskList){
+            if(pgAcuTask.getRoadName().equals(roadName))
+                return pgAcuTask;
+        }
+
+        return null;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java
new file mode 100644
index 0000000..323f7ef
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java
@@ -0,0 +1,25 @@
+package com.casic.PgInterface.reservePlan.dto;
+
+import java.util.List;
+
+public class PgAcuTask {
+
+    private String roadName;//道路
+    private String pileAcuList;//acu分区
+
+    public String getRoadName() {
+        return roadName;
+    }
+
+    public void setRoadName(String roadName) {
+        this.roadName = roadName;
+    }
+
+    public String getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(String pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
index c25e926..c7d7693 100644
--- a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
@@ -70,9 +70,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(Long.valueOf(inPgPersonId));
         PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("hostName",pgInPgPerson.getAssetCode());
-//        PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode());
-//        long maxId = pgTagPositionManager.getMaxId(pgTagMac.getTagMac());
-//        PGTagPosition pgTagPosition = pgTagPositionManager.get(maxId);
+
         PGTagPosition pgTagPosition = tagmacRun.GetTagStatus(pgTagMac);
         boolean bExist = false;
         bExist = pgTagPositionManager.findTagPosition(pgTagPosition.getPositionUpdatetime(),pgTagPosition.getHostId());
@@ -104,8 +102,7 @@
         PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(Long.valueOf(inPgPersonId));
         PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pgInPgPersonId",pgInPgPerson);
         System.out.println("time:"+pgInPgStatus.getInTime());
-//        PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pgInPgPersonId",inPgPersonId);
-//        PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode());
+
         PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("hostName",pgInPgPerson.getAssetCode());
 
         Map<Object,Object> mapPosition = new HashMap<>();
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
index 082ba5d..3eed00a 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
@@ -48,6 +48,7 @@
     public Map<String, Object> linkDevice(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         PgDeviceDto pgDeviceDto = null;
         try {
@@ -62,6 +63,7 @@
                     else {
                         pgDeviceDto = new PgDeviceDto(pgDevice);
                         msg = "报警关联设备获取成功";
+                        code="200";
                     }
                 }
             }
@@ -71,6 +73,7 @@
             e.printStackTrace();
             msg = "获取关联设备失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceDto);
 
@@ -86,6 +89,7 @@
     public Map<String, Object> linkPartitionCamera(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
         try {
@@ -106,6 +110,7 @@
 
                         pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(partition,position);
                         msg = "关联设备获取成功";
+                        code="200";
                     }
                 }
             }
@@ -115,6 +120,7 @@
             e.printStackTrace();
             msg = "分区设备关联失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceDtoList);
         return resultMap;
@@ -129,6 +135,7 @@
     public Map<String, Object> linkReservePlan(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgReservePlanDto> pgReservePlanDtoList=new ArrayList<>();
         try{
@@ -139,10 +146,12 @@
                 else {
                     pgReservePlanDtoList = pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
 
-                    if(pgReservePlanDtoList==null||pgReservePlanDtoList.size()==0)
-                        msg="不存在关联的报警预案";
-                    else
+                    if (pgReservePlanDtoList == null || pgReservePlanDtoList.size() == 0)
+                        msg = "不存在关联的报警预案";
+                    else {
                         msg = "关联预案获取成功";
+                        code="200";
+                    }
                 }
             }
             else
@@ -153,6 +162,7 @@
             e.printStackTrace();
             msg="预案关联失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgReservePlanDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
index 0ddbc4d..0ce886b 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
@@ -41,25 +41,19 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getAlarmList(@FormParam("alarmType") String alarmType,
                                             @FormParam("startDay") String startDay,
+                                            @FormParam("partition") String partition,
                                             @FormParam("endDay") String endDay,
                                             @FormParam("isNew") String isNew,
                                             @FormParam("page") int page,
                                             @FormParam("rows") int rows) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
         try {
-            pgAlarmDtoList = pgAlarmManager.getAllAlarm(alarmType,startDay,endDay,isNew,page,rows);
-            if (pgAlarmDtoList==null||pgAlarmDtoList.size() == 0)
-                msg = "没有报警信息";
-            else
-                msg = "报警信息获取成功";
+            resultMap = pgAlarmManager.getAllAlarm(alarmType,partition,startDay,endDay,isNew,page,rows);
+
         } catch (Exception e) {
             e.printStackTrace();
-            msg = "报警信息获取失败";
         }
-        resultMap.put("msg", msg);
-        resultMap.put("result", pgAlarmDtoList);
         return resultMap;
     }
 
@@ -71,9 +65,10 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> clearAlarmList(@FormParam("id") String id) throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        String result = "false";
+        String result = "";
+        String code="0";
 
         try {
             PgAlarm pgAlarm = new PgAlarm();
@@ -86,12 +81,14 @@
                 pgAlarmManager.save(pgAlarm);
                 msg = "报警信息清除成功";
                 result = "true";
+                code = "200";
             }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警信息清除失败";
             result = "false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
@@ -106,21 +103,26 @@
     public Map<String, Object> getAlarmByTypeOrTime(@FormParam("alarmType") String alarmType,
                                                     @FormParam("startTime") String startTime,
                                                     @FormParam("endTime") String endTime) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
-        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<PgAlarmDto>();
+        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
         try {
             pgAlarmDtoList = pgAlarmManager.getAlarmByTypeAndTime(alarmType, startTime, endTime);
             if (pgAlarmDtoList == null || pgAlarmDtoList.size() == 0)
                 msg = "报警信息不存在";
             else
+            {
                 msg = "报警信息获取成功";
+                code="200";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警信息获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
index 29ce8a4..ed0bf34 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
@@ -39,8 +39,8 @@
     public Map<String, Object> getAlarmRule(@FormParam("devType") String devType) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
-        System.out.println("devType:"+devType);
         List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<>();
         try {
             pgAlarmRuleDtoList = pgAlarmRuleManager.getAlarmRuleDto(devType);
@@ -52,6 +52,7 @@
             e.printStackTrace();
             msg = "报警阈值信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmRuleDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
index 24ab894..abef1b1 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
@@ -39,16 +39,21 @@
                                                      @FormParam("endDate") String endDate)throws Exception{
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
+
         List<PgAlarmTjDto> pgAlarmTjDtoList=null;
         try{
             pgAlarmTjDtoList=pgAlarmTjManager.getAlarmTjResultByType(startDate,endDate);
             msg="获取成功";
+            code="200";
         }
         catch(Exception ex) {
             msg = "统计失败";
         }
-        resultMap.put("result",pgAlarmTjDtoList);
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
+        resultMap.put("result",pgAlarmTjDtoList);
+
         return resultMap;
     }
 
@@ -61,23 +66,27 @@
     public Map<String, Object> getAlarmByTime(@FormParam("startTime") String startTime,
                                               @FormParam("endTime") String endTime,
                                               @FormParam("statisticType") String statisticType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code = "0";
 
-        List<PgAlarmTjDto> pgAlarmTjDtoList = new ArrayList<PgAlarmTjDto>();
+        List<PgAlarmTjDto> pgAlarmTjDtoList = new ArrayList<>();
         try {
             pgAlarmTjDtoList = pgAlarmTjManager.getAlarmByTime(startTime, endTime, statisticType);
             if(pgAlarmTjDtoList==null)
                 msg="报警统计信息获取失败";
-            else
-                msg="报警统计信息获取成功";
+            else {
+                msg = "报警统计信息获取成功";
+                code="200";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警统计信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmTjDtoList);
         return resultMap;
     }
 
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
index 28bc811..b6278a9 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
@@ -30,7 +30,6 @@
     @Resource
     private PgAlarmTypeManager pgAlarmTypeManager;
 
-
     /**
      * 获取报警类型
      */
@@ -38,19 +37,24 @@
     @Path("getAlarmType")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getAlarmTypeList()throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
-        List<PgAlarmTypeDto> pgAlarmTypeDtoList=new ArrayList<PgAlarmTypeDto>();
+        String code="";
+
+        List<PgAlarmTypeDto> pgAlarmTypeDtoList=new ArrayList<>();
         try {
             pgAlarmTypeDtoList = pgAlarmTypeManager.getAllAlarmTypeDto();
             if(pgAlarmTypeDtoList.size()==0)
                 msg="没有报警类型信息";
-            else
-                msg="报警类型信息获取成功";
+            else {
+                code="200";
+                msg = "报警类型信息获取成功";
+            }
         }catch(Exception e){
             e.printStackTrace();
             msg="报警类型信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAlarmTypeDtoList);
         return resultMap;
@@ -66,6 +70,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
@@ -83,6 +88,7 @@
                 logger.info("成功保存");
                 result = "true";
                 msg = "保存成功";
+                code="200";
             }
         } catch (Exception e) {
             result = "false";
@@ -90,6 +96,7 @@
             e.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -106,6 +113,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try{
             if(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
@@ -119,6 +127,7 @@
                 pgAlarmTypeManager.save(pgAlarmType);
                 result = "true";
                 msg = "编辑成功";
+                code="200";
             }
         }
         catch(Exception e)
@@ -128,6 +137,7 @@
             e.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("result",result);
         resultMap.put("msg",msg);
 
@@ -146,6 +156,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
         String result="false";
+        String code="0";
 
         try {
             PgAlarmType pgAlarmType=pgAlarmTypeManager.get(Long.valueOf(id));
@@ -157,6 +168,7 @@
             {
                 pgAlarmType.setActive(0);
                 pgAlarmTypeManager.save(pgAlarmType);
+                code="200";
                 msg="报警类型删除成功";
                 result="true";
             }
@@ -165,6 +177,7 @@
             msg="报警类型删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
index 4533e1a..85940bb 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
@@ -33,12 +33,15 @@
                                                  @FormParam("inSpectionPlace") String inSpectionPlace){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
         List<PgAssetPlanDto> pgAssetPlanDtoList=new ArrayList<>();
         try{
             pgAssetPlanDtoList=pgAssetPlanManager.getPgAssetPlanDtoList(startDay,endDay,inSpectionPlace);
-            if(pgAssetPlanDtoList!=null&&pgAssetPlanDtoList.size()!=0)
-                msg="巡检信息获取成功";
+            if(pgAssetPlanDtoList!=null&&pgAssetPlanDtoList.size()!=0) {
+                code="200";
+                msg = "巡检信息获取成功";
+            }
             else
                 msg="不存在巡检信息";
         }
@@ -47,6 +50,7 @@
             msg="巡检信息获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAssetPlanDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
index 47ef9d1..5cbdfcb 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
@@ -30,12 +30,15 @@
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
         String result="";
+        String code="0";
 
         List<PgAssetPlanStatic> pgAssetPlanStaticList = null;
         try{
             pgAssetPlanStaticList=pgAssetPlanManager.getPgAssetPlanStaticLisByTime(startTime,endTime,staticType);
-            if(pgAssetPlanStaticList!=null&&pgAssetPlanStaticList.size()!=0)
-                msg="巡检统计信息获取成功";
+            if(pgAssetPlanStaticList!=null&&pgAssetPlanStaticList.size()!=0) {
+                code = "200";
+                msg = "巡检统计信息获取成功";
+            }
             else
                 msg="统计信息获取失败";
         }
@@ -44,6 +47,7 @@
             msg="统计失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAssetPlanStaticList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
index 26f5d6a..503bfe3 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
@@ -40,6 +40,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="";
 
         try{
             PgAuthority pgAuthority=new PgAuthority();
@@ -50,6 +51,7 @@
 
             pgAuthorityManager.save(pgAuthority);
             msg="用户权限保存成功";
+            code="200";
             result="true";
         }
         catch(Exception e) {
@@ -57,6 +59,7 @@
             msg = "新增权限失败";
             result = "false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -65,22 +68,25 @@
 
     /*
        *编辑角权限信息
-        */
+    */
     @POST
     @Path("editAuthority")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> editAuthority(@FormParam("id") String id,
                                        @FormParam("authority") String authority,
                                        @FormParam("concent") String concent) throws Exception{
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
+
         try {
             PgAuthority pgAuthority=pgAuthorityManager.get(Long.valueOf(id));
             pgAuthority.setAuthority(authority);
             pgAuthority.setConcent(concent);
 
             pgAuthorityManager.save(pgAuthority);
+            code="200";
             msg="权限保存成功";
             result="true";
         }
@@ -90,7 +96,7 @@
             msg="权限编辑失败";
             result="false";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -105,9 +111,10 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> deleteAuthority(@FormParam("id") String id)throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
-        String result="false";
+        String result="";
+        String code="0";
 
         try {
             PgAuthority pgAuthority= pgAuthorityManager.get(Long.valueOf(id));
@@ -119,6 +126,7 @@
             {
                 pgAuthority.setActive(0);
                 pgAuthorityManager.save(pgAuthority);
+                code="200";
                 msg="删除权限成功";
                 result="true";
             }
@@ -127,37 +135,40 @@
             msg="删除权限失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
     }
 
     /*
-* 获取权限信息
- */
+    * 获取权限信息
+    */
     @POST
     @Path("getAuthorityList")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> getAuthorityList() {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgAuthorityDto> pgAuthorityDtoList = new ArrayList<PgAuthorityDto>();
         try {
             pgAuthorityDtoList = pgAuthorityManager.getAuthorityList();
             if (pgAuthorityDtoList == null)
                 msg = "不存在权限信息";
-            else
+            else {
+                code = "200";
                 msg = "权限信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "权限信息获取是失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAuthorityDtoList);
         return resultMap;
     }
 
 
-
-
 }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
index a9ef521..a74ecc7 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
@@ -45,6 +45,7 @@
                                                @FormParam("endDate") String endDate)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgHistoryDataDto> pgHistoryDataDtoList=new ArrayList<>();
 
         try {
@@ -55,13 +56,16 @@
                 pgHistoryDataDtoList=pgCh4Manager.getAllCH4Data(pgDevice,startDate,endDate);
                 if(pgHistoryDataDtoList==null)
                     msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+                else {
+                    code = "200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgHistoryDataDtoList);
         return resultMap;
@@ -75,8 +79,9 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getNewestCh4InfoByDev(@FormParam("assetCode") String assetCode)throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
+        String code="0";
         PgCh4Dto pgCh4Dto=new PgCh4Dto(null);
 
         try {
@@ -87,13 +92,17 @@
                 pgCh4Dto=pgCh4Manager.getNewestCH4Data(pgDevice);
                 if(pgCh4Dto==null)
                     msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgCh4Dto);
         return resultMap;
@@ -111,6 +120,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
@@ -127,6 +137,7 @@
                 pgCh4.setPgDeviceId(pgDevice);
 
                 pgCh4Manager.save(pgCh4);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -135,7 +146,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
index a7eac39..dfc8ca5 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
@@ -43,23 +43,27 @@
                                                       @FormParam("endDate") String endDate)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgHistoryDataDto> pgHistoryDataDtoList=new ArrayList<>();
 
         try {
             PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
                 msg="设备不存在";
-            else{
-                pgHistoryDataDtoList=pgCoManager.getAllCoData(pgDevice, startDate, endDate);
-                if(pgHistoryDataDtoList==null)
-                    msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+            else {
+                pgHistoryDataDtoList = pgCoManager.getAllCoData(pgDevice, startDate, endDate);
+                if (pgHistoryDataDtoList == null)
+                    msg = "没有满足要求的数据";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgHistoryDataDtoList);
         return resultMap;
@@ -75,6 +79,7 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         PgCoDto pgCoDto=new PgCoDto(null);
 
         try {
@@ -85,13 +90,16 @@
                 pgCoDto=pgCoManager.getNewestCoData(pgDevice);
                 if(pgCoDto==null)
                     msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgCoDto);
         return resultMap;
@@ -110,6 +118,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         try {
@@ -126,6 +135,7 @@
 
                 pgCoManager.save(pgCo);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
         } catch (Exception e) {
@@ -133,7 +143,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
index b4b826e..9af98a3 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
@@ -60,6 +60,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         try {
 
@@ -80,8 +81,8 @@
                 pgConstruction.setPgConstructionTypeId(pgConstructionType.getId());
                 pgConstruction.setActive(1);
                 pgConstruction.setParName(parName);
-                logger.info("保存成功");
                 pgConstructionManager.save(pgConstruction);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -90,6 +91,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("success", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -116,6 +118,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
@@ -140,6 +143,7 @@
                 pgConstruction.setParName(parName);
 
                 pgConstructionManager.save(pgConstruction);
+                code="200";
                 result = "true";
                 msg = "编辑成功";
             }
@@ -150,7 +154,7 @@
             e.printStackTrace();
 
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -167,6 +171,8 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
+
         try {
             PgConstruction pgConstruction = pgConstructionManager.get(Long.valueOf(id));
             if (pgConstruction == null)
@@ -177,6 +183,7 @@
             {
                 pgConstruction.setActive(0);
                 pgConstructionManager.save(pgConstruction);
+                code="200";
                 result = "true";
                 msg = "成功删除信息";
             }
@@ -185,6 +192,7 @@
             result = "false";
             msg = "删除失败";
         }
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -204,9 +212,11 @@
                                                   @FormParam("rows") int rows)throws Exception{
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
         List<PgConstructionDto> pgConstructionDtoList=new ArrayList<>();
         try{
             pgConstructionDtoList=pgConstructionManager.getPgContructionDto(cs_name,cs_type,startTime,endTime,page,rows);
+            code="200";
             msg="信息获取成功";
         }
         catch(Exception e)
@@ -214,6 +224,7 @@
             e.printStackTrace();
             msg="查询失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
 
@@ -231,18 +242,22 @@
                                                               @FormParam("statisticType") String statisticType) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgConstructionStiatistic> pgConstructionStiatisticList=new ArrayList<>();
         try {
             pgConstructionStiatisticList = pgConstructionManager.getConstructionByTimeAndStatus(startTime, endTime, statisticType);
             if(pgConstructionStiatisticList==null)
                 msg="施工统计信息获取失败";
-            else
-                msg="施工统计信息获取成功";
+            else {
+                code="200";
+                msg = "施工统计信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "施工统计信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgConstructionStiatisticList);
         return resultMap;
@@ -257,6 +272,7 @@
     public Map<String, Object> getConstructionByType(@FormParam("statisticType") String statisticType){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
         List<PgConstructionStiatistic> pgConstructionStiatisticList=new ArrayList<>();
 
         try{
@@ -268,6 +284,7 @@
                 resultMap.put("result",null);
             }
             else {
+                code="200";
                 msg = "统计信息获取成功";
                 resultMap.put("result", pgConstructionStiatisticList);
             }
@@ -278,6 +295,7 @@
             msg="统计失败";
             resultMap.put("result",null);
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         return resultMap;
     }
@@ -291,9 +309,11 @@
     public Map<String, Object> getConstructionToday() throws Exception{
         Map<String,Object> resultMap=new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgConstructionDto> pgConstructionDtoList=new ArrayList<PgConstructionDto>();
         try {
             pgConstructionDtoList = pgConstructionManager.getConstructionToday();
+            code="200";
             msg = "当天施工信息获取成功";
         }
         catch(Exception e)
@@ -301,7 +321,7 @@
             e.printStackTrace();
             msg="获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
         return resultMap;
@@ -316,6 +336,7 @@
     public Map<String, Object> getConstructionDev(@FormParam("id") String id) throws Exception{
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
         List<PgDeviceDto> pgDeviceDtoList =new ArrayList<>();
         try{
@@ -325,14 +346,17 @@
 
             if(pgDeviceDtoList==null)
                 msg="信息获取失败";
-            else
-                msg="信息获取成功";
+            else {
+                code="200";
+                msg = "信息获取成功";
+            }
         }
         catch(Exception e)
         {
             e.printStackTrace();
-            msg="设备信息获取成功";
+            msg="信息获取是被";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgDeviceDtoList);
 
@@ -346,17 +370,21 @@
     @Path("getConstruction")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getConstruction() throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
-        List<PgConstructionDto> pgConstructionDtoList=new ArrayList<PgConstructionDto>();
+        String code="0";
+
+        List<PgConstructionDto> pgConstructionDtoList=new ArrayList<>();
 
         try{
             pgConstructionDtoList=pgConstructionManager.getPgConstructionList();
             if(pgConstructionDtoList==null||pgConstructionDtoList.size()==0)
                 msg="不存在施工记录";
-            else
-                msg="施工信息获取成功";
+            else {
+                code = "200";
+                msg = "施工信息获取成功";
+            }
         }
         catch(Exception e)
         {
@@ -364,6 +392,7 @@
             msg="施工信息获取失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java
index fd3d53e..2019502 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java
@@ -39,12 +39,12 @@
         try {
             pgConstructionTypeDtoList = pgConstructionTypeManager.getAllConstructionTypeDto();
             if (pgConstructionTypeDtoList.size() == 0)
-                msg = "没有项目类型信息";
+                msg = "获取失败";
             else
-                msg = "项目类型获取成功";
+                msg = "获取成功";
         } catch (Exception e) {
             e.printStackTrace();
-            msg = "项目类型信息获取失败";
+            msg = "获取失败";
         }
         resultMap.put("msg", msg);
         resultMap.put("result", pgConstructionTypeDtoList);
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
index 90d001c..037a399 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
@@ -51,6 +51,7 @@
 
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if (StringUtils.isBlank(construct_doc)||StringUtils.isBlank(doc_name))
@@ -65,6 +66,7 @@
             pgCsDocument.setActive(1);
             pgCsDocumentManager.save(pgCsDocument);
 
+            code="200";
             result = "true";
             msg = "保存成功";
 
@@ -74,6 +76,7 @@
             ex.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("success", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -90,6 +93,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             PgCsDocument pgCsDocument = pgCsDocumentManager.get(Long.valueOf(id));
@@ -103,6 +107,7 @@
 
                 pgCsDocumentManager.save(pgCsDocument);
 
+                code="200";
                 result = "true";
                 msg = "编辑成功";
             }
@@ -112,6 +117,7 @@
             msg = "编辑失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -125,9 +131,9 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
         String result="";
+        String code="0";
 
         try{
-
             PgCsDocument pgCsDocument = pgCsDocumentManager.get(Long.valueOf(id));
             if(pgCsDocument==null)
             {
@@ -137,6 +143,7 @@
             else{
                 pgCsDocument.setActive(0);
                 pgCsDocumentManager.save(pgCsDocument);
+                code="200";
                 result="true";
                 msg="删除成功";
             }
@@ -147,7 +154,7 @@
             msg="预案删除失败";
             result="false";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -168,18 +175,21 @@
 
         String msg="";
         String result="";
+        String code="0";
 
         try {
             pgCsDocumentDtoList = pgCsDocumentManager.getAllDocData(cs_name);
-            if (pgCsDocumentDtoList != null)
+            if (pgCsDocumentDtoList != null) {
+                code="200";
                 msg = "获取数据成功";
+            }
             else
                 msg = "没有满足条件的数据";
         }catch (Exception e){
             e.printStackTrace();
             msg = "获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgCsDocumentDtoList);
         return resultMap;
@@ -192,20 +202,22 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
 
         String msg = "";
+        String code="0";
         ResponseEntity<byte[]> path = null;
         try {
             PgCsDocument pgCsDocument = pgCsDocumentManager.get(Long.valueOf(id));
             path = pgCsDocumentManager.downloadFile(pgCsDocument);
             if (path == null)
                 msg = "不存在该文档";
-            else
+            else {
+                code = "200";
                 msg = "下载成功";
-
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "下载失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", path.getBody());
         resultMap.put("msg", msg);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
index 94c5c84..ffc8b95 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
@@ -41,22 +41,24 @@
     public Map<String, Object> getPgDeviceByDevType(@FormParam("devType") String devType) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
         try {
-            pgDeviceDtoList = pgDeviceManager.getDeviceByDevTypee(devType);
+            pgDeviceDtoList = pgDeviceManager.getDeviceByDevType(devType);
             if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0){
                 msg="不存在满足要求的数据";
-                resultMap.put("result",null);
             }
             else{
-                resultMap.put("result", pgDeviceDtoList);
+                code="200";
                 msg = "获取成功";
             }
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", pgDeviceDtoList);
         return resultMap;
     }
 
@@ -69,25 +71,26 @@
     public Map<String, Object> getPgDeviceByAssetCode(@FormParam("assetCode") String assetCode) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         PgDeviceDto pgDeviceDto=null;
         try {
             PgDevice pgDevice = pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
             {
                 msg="不存在设备信息";
-                resultMap.put("result",null);
             }
             else {
                 pgDeviceDto = new PgDeviceDto(pgDevice);
                 msg = "获取成功";
-                resultMap.put("result", pgDeviceDto);
+                code="200";
             }
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", pgDeviceDto);
         return resultMap;
     }
 
@@ -102,27 +105,61 @@
                                              @FormParam("devType") String devType)throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
         try {
             pgDeviceDtoList = pgDeviceManager.getAllDevice(road,partition,devType);
             if(pgDeviceDtoList.size()==0) {
                 msg = "没有找到设备信息";
-                resultMap.put("result",null);
             }
             else {
                 msg = "设备信息获取成功";
-                resultMap.put("result", pgDeviceDtoList);
+                code="200";
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result", pgDeviceDtoList);
         return resultMap;
     }
 
     /**
+     * 显示设备列表
+     */
+    @POST
+    @Path("getPgDev")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String, Object> getPgDev(@FormParam("road") String road,
+                                             @FormParam("partition") String partition,
+                                             @FormParam("devType") String devType)throws Exception {
+        Map<String, Object> resultMap = new HashMap<>();
+        String msg="";
+        String code="0";
+        List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
+        try {
+            pgDeviceDtoList = pgDeviceManager.getAllDev(road,partition,devType);
+            if(pgDeviceDtoList.size()==0) {
+                msg = "没有找到设备信息";
+            }
+            else {
+                code="200";
+                msg = "设备信息获取成功";
+            }
+        }catch(Exception e){
+            e.printStackTrace();
+            msg="设备信息获取失败";
+        }
+        resultMap.put("code",code);
+        resultMap.put("msg",msg);
+        resultMap.put("result", pgDeviceDtoList);
+        return resultMap;
+    }
+
+
+    /**
      * 新增设备
      */
     @POST
@@ -145,6 +182,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if (pgDeviceManager.getDeviceByAssetCode(assetCode)!=null) {
@@ -169,6 +207,7 @@
 
                 pgDeviceManager.save(pgDevice);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
 
@@ -177,10 +216,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -208,14 +246,9 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
-            /*
-            if (pgDeviceManager.getDeviceByAssetCode(assetCode)!=null) {
-                result = "false";
-                msg = "已存在同名设备";
-            } else {
-            */
             PgDevice pgDevice = pgDeviceManager.get(Long.valueOf(id));
             pgDevice.setPipeGallery(pipeGallery);
             pgDevice.setPartition(partition);
@@ -233,14 +266,14 @@
 
             pgDeviceManager.save(pgDevice);
             result = "true";
+            code="200";
             msg = "编辑成功";
-            //}
         } catch (Exception e) {
             result = "false";
             msg = "编辑失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("result",result);
         resultMap.put("msg",msg);
         return resultMap;
@@ -256,7 +289,8 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
-        String result="false";
+        String result="";
+        String code="0";
 
         try {
             PgDevice pgDevice=pgDeviceManager.get(Long.valueOf(id));
@@ -268,6 +302,7 @@
             {
                 pgDevice.setActive(0);
                 pgDeviceManager.save(pgDevice);
+                code="200";
                 msg="设备删除成功";
                 result="true";
             }
@@ -276,6 +311,7 @@
             msg="设备删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -291,18 +327,18 @@
     {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         PgDeviceDto pgDeviceDto=null;
 
         try{
             PgDevice pgDevice=pgDeviceManager.getDeviceBydevCode(devCode);
             if(pgDevice==null) {
                 msg = "设备信息获取失败";
-                resultMap.put("result",null);
             }
             else{
                 pgDeviceDto = new PgDeviceDto(pgDevice);
                 msg = "设备信息获取成功";
-                resultMap.put("result",pgDeviceDto);
+                code="200";
             }
         }
         catch(Exception ex)
@@ -310,8 +346,9 @@
             ex.printStackTrace();
             msg="设备状态获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgDeviceDto);
         return resultMap;
     }
 
@@ -324,17 +361,17 @@
     public Map<String,Object> getDeviceByPartition(@FormParam("partition") String partition) throws Exception{
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<PgDeviceDto>();
 
         try{
             pgDeviceDtoList=pgDeviceManager.getPgDeviceDtoListByPartition(partition);
             if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0) {
                 msg = "设备信息获取失败";
-                resultMap.put("result",null);
             }
             else {
+                code="200";
                 msg = "设备信息获取成功";
-                resultMap.put("result",pgDeviceDtoList);
             }
         }
         catch(Exception e)
@@ -342,8 +379,9 @@
             e.printStackTrace();
             msg="设备信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgDeviceDtoList);
         return resultMap;
     }
 
@@ -353,17 +391,16 @@
     public Map<String,Object> getDeviceByOldDAssetCodeCode(@FormParam("assetCode") String assetCode) throws Exception{
         Map<String, Object> resultMap = new HashMap<>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
 
         try{
             pgDeviceDtoList=pgDeviceManager.getDeviceByOldDAssetCodeCode(assetCode);
-            if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0) {
-                msg = "设备信息获取失败";;
-                resultMap.put("result",null);
-            }
+            if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0)
+                msg = "设备信息获取失败";
             else {
                 msg = "设备信息获取成功";
-                resultMap.put("result",pgDeviceDtoList);
+                code="200";
             }
         }
         catch(Exception e)
@@ -372,8 +409,9 @@
             msg="设备信息获取失败";
             resultMap.put("result",null);
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgDeviceDtoList);
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java
index 421d249..f6f167d 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java
@@ -38,17 +38,21 @@
     public Map<String, Object> getDeviceTpeyList()throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgDeviceTypeDto> pgDeviceTypeDtoList=new ArrayList<PgDeviceTypeDto>();
         try {
             pgDeviceTypeDtoList = pgDeviceTypeManager.getAllDeviceType();
             if(pgDeviceTypeDtoList.size()==0)
                 msg="没有找到设备类型信息";
-            else
-                msg="设备类型信息获取成功";
+            else {
+                code="200";
+                msg = "设备类型信息获取成功";
+            }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备类型信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgDeviceTypeDtoList);
         return resultMap;
@@ -66,6 +70,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if (pgDeviceTypeManager.getDeviceTypeByDeType(devType)!=null) {
@@ -79,6 +84,7 @@
 
                 pgDeviceTypeManager.save(pgDeviceType);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
 
@@ -87,10 +93,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
index c276fb3..c789960 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
@@ -44,6 +44,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 
         try {
@@ -62,6 +63,7 @@
                 pgEquipment.setActive(1);
 
                 pgEquipmentManager.save(pgEquipment);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -70,9 +72,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -89,9 +91,10 @@
                                             @FormParam("ownerUnit") String ownerUnit,
                                             @FormParam("enterDate") String enterDate,
                                             @FormParam("curUser") String curUser) {
-        HashMap<String, Object> resultMap = new HashMap<String, Object>();
+        HashMap<String, Object> resultMap = new HashMap<>();
         String msg = "";
         String result = "";
+        String code="0";
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 
         try {
@@ -111,6 +114,7 @@
                 pgEquipment.setEnterDate(sdf.parse(enterDate));
 
                 pgEquipmentManager.save(pgEquipment);
+                code="200";
                 msg="编辑成功";
                 result="true";
             }
@@ -119,9 +123,9 @@
             result = "false";
             msg = "编辑失败";
         }
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -134,16 +138,19 @@
     public Map<String, Object> getEquipment(@FormParam("eqName") String eqName,
                                             @FormParam("eqCode") String eqCode,
                                             @FormParam("eqType") String eqType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        List<PgEquipmentDto> pgEquipmentDtoList=new ArrayList<PgEquipmentDto>();
+        String code="0";
+        List<PgEquipmentDto> pgEquipmentDtoList=new ArrayList<>();
 
         try{
             pgEquipmentDtoList=pgEquipmentManager.getEquipmentDtiList(eqName,eqCode,eqType);
             if(pgEquipmentDtoList==null||pgEquipmentDtoList.size()==0)
                 msg="不存在工器具记录";
-            else
-                msg="维获取成功";
+            else {
+                code = "200";
+                msg = "维获取成功";
+            }
         }
         catch(Exception e)
         {
@@ -166,6 +173,7 @@
         HashMap<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
         String result = "";
+        String code="";
 
         try {
             PgEquipment pgEquipment=pgEquipmentManager.get(Long.valueOf(id));
@@ -178,6 +186,7 @@
             {
                 pgEquipment.setActive(0);
                 pgEquipmentManager.save(pgEquipment);
+                code="200";
                 msg="删除成功";
                 result="true";
             }
@@ -186,6 +195,7 @@
             msg="设备信息获取失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -201,16 +211,19 @@
             throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=new ArrayList<PgDeviceTypeStatisticDto>();
 
         try {
             pgDeviceTypeStatisticDtoList=pgEquipmentManager.getDeviceStatisticByDevType(eqType);
 
+            code="200";
             msg = "获取成功";
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceTypeStatisticDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
index 05a9709..a90fd6c 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
@@ -4,9 +4,9 @@
 import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
 import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
 import com.casic.PgInterface.intelPlan.manager.PgPileAcuManager;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import com.casic.PgInterface.test.PlanData;
 import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.ModelAttribute;
 
 import javax.annotation.Resource;
 import javax.ws.rs.FormParam;
@@ -32,23 +32,25 @@
     public Map<String,Object> getPlanResult(@FormParam("planParamStr") String planParamStr){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
-        //List<PgPlanTask> pgPlanTaskList=pgPlanParams.getPgPlanTaskList();
         List<PgPlanTask> pgPlanTaskList=new PgPlanParams().getPgPlanParamsByString(planParamStr);
         List<PgPlanResultRe> pgPlanResultReList=new ArrayList<>();
 
-        try{
-                pgPlanResultReList=pgPileAcuManager.getPgPlanResultList(pgPlanTaskList);
-                if(pgPlanResultReList==null)
-                    msg="管线智能规划出错";
-                else
-                    msg="管线智能规划完成";
+        try {
+            pgPlanResultReList = pgPileAcuManager.getPgPlanResultList(pgPlanTaskList);
+            if (pgPlanResultReList == null)
+                msg = "管线智能规划出错";
+            else {
+                code="200";
+                msg = "管线智能规划完成";
+            }
         }
         catch(Exception ex){
             msg="智能规划出错";
             ex.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgPlanResultReList);
 
@@ -80,4 +82,30 @@
         return resultMap;
     }
 
+    @POST
+    @Path("getPlanTask")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getACUTask(@FormParam("pileAcuList") String pileAcuList){
+
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        String code="0";
+        List<PgAcuTask> pgAcuTaskList=new ArrayList<>();
+
+        try{
+            pgAcuTaskList=pgPileAcuManager.getACUTask(pileAcuList);
+            code="200";
+            msg="任务获取成功";
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            msg="任务获取失败";
+        }
+        resultMap.put("code",code);
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgAcuTaskList);
+
+        return resultMap;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
index ff85c61..66eec76 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
@@ -55,13 +55,13 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         try {
             PgInPgPerson pgInPgPerson = null;//pgInPgPersonManager.getPersonByUserName(userName);
             int iHostName = pgTagMacManager.getCount("select count(1) from PGTagMac where hostname = ?",assetCode);
-//            int iTagMac = pgTagMacManager.getCount("select count(1) from PGTagMac where tagmac = ?",assetCode.toUpperCase());
             if (0==iHostName)
             {
                 result = "false";
@@ -92,9 +92,8 @@
 
                 pgInPgStatusManager.save(pgInPgStatus);
 
-//                String syResult=pgInPgPersonManager.synchorizedInPgInfo(assetCode,userCode,userName,personType);
+                code="200";
                 result = "true";
-//                msg = "人员注册保存成功"+syResult;
                 msg = "人员注册保存成功";
             }
             else {
@@ -106,6 +105,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -120,6 +120,7 @@
     public Map<String, Object> getInPgPerson() throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<>();
         try {
@@ -127,11 +128,15 @@
             if (pgInPgInfoDtoList == null || pgInPgInfoDtoList.size() == 0)
                 msg = "没有找到入廊人员信息";
             else
+            {
+                code="200";
                 msg = "入廊人员信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "入廊人员信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
         return resultMap;
@@ -146,18 +151,22 @@
     public Map<String, Object> getInPgPersonInPg() throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
 
-        List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<PgInPgInfoDto>();
+        List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<>();
         try {
             pgInPgInfoDtoList = pgInPgPersonManager.getPgInPersonList(1);
             if (pgInPgInfoDtoList == null || pgInPgInfoDtoList.size() == 0)
                 msg = "没有找到入廊人员信息";
-            else
+            else {
+                code="200";
                 msg = "入廊人员信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "入廊人员信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
         return resultMap;
@@ -172,6 +181,7 @@
     public Map<String, Object> getInPgPersonByName(@FormParam("userName") String userName) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
 
         PgInPgPerson pgInPgPerson = null;
         PgInPgPersonDto pgInPgPersonDto=null;
@@ -184,12 +194,13 @@
                 pgInPgPersonDto=new PgInPgPersonDto(pgInPgPerson);
                 pgInPgPersonDtoList.add(pgInPgPersonDto);
                 msg = "人员信息获取成功";
+                code="200";
             }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "人员信息获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgPersonDtoList);
         return resultMap;
@@ -206,6 +217,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             PgInPgPerson pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName);
@@ -221,6 +233,7 @@
                     pgInPgPersonManager.save(pgInPgPerson);
                     result = "true";
                     msg = "编辑成功";
+                    code="200";
                 }
             }
         } catch (Exception e) {
@@ -228,9 +241,9 @@
             msg = "编辑失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -244,10 +257,12 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         int inPgNum=0;
         String msg = "";
+        String code="0";
 
         try{
             inPgNum=pgInPgStatusManager.getInPgNum();
 
+            code="200";
             msg="人员入廊次数获取成功";
         }
         catch(Exception e)
@@ -255,6 +270,7 @@
             e.printStackTrace();
             msg="人员入廊次数获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",inPgNum);
 
@@ -272,18 +288,22 @@
                                                    @FormParam("statisticType") String statisticType) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
 
         List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<PgInPgInfoDto>();
         try {
             pgInPgInfoDtoList = pgInPgPersonManager.getPgInPersonListByTime(startTime, endTime, statisticType);
             if(pgInPgInfoDtoList==null)
                 msg="入廊人员统计信息获取失败";
-            else
-                msg="入廊人员统计信息获取成功";
+            else {
+                code="200";
+                msg = "入廊人员统计信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "入廊人员统计信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
         return resultMap;
@@ -296,6 +316,7 @@
 
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
 
         try {
@@ -304,8 +325,10 @@
                 pgDeviceDtoList=pgDeviceManager.getPgCameraListByPosition("",apCodeStr);
                 if(pgDeviceDtoList==null)
                     msg="不存在关联摄像机";
-                else
-                    msg="关联摄像机获取成功";
+                else {
+                    code="200";
+                    msg = "关联摄像机获取成功";
+                }
             } else {
                 msg="请输入Ap编号";
             }
@@ -315,6 +338,7 @@
             msg="关联摄像机获取成功";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgDeviceDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java
index 507b3fe..b43f077 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java
@@ -34,6 +34,7 @@
 
         String result="";
         String msg="";
+        String code="";
         try{
             PgInPgStatus pgInPgStatus=new PgInPgStatus();
 
@@ -44,6 +45,7 @@
             pgInPgStatusManager.save(pgInPgStatus);
             msg="入廊时间提交成功";
             result="true";
+            code="200";
         }
         catch (Exception e){
             e.printStackTrace();
@@ -51,6 +53,7 @@
             result="false";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -66,6 +69,7 @@
 
         String result="";
         String msg="";
+        String code="0";
         try{
             PgInPgPerson pgInPgPerson=pgInPgPersonManager.getPgInPgPersonByAssetCode(assetCode);
 
@@ -79,6 +83,7 @@
             pgInPgStatusManager.save(pgInPgStatus);
 
             msg="出廊时间提交成功";
+            code="200";
             result="true";
         }
         catch (Exception e){
@@ -87,6 +92,7 @@
             result="false";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
index 9def330..9c0ba1f 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
@@ -33,17 +33,20 @@
                                             @FormParam("existNum") String existNum) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         String result="";
 
         try {
             pgIntelPlanManager.savePgIntelPlan(parName,lineName,maxNum,existNum);
             msg="规划数据保存成功";
+            code="200";
             result="true";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "规划数据保存失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
@@ -55,15 +58,18 @@
     public Map<String, Object> getIntelLineType() throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgIntelPlanTypeDto> pgIntelPlanTypeDtoList=new ArrayList<>();
         try {
             pgIntelPlanTypeDtoList=pgIntelPlanManager.getIntelPlanType();
+            code="200";
             msg="获取排线类型成功";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "获取排线类型失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgIntelPlanTypeDtoList);
         return resultMap;
@@ -76,6 +82,7 @@
                                             @FormParam("partitionStr") String partitionStr) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgIntelPlanDto> pgIntelPlanDtoList = new ArrayList<>();
 
@@ -83,8 +90,10 @@
             pgIntelPlanDtoList = pgIntelPlanManager.getPgIntelPlanListByPartion(lineName, partitionStr);
             if(pgIntelPlanDtoList==null||pgIntelPlanDtoList.size()==0)
                 msg="请输入正确的规划参数";
-            else
-                msg="规划数据获取成功";
+            else {
+                code="200";
+                msg = "规划数据获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "规划数据获取失败";
@@ -103,10 +112,12 @@
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
         String result="";
+        String code="0";
 
         try {
             boolean bl=pgIntelPlanManager.addLineUse(lineName,partitionStr,num);
             if(bl){
+                code="200";
                 msg="排线入廊成功";
                 result="true";
             }
@@ -119,6 +130,7 @@
             msg = "排线入廊失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
@@ -132,6 +144,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
         String result="";
+        String code="0";
 
         try {
             PgIntelPlan pgIntelPlan=pgIntelPlanManager.getPgIntelPlanByParNameAndLine(lineName,parName);
@@ -140,11 +153,13 @@
             pgIntelPlanManager.save(pgIntelPlan);
             msg="规划数据删除成功";
             result="true";
+            code="200";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "规划数据删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java b/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java
index 378af00..9c39523 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java
@@ -1,5 +1,6 @@
 package com.casic.PgInterface.rs;
 
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
 import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
 import com.casic.PgInterface.intelPlan.dto.PgLineHoleDTO;
 import com.casic.PgInterface.intelPlan.manager.PgLineHoleManager;
@@ -27,6 +28,9 @@
     @Resource
     private PgPileAcuManager pgPileAcuManager;
 
+    @Resource
+    private PgRoadManager pgRoadManager;
+
     @POST
     @Path("getPgLineAcuHole")
     @Produces(MediaType.APPLICATION_JSON)
@@ -34,23 +38,32 @@
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
         String result="";
+        String code="0";
         List<PgLineHoleDTO> pgLineHoleDTOList=new ArrayList<>();
 
         try {
             PgPileAcu pgPileAcu=pgPileAcuManager.getPgPileAcuByCode(acuCode);
             if(pgPileAcu==null){
                 msg="不存在分区";
-            }else{
-                pgLineHoleDTOList=pgLineHoleManager.getCurrentHoleByAcu(pgPileAcu.getId());
-                if(pgLineHoleDTOList!=null&&pgLineHoleDTOList.size()!=0)
-                    msg="获取成功";
-                else
-                    msg="未找到入廊数据";
+            }else {
+                pgLineHoleDTOList = pgLineHoleManager.getCurrentHoleByAcu(pgPileAcu.getId());
+                if (pgLineHoleDTOList != null && pgLineHoleDTOList.size() != 0)
+                {
+                    code="200";
+                    msg = "获取成功";
+                }
+                else {
+                    PgLineHoleDTO pgLineHoleDTO=new PgLineHoleDTO();
+                    pgLineHoleDTO.setRoad(pgRoadManager.get(pgPileAcu.getRoadId()).getRoadName());
+                    pgLineHoleDTOList.add(pgLineHoleDTO);
+                    msg = "未找到入廊数据";
+                }
             }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgLineHoleDTOList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgLogRs.java b/src/main/java/com/casic/PgInterface/rs/PgLogRs.java
index 39cff52..30db63b 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgLogRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgLogRs.java
@@ -45,6 +45,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         PgLog pgLog=new PgLog();
         try {
             PgUser pgUser = new PgUser();
@@ -60,14 +61,15 @@
             pgLogManager.save(pgLog);
             result = "true";
             msg = "保存成功";
-
+            code="200";
         } catch (Exception e) {
             result = "false";
             msg = "保存失败";
             e.printStackTrace();
         }
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -83,17 +85,21 @@
             throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgLogDto> pgLogDtoList = new ArrayList<PgLogDto>();
         try {
             pgLogDtoList = pgLogManager.getAllLogs(userName, startTime, endTime);
             if (pgLogDtoList == null || pgLogDtoList.size() == 0)
                 msg = "没有找到日志信息";
-            else
+            else {
+                code="200";
                 msg = "日志信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "日志信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgLogDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java
index 9fd0a5f..37b72f6 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java
@@ -36,19 +36,23 @@
         Map<String,Object> resultMap=new HashMap<>();
 
         String msg = "";
+        String code="0";
         List<PgMaintainType> pgMaintainTypeList=new ArrayList<>();
         try{
             pgMaintainTypeList=pgMaintainTypeManager.getMaintainType();
             if(pgMaintainTypeList!=null&&pgMaintainTypeList.size()!=0)
                 msg="不存在运维类别";
-            else
-                msg="运维类别获取成功";
+            else {
+                code="200";
+                msg = "运维类别获取成功";
+            }
         }
         catch(Exception ex)
         {
             ex.printStackTrace();
             msg="运维类别获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgMaintainTypeList);
 
@@ -65,10 +69,11 @@
         Map<String,Object> resultMap=new HashMap<>();
 
         String msg = "";
+        String code="0";
         List<PgMaintainTypeDto> pgMaintainTypeDtoList=new ArrayList<PgMaintainTypeDto>();
         try{
             pgMaintainTypeDtoList=pgMaintainTypeManager.getMaintainTypeModel(type);
-
+            code="200";
             msg="维护类型获取成功";
         }
         catch(Exception ex)
@@ -77,9 +82,9 @@
             msg="维护类型获取失败";
         }
 
-        resultMap.put("result",pgMaintainTypeDtoList);
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgMaintainTypeDtoList);
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java
index d735cc9..82ffca4 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java
@@ -33,12 +33,16 @@
                                                  @FormParam("endTime") String endTime){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
         List<PgMaintanceRecordHeadDto> pgMaintanceRecordHeadDtoList=new ArrayList<>();
         try{
             pgMaintanceRecordHeadDtoList=pgMaintanceRecordHeadManager.getPgMaintanceRecordHeadLsit(repairMan,startTime,endTime);
             if(pgMaintanceRecordHeadDtoList!=null&&pgMaintanceRecordHeadDtoList.size()!=0)
+            {
+                code="200";
                 msg="维护信息获取成功";
+            }
             else
                 msg="不存在维护信息";
         }
@@ -47,6 +51,7 @@
             msg="巡检信息获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgMaintanceRecordHeadDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java
index effc9df..9f46fc8 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java
@@ -32,12 +32,16 @@
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
         String result="";
+        String code="0";
 
         List<PgMaintanceRecordHeadStatic> pgMaintanceRecordHeadStaticList=new ArrayList<>();
         try{
             pgMaintanceRecordHeadStaticList=pgMaintanceRecordHeadManager.getPgMaintanceRecordHeadStaticLisByTime(startTime,endTime,staticType);
             if(pgMaintanceRecordHeadStaticList!=null&&pgMaintanceRecordHeadStaticList.size()!=0)
+            {
+                code="200";
                 msg="维护统计信息获取成功";
+            }
             else
                 msg="维护统计失败";
         }
@@ -46,7 +50,7 @@
             ex.printStackTrace();
             msg="统计失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgMaintanceRecordHeadStaticList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java b/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java
index 3a67bf3..6a5f4dc 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java
@@ -39,27 +39,31 @@
     @Path("getO2InfoByDevAndDate")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getO2InfoByDevAndDate(@FormParam("assetCode") String assetCode,
-                                                      @FormParam("startDate") String startDate,
-                                                      @FormParam("endDate") String endDate)throws Exception {
+                                                     @FormParam("startDate") String startDate,
+                                                     @FormParam("endDate") String endDate)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgHistoryDataDto> pgHistoryDataDtoList=new ArrayList<>();
 
         try {
             PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
                 msg="设备不存在";
-            else{
-                pgHistoryDataDtoList=pgO2Manager.getAllO2Data(pgDevice, startDate, endDate);
-                if(pgHistoryDataDtoList==null)
-                    msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+            else {
+                pgHistoryDataDtoList = pgO2Manager.getAllO2Data(pgDevice, startDate, endDate);
+                if (pgHistoryDataDtoList == null)
+                    msg = "没有满足要求的数据";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgHistoryDataDtoList);
         return resultMap;
@@ -75,23 +79,27 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         PgO2Dto pgO2Dto=new PgO2Dto(null);
 
         try {
             PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
                 msg="设备不存在";
-            else{
-                pgO2Dto=pgO2Manager.getNewestO2Data(pgDevice);
-                if(pgO2Dto==null)
-                    msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+            else {
+                pgO2Dto = pgO2Manager.getNewestO2Data(pgDevice);
+                if (pgO2Dto == null)
+                    msg = "没有满足要求的数据";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgO2Dto);
         return resultMap;
@@ -104,11 +112,12 @@
     @Path("addO2Data")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> addO2Data(@FormParam("devCode") String devCode,
-                                          @FormParam("upTime") String upTime,
-                                          @FormParam("o2") String o2)throws Exception {
+                                         @FormParam("upTime") String upTime,
+                                         @FormParam("o2") String o2)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
@@ -125,6 +134,7 @@
                 pgO2.setPgDeviceId(pgDevice);
 
                 pgO2Manager.save(pgO2);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -133,9 +143,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java b/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java
index 6217cde..70b3b41 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java
@@ -30,8 +30,6 @@
 public class PgOverViewRs {
 
     @Resource
-    private PgInPgPersonManager pgInPgPersonManager;
-    @Resource
     private PgInPgStatusManager pgInPgStatusManager;
     @Resource
     private PgAlarmManager pgAlarmManager;
@@ -46,18 +44,21 @@
     @Path("getPersonNumInPgByMonth")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<Object, String> getMonthInPgPersonNum() throws Exception {
-        Map<Object, String> resultMap = new HashMap<Object, String>();
+        Map<Object, String> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         int inNum = 0;
 
         try {
             inNum = pgInPgStatusManager.getMonthInPgPersonNum();
+            code="200";
             msg = "本月入廊人员次数获取成功";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "本月入廊人员次数获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", String.valueOf(inNum));
 
@@ -73,15 +74,18 @@
     public Map<Object, String> getWeekInPgPersonNum() throws Exception {
         Map<Object, String> resultMap = new HashMap<Object, String>();
         String msg = "";
+        String code="0";
         int inNum = 0;
         try {
             inNum = pgInPgStatusManager.getWeekInPgPersonNum();
+            code="200";
             msg = "本周入廊人员次数获取成功";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "本周入廊人员次数获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", String.valueOf(inNum));
 
@@ -97,19 +101,22 @@
     public Map<String, Object> getDayInPgStatistic() throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<>();
         try {
             pgInPgInfoDtoList = pgInPgStatusManager.getPgInPersonListByDay();
             if (pgInPgInfoDtoList == null)
                 msg = "信息获取失败";
-            else
+            else {
+                code="200";
                 msg = "信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "信息获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
         return resultMap;
@@ -124,18 +131,23 @@
     public Map<String, Object> getTodayInPgInfo() throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
 
         List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<PgInPgInfoDto>();
         try {
             pgInPgInfoDtoList = pgInPgStatusManager.getTodayInPgInfo();
             if(pgInPgInfoDtoList!=null||pgInPgInfoDtoList.size()!=0)
+            {
+                code="200";
                 msg = "信息获取成功";
+            }
             else
                 msg="当天没有入廊人员信息";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
 
@@ -149,18 +161,22 @@
     public Map<String, Object> getAlarmNum(@FormParam("isDevFault") String isDevFault) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         int num = 0;
 
         try {
             if(isDevFault!=null){
                 num = pgAlarmManager.getAlarmNum(isDevFault);
-                msg = "报警数量获取成功";}
+                msg = "报警数量获取成功";
+                code="200";
+            }
             else
                 msg="请输入统计参数";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警数量统计失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", num);
 
@@ -176,16 +192,18 @@
     public Map<Object, String> getMonthAlarmNum(@FormParam("isDevFault") String isDevFault) throws Exception {
         Map<Object, String> resultMap = new HashMap<Object, String>();
         String msg = "";
+        String code="0";
         int inNum = 0;
 
         try {
-                inNum = pgAlarmManager.getMonthAlarmNum(isDevFault);
-                msg = "报警次数获取成功";
+            inNum = pgAlarmManager.getMonthAlarmNum(isDevFault);
+            code="200";
+            msg = "报警次数获取成功";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警次数获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", String.valueOf(inNum));
 
@@ -201,15 +219,17 @@
     public Map<Object, String> getWeekAlarmNum(@FormParam("isDevFault") String isDevFault) throws Exception {
         Map<Object, String> resultMap = new HashMap<Object, String>();
         String msg = "";
+        String code="0";
         int inNum = 0;
         try {
             inNum = pgAlarmManager.getWeekAlarmNum(isDevFault);
+            code="200";
             msg = "报警次数获取成功";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警次数获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", String.valueOf(inNum));
 
@@ -225,14 +245,17 @@
     public Map<String, Object> getDayAlarmStatistic() throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgAlarmTjDto> pgAlarmTjDtoList = new ArrayList<PgAlarmTjDto>();
         try {
             pgAlarmTjDtoList = pgAlarmManager.getDayAlarmStatistic();
             if (pgAlarmTjDtoList == null)
                 msg = "信息获取失败";
-            else
+            else {
+                code="200";
                 msg = "信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "信息获取失败";
@@ -252,9 +275,11 @@
     public Map<String, Object> getAlarmList(@FormParam("isDevFault") String isDevFault) throws Exception{
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         List<PgAlarmDto> pgAlarmDtoList=new ArrayList<>();
         try{
             pgAlarmDtoList=pgAlarmManager.getAlarmList(isDevFault);
+            code="200";
             msg="信息获取成功";
         }
         catch(Exception e)
@@ -262,6 +287,7 @@
             e.printStackTrace();
             msg="信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAlarmDtoList);
 
@@ -278,17 +304,19 @@
     public Map<String,Object> getConstructionNum() throws Exception{
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgConstructionTypeNumStatisticDto> pgConstructionTypeNumDtoList=new ArrayList<PgConstructionTypeNumStatisticDto>();
         try{
             pgConstructionTypeNumDtoList=pgConstructionManager.getConstructionNum();
             msg="施工数量获取成功";
+            code="200";
         }
         catch(Exception e)
         {
             e.printStackTrace();
             msg="施工数量统计";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionTypeNumDtoList);
 
@@ -302,21 +330,25 @@
     @Path("getConstructionToday")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> getConstructionToday() throws Exception{
-        Map<String,Object > resultMap = new HashMap<String,Object>();
+        Map<String,Object > resultMap = new HashMap<>();
         String msg = "";
-        List<PgConstructionDto> pgConstructionDtoList=new ArrayList<PgConstructionDto>();
+        String code="0";
+        List<PgConstructionDto> pgConstructionDtoList=new ArrayList<>();
         try {
             pgConstructionDtoList = pgConstructionManager.getConstructionToday();
-            if (pgConstructionDtoList == null&&pgConstructionDtoList.size()==0)
+            if (pgConstructionDtoList == null && pgConstructionDtoList.size() == 0)
                 msg = "不存在施工信息";
-            else
+            else {
+                code="200";
                 msg = "施工信息获取成功";
+            }
         }
         catch(Exception e)
         {
             e.printStackTrace();
             msg="施工信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java b/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java
index d3c10d4..31ffcfc 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java
@@ -48,6 +48,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 
         try {
@@ -66,9 +67,9 @@
                 pgPartition.setMaterial(material);
                 pgPartition.setActive(1);
 
-                logger.info("成功保存");
                 pgPartitionManager.save(pgPartition);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
         } catch (Exception e) {
@@ -76,9 +77,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
         return resultMap;
     }
     /*
@@ -100,6 +101,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         PgPartition partition = new PgPartition();
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
@@ -122,6 +124,7 @@
 
                 pgPartitionManager.save(pgPartition);
                 result = "true";
+                code="200";
                 msg = "编辑成功";
             }
 
@@ -131,8 +134,10 @@
             e.printStackTrace();
         }
 
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
+
         return resultMap;
     }
 
@@ -147,7 +152,8 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
-        String result="false";
+        String result="";
+        String code="0";
 
         try {
             PgPartition pgPartition=pgPartitionManager.get(Long.valueOf(id));
@@ -161,12 +167,14 @@
                 pgPartitionManager.save(pgPartition);
                 msg="分区删除成功";
                 result="true";
+                code="200";
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="分区删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -181,14 +189,17 @@
     public Map<String, Object> getPartition() throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgPartitionDto> pgPartitionDtoList = new ArrayList<PgPartitionDto>();
         try {
             pgPartitionDtoList = pgPartitionManager.getPgPartitionDtoList();
+            code="200";
             msg = "获取成功";
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgPartitionDtoList);
         return resultMap;
@@ -203,14 +214,17 @@
     public Map<String, Object> getPartitionListByName(@FormParam("parName") String parName) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgPartitionDto> pgPartitionDtoList = new ArrayList<PgPartitionDto>();
         try {
             pgPartitionDtoList = pgPartitionManager.getPartitionByName(parName);
+            code="200";
             msg = "获取成功";
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgPartitionDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java b/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java
index 883adf9..cf81b72 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java
@@ -37,6 +37,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
         PgRoad pgRoad=pgRoadManager.getPgRoadByName(road);
         try {
             PgPileAcu pgPileAcu=new PgPileAcu();
@@ -49,6 +50,7 @@
             pgPileAcu.setActive(true);
 
             pgPileAcuManager.save(pgPileAcu);
+            code="200";
             result="true";
             msg="保存成功";
         } catch (Exception e) {
@@ -56,9 +58,10 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
+
         return resultMap;
     }
 
@@ -73,6 +76,7 @@
 
         String result="";
         String msg="";
+        String code="0";
         try{
             PgPileAcu pgPileAcu=pgPileAcuManager.get(id);
             if(pgPileAcu==null){
@@ -83,7 +87,7 @@
             {
                 pgPileAcu.setActive(false);
                 pgPileAcuManager.save(pgPileAcu);
-
+                code="200";
                 result="true";
                 msg="桩号删除成功";
             }
@@ -94,8 +98,9 @@
             ex.printStackTrace();
         }
 
-        resultMap.put("result",result);
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
+        resultMap.put("result",result);
 
         return resultMap;
     }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPileRs.java b/src/main/java/com/casic/PgInterface/rs/PgPileRs.java
index cf62954..c9999ac 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgPileRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgPileRs.java
@@ -33,6 +33,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             PgPile pgPile=new PgPile();
@@ -40,6 +41,7 @@
             pgPile.setActive(true);
 
             pgPileManager.save(pgPile);
+            code="200";
             result="true";
             msg="保存成功";
         } catch (Exception e) {
@@ -47,9 +49,10 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
+
         return resultMap;
     }
 
@@ -64,9 +67,10 @@
         Map<String,Object> resultMap=new HashMap<>();
         List<PgPileDTO> pgPileDTOList=new ArrayList<>();
         String msg="";
+        String code="0";
         try{
             pgPileDTOList=pgPileManager.getPgPileDTOList();
-
+            code="200";
             msg="获取成功";
         }
         catch(Exception ex){
@@ -74,8 +78,9 @@
             msg="获取成失败";
             ex.printStackTrace();
         }
-        resultMap.put("result",pgPileDTOList);
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
+        resultMap.put("result",pgPileDTOList);
 
         return resultMap;
     }
@@ -91,6 +96,7 @@
 
         String result="";
         String msg="";
+        String code="0";
         try{
             PgPile pgPile=pgPileManager.get(id);
             if(pgPile==null){
@@ -101,7 +107,7 @@
             {
                 pgPile.setActive(false);
                 pgPileManager.save(pgPile);
-
+                code="200";
                 result="true";
                 msg="桩号删除成功";
             }
@@ -111,9 +117,9 @@
             msg="桩号删除失败";
             ex.printStackTrace();
         }
-
-        resultMap.put("result",result);
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
+        resultMap.put("result",result);
 
         return resultMap;
     }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
index 6ee63ff..63b5597 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
@@ -53,10 +53,12 @@
         try {
                resultMap = pgPipeLineManager.addPipeLine(lineCode,lineType,secRow,secColumn,pileAcuList);
                resultMap.put("msg","提交成功");
+               resultMap.put("code","200");
                resultMap.put("result","true");
 
         } catch (Exception e) {
             e.printStackTrace();
+            resultMap.put("code","0");
             resultMap.put("result","false");
             resultMap.put("msg","提交失败");
             return  resultMap;
@@ -74,14 +76,17 @@
     public Map<String, Object> getPipeLineByLineType(@FormParam("lineType") String lineType) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgPipeLineDto> pgPipeLineDtoList=new ArrayList<PgPipeLineDto>();
         try {
             pgPipeLineDtoList = pgPipeLineManager.getPipeLineByLineType(lineType);
+            code="200";
             msg = "获取成功";
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgPipeLineDtoList);
         return resultMap;
@@ -96,6 +101,7 @@
     public Map<String, Object> getPipeLineByName(@FormParam("lineCode") String lineCode) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         PgPipeLineDto pgPipeLineDto=null;
         try {
             PgPipeLine pgPipeLine = pgPipeLineManager.getPipeLineBylineName(lineCode);
@@ -103,12 +109,14 @@
                 msg="不存在："+lineCode;
             else {
                 pgPipeLineDto = new PgPipeLineDto(pgPipeLine);
+                code="200";
                 msg = "获取成功";
             }
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgPipeLineDto);
         return resultMap;
@@ -123,15 +131,18 @@
     public Map<String,Object> getPipeLengthStatic()throws Exception{
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         List<PgPipeLineLengthStatic> pgPipeLineLengthStaticList=new ArrayList<PgPipeLineLengthStatic>();
         try {
             pgPipeLineLengthStaticList = pgPipeLineManager.getPipeLengthByName();
+            code="200";
             msg="管线长度获取成功";
         }catch(Exception e)
         {
             e.printStackTrace();
             msg="管线长度统计失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgPipeLineLengthStaticList);
 
@@ -147,14 +158,17 @@
     public Map<String, Object> getPipeLineType() throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgPipeLineTypeDto> pgPipeLineTypeDtoList=new ArrayList<PgPipeLineTypeDto>();
         try {
             pgPipeLineTypeDtoList = pgPipeLineManager.getPipeType();
+            code="200";
             msg = "获取成功";
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgPipeLineTypeDtoList);
         return resultMap;
@@ -170,20 +184,24 @@
         Map<String,Object> resultMap=new HashMap<String, Object>();
 
         String msg="";
+        String code="0";
         List<PgPipeLineTypeNumDto> pgPipeLineTypeNumDtoList=new ArrayList<PgPipeLineTypeNumDto>();
 
-        try{
-            pgPipeLineTypeNumDtoList=pgPipeLineManager.getPipeTypeNum();
+        try {
+            pgPipeLineTypeNumDtoList = pgPipeLineManager.getPipeTypeNum();
 
-            if(pgPipeLineTypeNumDtoList==null)
-                msg="不存在管线类型占比";
-            else
-                msg="管线占比获取成功";
+            if (pgPipeLineTypeNumDtoList == null)
+                msg = "不存在管线类型占比";
+            else {
+                code="200";
+                msg = "管线占比获取成功";
+            }
         }
         catch (Exception e){
             msg="管线占比数量获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgPipeLineTypeNumDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java
index 672b376..7042994 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java
@@ -43,17 +43,21 @@
     public Map<String,Object> getReservePlan() {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgReservePlanDto> pgReservePlanDtoList = new ArrayList<PgReservePlanDto>();
         try {
             pgReservePlanDtoList = pgReservePlanManager.getPgReservePlanDto();
             if (pgReservePlanDtoList == null)
                 msg = "不存在预案信息";
-            else
+            else {
+                code="200";
                 msg = "预案信息获取成功";
-        } catch (Exception e) {
+            }
+        }catch (Exception e) {
             e.printStackTrace();
             msg = "预案信息获取是失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgReservePlanDtoList);
         return resultMap;
@@ -66,6 +70,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
 
         String msg = "";
+        String code="0";
         ResponseEntity<byte[]> path = null;
         try {
             PgReservePlan pgReservePlan = pgReservePlanManager.get(Long.valueOf(id));
@@ -73,15 +78,17 @@
 
             if (path == null)
                 msg = "不存在该文档";
-            else
+            else {
+                code="200";
                 msg = "下载成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "下载失败";
         }
-
-        resultMap.put("result", path.getBody());
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", path.getBody());
         return resultMap;
     }
     /*
@@ -99,6 +106,7 @@
         Map<String,Object> resultMap=new HashMap<String, Object>();
         String msg="";
         String result="";
+        String code="0";
 
         try {
             PgReservePlan pgReservePlan = new PgReservePlan();
@@ -124,6 +132,7 @@
                 pgReservePlanManager.save(pgReservePlan);
                 msg = "新增成功";
                 result = "true";
+                code="200";
             }
         }
         catch(Exception e)
@@ -133,6 +142,7 @@
             result="false";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -152,6 +162,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             PgReservePlan pgReservePlan=pgReservePlanManager.get(Long.valueOf(id));
@@ -177,6 +188,7 @@
 
                     pgReservePlanManager.save(pgReservePlan);
 
+                    code="200";
                     result = "true";
                     msg = "编辑成功";
                 }
@@ -187,6 +199,7 @@
             msg = "编辑失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -201,6 +214,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
         String result="";
+        String code="0";
 
         try{
 
@@ -214,6 +228,7 @@
                 pgReservePlan.setActive(0);;
                 pgReservePlanManager.save(pgReservePlan);
                 result="true";
+                code="200";
                 msg="删除成功";
             }
         }
@@ -224,6 +239,7 @@
             result="false";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java b/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java
index 8f049c8..3c48a8d 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java
@@ -42,19 +42,22 @@
         Map<String,Object> resultMap=new HashMap<String, Object>();
 
         String msg="";
+        String code="0";
         List<PgRoadDto> pgRoadDtoList=new ArrayList<PgRoadDto>();
-        try{
+        try {
             pgRoadDtoList = pgRoadManager.getAllRoad();
             if (pgRoadDtoList.size() == 0)
                 msg = "没有道路信息";
-            else
+            else {
+                code="200";
                 msg = "道路信息获取成功";
+            }
         }
         catch(Exception e){
             msg="道路信息获取失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgRoadDtoList);
 
@@ -71,6 +74,7 @@
         Map<String,Object> resultMap=new HashMap<String, Object>();
         String msg="";
         String result="";
+        String code="0";
 
         try{
             PgRoad pgRoad=new PgRoad();
@@ -78,7 +82,7 @@
             pgRoad.setActive(1);
 
             pgRoadManager.save(pgRoad);
-
+            code="200";
             msg="新增道路成功";
             result="true";
         }
@@ -87,7 +91,7 @@
             result="true";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -107,6 +111,7 @@
 
         String msg="";
         String result="";
+        String code="0";
 
         try {
             PgRoad pgRoad=pgRoadManager.get(Long.valueOf(id));
@@ -123,6 +128,7 @@
                 pgRoadManager.save(pgRoad);
                 msg="道路信息保存成功";
                 result="true";
+                code="200";
             }
         }
         catch(Exception e){
@@ -130,6 +136,7 @@
             result="false";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -147,6 +154,7 @@
 
         String msg="";
         String result="";
+        String code="0";
         PgRoad pgRoad=null;
 
         try{
@@ -159,6 +167,7 @@
                 pgRoad.setActive(0);
                 pgRoadManager.save(pgRoad);
                 msg="道路删除成功";
+                code="200";
                 result="true";
             }
         }
@@ -168,6 +177,7 @@
             e.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -184,26 +194,29 @@
         Map<String,Object> resultMap=new HashMap<String, Object>();
         String msg="";
         String result="";
+        String code="0";
 
         List<PgPartitionDto> pgPartitionDtoList=null;
         try{
             PgRoad pgRoad=pgRoadManager.getPgRoadByName(roadName);
             if(pgRoad==null)
                 msg="不存在道路信息";
-            else
-            {
-                pgPartitionDtoList=pgPartitionManager.getPgPartitonDtoByRoad(pgRoad);
-                if(pgPartitionDtoList==null||pgPartitionDtoList.size()==0)
-                    msg="该道路没有分区信息";
-                else
-                    msg="分区信息获取成功";
+            else {
+                pgPartitionDtoList = pgPartitionManager.getPgPartitonDtoByRoad(pgRoad);
+                if (pgPartitionDtoList == null || pgPartitionDtoList.size() == 0)
+                    msg = "该道路没有分区信息";
+                else {
+                    code="200";
+                    msg = "分区信息获取成功";
+                }
             }
         }
         catch (Exception e)
         {
+            e.printStackTrace();
             msg="分区信息获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgPartitionDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java b/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java
index 90d709a..7a713bf 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java
@@ -42,17 +42,21 @@
     public Map<String,Object> getRoleList() {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgRoleDto> pgRoleDtoList = new ArrayList<PgRoleDto>();
         try {
             pgRoleDtoList = pgRoleManager.getPgRoleDtoList();
             if (pgRoleDtoList == null)
                 msg = "不存在角色信息";
-            else
+            else {
+                code="200";
                 msg = "角色信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "角色信息获取是失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgRoleDtoList);
         return resultMap;
@@ -69,6 +73,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try{
             PgAuthority pgAuthority=pgAuthorityManager.getAuthorityByAuthority(authority);
@@ -79,6 +84,7 @@
 
             pgRoleManager.save(pgRole);
             msg="用户角色保存成功";
+            code="200";
             result="true";
         }
         catch(Exception e) {
@@ -86,6 +92,7 @@
             msg = "新增角色失败";
             result = "false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -104,6 +111,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         try {
             PgRole pgRole = pgRoleManager.get(Long.valueOf(id));
 
@@ -112,6 +120,7 @@
             pgRole.setPgAuthorityId(pgAuthority);
             pgRoleManager.save(pgRole);
 
+            code="200";
             msg="角色保存成功";
             result="true";
         }
@@ -122,6 +131,7 @@
             result="false";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -138,7 +148,8 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
-        String result="false";
+        String result="";
+        String code="0";
 
         try {
             PgRole pgRole= pgRoleManager.get(Long.valueOf(id));
@@ -152,12 +163,14 @@
                 pgRoleManager.save(pgRole);
                 msg="删除角色成功";
                 result="true";
+                code="200";
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="删除角色失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java b/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java
index 0e413b8..d146811 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java
@@ -38,6 +38,7 @@
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
         String result="";
+        String code="0";
         PgRoad pgRoad=pgRoadManager.getPgRoadByName(road);
 
         try{
@@ -55,13 +56,14 @@
             pgSectionManager.save(pgSection);
             msg="截面信息保存成功";
             result="true";
+            code="200";
         }
         catch(Exception ex){
             msg="界面信息保存失败";
             result="false";
             ex.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -77,6 +79,7 @@
 
         String msg="";
         String result="";
+        String code="0";
 
         try{
             PgSection pgSection=pgSectionManager.get(id);
@@ -84,6 +87,7 @@
             pgSection.setActive(false);
             pgSectionManager.save(pgSection);
 
+            code="200";
             msg="截面删除成功";
             result="true";
         }
@@ -92,7 +96,7 @@
             result="false";
             ex.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -107,16 +111,19 @@
         Map<String,Object> resultMap=new HashMap<>();
         List<PgLineType> pgLineTypeList=new ArrayList<>();
         String msg="";
+        String code="0";
 
         try{
             pgLineTypeList=pgSectionManager.getLineType();
             msg="获取成功";
+            code="200";
         }
         catch(Exception ex){
             ex.printStackTrace();
             msg="获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgLineTypeList);
 

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 25ded8a..283d7ab 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,20 +7,56 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" 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/construction/manager/PgCsDocumentManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/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/manager/PgAlarmManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/~$说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/~$说明20191207.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.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$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/接口说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明20191207.docx" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
@@ -51,7 +87,7 @@
         <counts>
           <entry key="class" value="4" />
           <entry key="iml" value="2" />
-          <entry key="java" value="707" />
+          <entry key="java" value="820" />
           <entry key="properties" value="14" />
           <entry key="xml" value="7" />
         </counts>
@@ -60,7 +96,7 @@
         <counts>
           <entry key="CLASS" value="4" />
           <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="707" />
+          <entry key="JAVA" value="820" />
           <entry key="Properties" value="14" />
           <entry key="XML" value="7" />
         </counts>
@@ -68,32 +104,32 @@
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
           <entry key="dummy" value="38" />
-          <entry key="java" value="30161" />
+          <entry key="java" value="40859" />
           <entry key="properties" value="100" />
-          <entry key="txt" value="176" />
+          <entry key="txt" value="186" />
           <entry key="xml" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="30161" />
-          <entry key="PLAIN_TEXT" value="214" />
+          <entry key="JAVA" value="40859" />
+          <entry key="PLAIN_TEXT" value="224" />
           <entry key="Properties" value="100" />
           <entry key="XML" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="48" />
+          <entry key="project.closed" value="51" />
           <entry key="project.open.time.1" value="5" />
           <entry key="project.open.time.12" value="2" />
           <entry key="project.open.time.13" value="1" />
           <entry key="project.open.time.15" value="1" />
           <entry key="project.open.time.16" value="1" />
           <entry key="project.open.time.17" value="1" />
-          <entry key="project.open.time.2" value="1" />
+          <entry key="project.open.time.2" value="2" />
           <entry key="project.open.time.20" value="1" />
-          <entry key="project.open.time.23" value="1" />
+          <entry key="project.open.time.23" value="2" />
           <entry key="project.open.time.24" value="2" />
           <entry key="project.open.time.251" value="1" />
           <entry key="project.open.time.27" value="2" />
@@ -106,8 +142,8 @@
           <entry key="project.open.time.36" value="1" />
           <entry key="project.open.time.37" value="1" />
           <entry key="project.open.time.39" value="2" />
-          <entry key="project.open.time.4" value="2" />
-          <entry key="project.open.time.40" value="1" />
+          <entry key="project.open.time.4" value="3" />
+          <entry key="project.open.time.40" value="2" />
           <entry key="project.open.time.41" value="2" />
           <entry key="project.open.time.42" value="2" />
           <entry key="project.open.time.43" value="2" />
@@ -122,23 +158,25 @@
           <entry key="project.open.time.6" value="3" />
           <entry key="project.open.time.63" value="2" />
           <entry key="project.open.time.64" value="1" />
+          <entry key="project.open.time.66" value="1" />
           <entry key="project.open.time.71" value="2" />
+          <entry key="project.open.time.74" value="1" />
           <entry key="project.open.time.76" value="1" />
           <entry key="project.open.time.8" value="2" />
           <entry key="project.open.time.9" value="1" />
           <entry key="project.open.time.97" value="1" />
-          <entry key="project.opened" value="78" />
+          <entry key="project.opened" value="84" />
         </counts>
       </usages-collector>
     </session>
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+            <state relative-caret-position="396">
+              <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
               <folding>
                 <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
                 <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -147,73 +185,6 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <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="99">
-              <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-              <folding>
-                <element signature="imports" expanded="true" />
-                <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-1170">
-              <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state>
-              <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
-              <folding>
-                <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-                <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="true">
-        <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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-              <folding>
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-                <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>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <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="352">
-              <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -225,18 +196,9 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>inCriteria</find>
-      <find>getPgPlanResulList</find>
-      <find>getPileAcuListByPileAcuStr</find>
-      <find>distinct</find>
-      <find>order</find>
-      <find>canPlanLine</find>
-      <find>isExistLine</find>
-      <find>getPlanResult</find>
       <find>pgPipeLine</find>
       <find>getPipeLineBylineName</find>
       <find>StringU</find>
-      <find>getAllAlarm</find>
       <find>getAlarmList</find>
       <find>getPgInPersonListByDay</find>
       <find>getDayInPgStatistic</find>
@@ -254,7 +216,16 @@
       <find>getPgContructionByNameOrType</find>
       <find>&quot;&quot;,&quot;&quot;,</find>
       <find>getPgContructionDtoByNameOrType</find>
+      <find>addConstruction</find>
+      <find>getPgLineAcuHole</find>
+      <find>getPlanResult</find>
       <find>getConstruction</find>
+      <find>addPipeLine</find>
+      <find>未找到入廊数据</find>
+      <find>getCurrentHoleByAcu</find>
+      <find>getAllAlarm</find>
+      <find>getPgDeviceDtoListByPartition</find>
+      <find>getPgDeviceByDevType</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -263,57 +234,57 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlan.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileHoleManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/planData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/PlanData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
       </list>
     </option>
   </component>
@@ -359,7 +330,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -421,53 +391,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="dto" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="manager" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -479,29 +402,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="rs" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -516,6 +416,7 @@
         </subPane>
       </pane>
       <pane id="Scope" />
+      <pane id="PackagesPane" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -710,7 +611,13 @@
       <workItem from="1574902733573" duration="1829000" />
       <workItem from="1574998240004" duration="7016000" />
       <workItem from="1575247959683" duration="6997000" />
-      <workItem from="1575704345590" duration="40473000" />
+      <workItem from="1575704345590" duration="69381000" />
+      <workItem from="1575869479666" duration="721000" />
+      <workItem from="1575947104878" duration="6101000" />
+      <workItem from="1576128264436" duration="3347000" />
+      <workItem from="1576208571543" duration="22000" />
+      <workItem from="1576227513917" duration="862000" />
+      <workItem from="1576293721220" duration="18246000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -817,11 +724,18 @@
       <option name="project" value="LOCAL" />
       <updated>1575775489149</updated>
     </task>
-    <option name="localTasksCounter" value="16" />
+    <task id="LOCAL-00016" summary="整改施工信息">
+      <created>1575791780774</created>
+      <option name="number" value="00016" />
+      <option name="presentableId" value="LOCAL-00016" />
+      <option name="project" value="LOCAL" />
+      <updated>1575791780774</updated>
+    </task>
+    <option name="localTasksCounter" value="17" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="452131000" />
+    <option name="totallyTimeSpent" value="510338000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -834,9 +748,8 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
-    <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.24205749" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2647504" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -847,7 +760,7 @@
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.3295082" />
       <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.4819672" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.65737706" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.3295082" />
@@ -939,7 +852,8 @@
     <MESSAGE value="重新设计智能规划部分" />
     <MESSAGE value="完成智能规划对接" />
     <MESSAGE value="修改报警统计" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改报警统计" />
+    <MESSAGE value="整改施工信息" />
+    <option name="LAST_COMMIT_MESSAGE" value="整改施工信息" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -951,16 +865,10 @@
           <option name="timeStamp" value="3" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java</url>
-          <line>69</line>
+          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java</url>
+          <line>40</line>
           <properties />
-          <option name="timeStamp" value="21" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java</url>
-          <line>96</line>
-          <properties />
-          <option name="timeStamp" value="38" />
+          <option name="timeStamp" value="122" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
@@ -970,394 +878,452 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <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="2068">
-          <caret line="154" column="35" selection-start-line="154" selection-start-column="35" selection-end-line="154" selection-end-column="35" />
-        </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="3300">
-          <caret line="297" column="22" selection-start-line="297" selection-start-column="22" selection-end-line="297" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/StringUtils.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
-          <caret line="13" column="48" lean-forward="true" selection-start-line="13" selection-start-column="48" selection-end-line="13" selection-end-column="48" />
+          <caret line="11" column="5" selection-start-line="11" selection-start-column="5" selection-end-line="11" selection-end-column="5" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="78" lean-forward="true" selection-start-line="78" selection-end-line="78" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="616">
-          <caret line="41" column="1" selection-start-line="41" selection-start-column="1" selection-end-line="41" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="110">
-          <caret line="12" column="23" selection-start-line="12" selection-start-column="23" selection-end-line="12" selection-end-column="23" />
+        <state relative-caret-position="516">
+          <caret line="114" column="12" selection-start-line="114" selection-start-column="12" selection-end-line="114" selection-end-column="12" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="164">
-          <caret line="56" lean-forward="true" selection-start-line="56" selection-end-line="56" />
+        <state relative-caret-position="418">
+          <caret line="33" column="44" selection-start-line="33" selection-start-column="44" selection-end-line="33" selection-end-column="44" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="258">
-          <caret line="27" column="12" lean-forward="true" selection-start-line="27" selection-start-column="12" selection-end-line="27" selection-end-column="12" />
+        <state relative-caret-position="132">
+          <caret line="11" column="20" lean-forward="true" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="20" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.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="-12">
-          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        <state relative-caret-position="516">
+          <caret line="142" column="54" selection-start-line="142" selection-start-column="54" selection-end-line="142" selection-end-column="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="858">
-          <caret line="55" column="27" lean-forward="true" selection-start-line="55" selection-start-column="27" selection-end-line="55" selection-end-column="27" />
+        <state relative-caret-position="66">
+          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="58">
+          <caret line="18" column="28" selection-start-line="18" selection-start-column="19" selection-end-line="18" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="305">
+          <caret line="24" column="31" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="714">
+          <caret line="58" column="5" lean-forward="true" selection-start-line="58" selection-start-column="5" selection-end-line="58" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="924">
+          <caret line="134" column="92" selection-start-line="134" selection-start-column="92" selection-end-line="134" selection-end-column="92" />
+          <folding>
+            <element signature="method#linkDevice#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkPartitionCamera#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkReservePlan#0;class#PgAlarmLinkRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1066">
+          <caret line="90" lean-forward="true" selection-start-line="90" selection-end-line="90" />
+          <folding>
+            <element signature="method#getTjResultByAlarmType#0;class#PgAlarmTjRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="946">
+          <caret line="148" column="11" lean-forward="true" selection-start-line="148" selection-start-column="11" selection-end-line="148" selection-end-column="11" />
+          <folding>
+            <element signature="method#getAlarmTypeList#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#addAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#editAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#deleteAlarmType#0;class#PgAlarmTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="208">
+          <caret line="46" column="23" lean-forward="true" selection-start-line="46" selection-start-column="23" selection-end-line="46" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="113" column="9" lean-forward="true" selection-start-line="113" selection-start-column="9" selection-end-line="113" selection-end-column="9" />
+          <folding>
+            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
+            <element signature="method#getNewestCh4InfoByDev#0;class#PgCh4Rs#0" />
+            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="145" column="6" lean-forward="true" selection-start-line="145" selection-start-column="6" selection-end-line="145" selection-end-column="6" />
+          <folding>
+            <element signature="method#addAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#editAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#deleteAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#getAuthorityList#0;class#PgAuthorityRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="58" column="1" lean-forward="true" selection-start-line="58" selection-start-column="1" selection-end-line="58" selection-end-column="1" />
+          <folding>
+            <element signature="method#getPgAssetPlanList#0;class#PgAssetPlanRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="370">
+          <caret line="371" column="66" selection-start-line="371" selection-start-column="66" selection-end-line="371" selection-end-column="66" />
+          <folding>
+            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#searchConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionDev#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="139" column="13" lean-forward="true" selection-start-line="139" selection-start-column="13" selection-end-line="139" selection-end-column="13" />
+          <folding>
+            <element signature="method#getCoInfoByDevAndDate#0;class#PgCoRs#0" />
+            <element signature="method#getNewestCoInfoByDev#0;class#PgCoRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="540">
+          <caret line="223" column="5" lean-forward="true" selection-start-line="223" selection-start-column="5" selection-end-line="223" selection-end-column="5" />
+          <folding>
+            <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="682">
+          <caret line="100" lean-forward="true" selection-start-line="100" selection-end-line="100" />
+          <folding>
+            <element signature="method#getDeviceTpeyList#0;class#PgDeviceTypeRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="377">
+          <caret line="225" column="35" selection-start-line="225" selection-start-column="35" selection-end-line="225" selection-end-column="35" />
+          <folding>
+            <element signature="method#addEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#addEquipment#1;class#PgEquipmentRs#0" />
+            <element signature="method#getEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#deleteEquipment#0;class#PgEquipmentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="406">
+          <caret line="109" lean-forward="true" selection-start-line="109" selection-end-line="109" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="154">
+          <caret line="28" column="19" selection-start-line="28" selection-start-column="19" selection-end-line="28" selection-end-column="19" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="748">
-          <caret line="49" column="5" lean-forward="true" selection-start-line="49" selection-start-column="5" selection-end-line="49" selection-end-column="5" />
+        <state relative-caret-position="296">
+          <caret line="161" column="35" selection-start-line="161" selection-start-column="35" selection-end-line="161" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="384">
+          <caret line="99" column="5" lean-forward="true" selection-start-line="99" selection-start-column="5" selection-end-line="99" selection-end-column="5" />
+        </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="362">
+          <caret line="340" column="35" selection-start-line="340" selection-start-column="35" selection-end-line="340" selection-end-column="35" />
+          <folding>
+            <element signature="method#addInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPersonInPg#0;class#PgInPgPersonRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-606">
+          <caret line="76" column="20" lean-forward="true" selection-start-line="76" selection-start-column="20" selection-end-line="76" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="65" column="35" selection-start-line="65" selection-start-column="35" selection-end-line="65" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="101" column="35" selection-start-line="101" selection-start-column="35" selection-end-line="101" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="84" column="35" selection-start-line="84" selection-start-column="35" selection-end-line="84" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="59" lean-forward="true" selection-start-line="59" selection-end-line="59" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="60" column="1" lean-forward="true" selection-start-line="60" selection-start-column="1" selection-end-line="60" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="145" column="35" selection-start-line="145" selection-start-column="35" selection-end-line="145" selection-end-column="35" />
+        </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="274">
+          <caret line="350" column="35" selection-start-line="350" selection-start-column="35" selection-end-line="350" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="121" column="39" selection-start-line="121" selection-start-column="39" selection-end-line="121" selection-end-column="39" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="28" column="8" lean-forward="true" selection-start-line="28" selection-start-column="8" selection-end-line="28" selection-end-column="8" />
+        <state relative-caret-position="340">
+          <caret line="103" selection-start-line="103" selection-end-line="103" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="226" column="35" selection-start-line="226" selection-start-column="35" selection-end-line="226" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="203" column="35" selection-start-line="203" selection-start-column="35" selection-end-line="203" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="241" column="35" selection-start-line="241" selection-start-column="35" selection-end-line="241" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="225" column="1" lean-forward="true" selection-start-line="225" selection-start-column="1" selection-end-line="225" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="176" column="5" lean-forward="true" selection-start-line="176" selection-start-column="5" selection-end-line="176" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="178" column="35" lean-forward="true" selection-start-line="178" selection-start-column="35" selection-end-line="178" selection-end-column="35" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="516">
-          <caret line="94" column="53" selection-start-line="94" selection-start-column="53" selection-end-line="94" selection-end-column="53" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="814">
-          <caret line="52" column="9" lean-forward="true" selection-start-line="52" selection-start-column="9" selection-end-line="52" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="182">
-          <caret line="58" column="12" lean-forward="true" selection-start-line="58" selection-start-column="12" selection-end-line="58" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="34" lean-forward="true" selection-start-line="34" selection-end-line="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="32" lean-forward="true" selection-start-line="32" selection-end-line="32" />
-          <folding>
-            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
-            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="185">
-          <caret line="63" column="13" selection-start-line="63" selection-start-column="13" selection-end-line="63" selection-end-column="13" />
-          <folding>
-            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
-            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
-            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="e#6319#6324#0" />
-            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
-          </folding>
+          <caret line="240" lean-forward="true" selection-start-line="240" selection-end-line="240" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
-          <caret line="58" column="28" lean-forward="true" selection-start-line="58" selection-start-column="28" selection-end-line="58" selection-end-column="28" />
-          <folding>
-            <element signature="method#addTempHumData#0;class#PgTempHumRs#0" />
-          </folding>
+        <state relative-caret-position="340">
+          <caret line="148" column="34" selection-start-line="148" selection-start-column="34" selection-end-line="148" selection-end-column="34" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
+        <state relative-caret-position="458">
+          <caret line="99" column="35" selection-start-line="99" selection-start-column="35" selection-end-line="99" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+        <state relative-caret-position="384">
+          <caret line="145" column="32" lean-forward="true" selection-start-line="145" selection-start-column="32" selection-end-line="145" selection-end-column="32" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="414">
-          <caret line="22" column="46" lean-forward="true" selection-start-line="22" selection-start-column="46" selection-end-line="22" selection-end-column="46" />
-        </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="396">
-          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" column="83" selection-start-line="11" selection-start-column="83" selection-end-line="11" selection-end-column="83" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="26">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
-          <folding>
-            <element signature="method#getPgInPgStatusByPerson#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNumByName#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNum#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPersonListByDay#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPgStatusByPgInPgPerson#0;class#PgInPgStatusManager#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="44">
-          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-12">
-          <caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="87" lean-forward="true" selection-start-line="87" selection-end-line="87" />
-          <folding>
-            <element signature="method#getConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#addConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#deleteConstructionType#0;class#PgConstructionTypeRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
-          <folding>
-            <element signature="method#getConstructionTypeByType#0;class#PgConstructionTypeManager#0" />
-            <element signature="method#getAllConstructionTypeDto#0;class#PgConstructionTypeManager#0" />
-          </folding>
-        </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="145">
-          <caret line="258" column="9" lean-forward="true" selection-start-line="258" selection-start-column="9" selection-end-line="258" selection-end-column="9" />
-          <folding>
-            <element signature="method#getMonthInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayInPgStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgOverViewRs#0" />
-            <element signature="method#getAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getMonthAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayAlarmStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgOverViewRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="103">
-          <caret line="105" column="50" lean-forward="true" selection-start-line="105" selection-start-column="50" selection-end-line="105" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateBasicDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="99">
-          <caret line="125" selection-start-line="125" selection-end-line="125" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="190">
-          <caret line="24" column="35" lean-forward="true" selection-start-line="24" selection-start-column="35" selection-end-line="24" selection-end-column="35" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="436">
-          <caret line="24" lean-forward="true" selection-start-line="24" selection-end-line="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" lean-forward="true" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="300">
-          <caret line="34" column="31" lean-forward="true" selection-start-line="34" selection-start-column="31" selection-end-line="34" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="42" column="13" lean-forward="true" selection-start-line="42" selection-start-column="13" selection-end-line="42" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="120" column="72" lean-forward="true" selection-start-line="120" selection-start-column="72" selection-end-line="120" selection-end-column="72" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="293">
-          <caret line="58" column="73" lean-forward="true" selection-start-line="58" selection-start-column="73" selection-end-line="58" selection-end-column="73" />
-          <folding>
-            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
-            <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
-          </folding>
-        </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="307">
-          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
+        <state relative-caret-position="758">
+          <caret line="130" column="5" lean-forward="true" selection-start-line="130" selection-start-column="5" selection-end-line="130" selection-end-column="5" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1170">
-          <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
+        <state relative-caret-position="494">
+          <caret line="86" column="62" lean-forward="true" selection-start-line="86" selection-start-column="62" selection-end-line="86" selection-end-column="62" />
           <folding>
-            <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-            <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+            <element signature="method#getAllDevice#0;class#PgDeviceManager#0" />
+            <element signature="method#getAllDev#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="195" column="28" lean-forward="true" selection-start-line="195" selection-start-column="28" selection-end-line="195" selection-end-column="28" />
+        <state relative-caret-position="166">
+          <caret line="174" column="13" lean-forward="true" selection-start-line="174" selection-start-column="13" selection-end-line="174" selection-end-column="13" />
           <folding>
-            <element signature="method#getAlarmByTypeAndTime#0;class#PgAlarmManager#0" />
-            <element signature="method#getAlarmNum#0;class#PgAlarmManager#0" />
             <element signature="method#getDayAlarmStatistic#0;class#PgAlarmManager#0" />
+            <element signature="method#getAlarmList#0;class#PgAlarmManager#0" />
             <element signature="method#createDTO#0;class#PgAlarmManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="364">
+          <caret line="46" column="56" lean-forward="true" selection-start-line="46" selection-start-column="56" selection-end-line="46" selection-end-column="56" />
+          <folding>
+            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
+            <element signature="method#getPgDev#0;class#PgDeviceRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
+            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+        <state relative-caret-position="396">
+          <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
           <folding>
             <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
             <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -1365,52 +1331,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="239">
-          <caret line="21" column="33" lean-forward="true" selection-start-line="21" selection-start-column="33" selection-end-line="21" selection-end-column="33" />
-        </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="352">
-          <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-        </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="99">
-          <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-          </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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-          <folding>
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-            <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>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
index c436c93..e913155 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
@@ -132,7 +132,10 @@
             this.setAlarmType("");
         else
             this.setAlarmType(pgAlarm.getAlarmTypeId().getAlarmType());
-        this.setAlarmValue(pgAlarm.getAlarmValue());
+        if(pgAlarm.getAlarmValue()==null)
+            this.setAlarmValue("");
+        else
+            this.setAlarmValue(pgAlarm.getAlarmValue());
         if (pgAlarm.getAlarmDate() != null)
             this.setAlarmDate(sdf.format(pgAlarm.getAlarmDate()));
         else
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
index a43965c..565cb41 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -159,11 +159,21 @@
     }
 
     //获取历史报警消息列表
-    public List<PgAlarmDto> getAllAlarm(String alarmType,String startDay,String endDay,String isNew,int page,int rows) {
-        try {
+    public  Map<String, Object> getAllAlarm(String alarmType,String partition,String startDay,String endDay,String isNew,int page,int rows) {
 
+        Map<String, Object> resultMap = new HashMap<>();
+        String msg="";
+
+        try {
             Criteria criteria = createCriteria(PgAlarm.class);
 
+            if (StringUtils.isNotBlank(partition)) {
+                DetachedCriteria inCriteria = DetachedCriteria.forClass(PgDevice.class);
+                inCriteria.add(Restrictions.eq("partition", partition));
+                inCriteria.setProjection(Property.forName("id"));
+                criteria.add(Property.forName("alarmDevId").in(inCriteria));
+            }
+
             if (StringUtils.isNotBlank(alarmType)&&!alarmType.contains("全部")&&pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
                 criteria.add(Restrictions.eq("alarmTypeId", pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)));
 
@@ -190,8 +200,16 @@
             for (PgAlarm pgAlarm : pgAlarmList) {
                 pgAlarmDtoList.add(new PgAlarmDto(pgAlarm));
             }
-
-            return pgAlarmDtoList;
+            if(pgAlarmDtoList==null||pgAlarmDtoList.size()==0) {
+                resultMap.put("msg", "没有报警信息");
+                resultMap.put("code","0");
+            }else {
+                resultMap.put("code","200");
+                resultMap.put("msg", "报警信息获取成功");
+            }
+            resultMap.put("count",pg.getTotalCount());
+            resultMap.put("result",pgAlarmDtoList);
+            return resultMap;
         }
         catch(Exception ex){
             ex.printStackTrace();
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index 7547560..654f49e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -24,11 +24,11 @@
 
         Criteria criteria = createCriteria(PgDevice.class);
 
-        if(road!=null)
+        if(StringUtils.isNotBlank(road))
             criteria.add(Restrictions.eq("road",road));
-        if(partition!=null)
+        if(StringUtils.isNotBlank(partition))
             criteria.add(Restrictions.eq("partition",partition));
-        if(devType!=null)
+        if(StringUtils.isNotBlank(devType))
             criteria.add(Restrictions.eq("devType",devType));
 
         criteria.add(Restrictions.eq("active", 1));
@@ -43,6 +43,29 @@
         return pgDeviceDtoList;
     }
 
+    public List<PgDeviceDto> getAllDev(String road,String partition,String devType) {
+
+        Criteria criteria = createCriteria(PgDevice.class);
+
+        if(StringUtils.isNotBlank(road))
+            criteria.add(Restrictions.eq("road",road));
+        if(StringUtils.isNotBlank(partition))
+            criteria.add(Restrictions.eq("partition",partition));
+        if(StringUtils.isNotBlank(devType))
+            criteria.add(Restrictions.like("devType","%"+devType+"%"));
+
+        criteria.add(Restrictions.eq("active", 1));
+        criteria.addOrder(Order.desc("id"));
+        List<PgDevice> pgDeviceList = criteria.list();
+
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
+        for (PgDevice pgDevice : pgDeviceList) {
+            pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
+        }
+
+        return pgDeviceDtoList;
+    }
+
     //根据名字获取当前设备
     public PgDevice getDeviceByAssetCode(String assetCode) {
         Criteria criteria=createCriteria(PgDevice.class);
@@ -56,9 +79,9 @@
     }
 
     //根据类型获取设备列表
-    public List<PgDeviceDto> getDeviceByDevTypee(String devType) {
+    public List<PgDeviceDto> getDeviceByDevType(String devType) {
         Criteria criteria=createCriteria(PgDevice.class);
-        criteria.add(Restrictions.eq("devType",devType));
+        criteria.add(Restrictions.like("devType","%"+devType+"%"));
 
         List<PgDevice> pgDeviceList=criteria.list();
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
@@ -106,7 +129,7 @@
         criteria.add(Restrictions.eq("partition",partition));
 
         List<PgDevice> pgDeviceList=criteria.list();
-        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<PgDeviceDto>();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
 
         for (PgDevice pgDevice : pgDeviceList) {
             pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
index 3a3bccd..595730e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
@@ -1,10 +1,13 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.devTable.domain.PgAlarmType;
 import com.casic.PgInterface.devTable.domain.PgPartition;
 import com.casic.PgInterface.devTable.domain.PgRoad;
 import com.casic.PgInterface.devTable.domain.PipeGallery;
 import com.casic.PgInterface.devTable.dto.PgPartitionDto;
+import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
@@ -12,7 +15,9 @@
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Created by yxw on 2017/11/4.
@@ -21,7 +26,8 @@
 public class PgPartitionManager extends HibernateEntityDao<PgPartition> {
 
     @Resource
-    PgRoadManager pgRoadManager;
+    private PgRoadManager pgRoadManager;
+
 
     public PgPartition getPartitionByParName(String parName) {
         Criteria criteria = getSession().createCriteria(PgPartition.class);
@@ -99,4 +105,5 @@
         return pgPartitionDtoList;
     }
 
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
index f216360..a6928f1 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
@@ -5,6 +5,7 @@
 public class PgPlanResultRe {
 
     private String taskKey;
+    private List<String> pileAcuList;
     private List<PgPlanResult> pgPlanResultList;
 
     public String getTaskKey() {
@@ -15,6 +16,14 @@
         this.taskKey = taskKey;
     }
 
+    public List<String> getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(List<String> pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+
     public List<PgPlanResult> getPgPlanResultList() {
         return pgPlanResultList;
     }
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
index 71ea765..47eea07 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
@@ -54,9 +54,7 @@
 
         List<PgLineHole> pgLineHoleList=criteria.list();
         List<PgLineHoleDTO> pgLineHoleDTOList=new ArrayList<>();
-        if(pgLineHoleList==null||pgLineHoleList.size()==0)
-            return null;
-        else
+        if(pgLineHoleList!=null&&pgLineHoleList.size()!=0)
             pgLineHoleDTOList=PgLineHoleDTO.ConvertToDTOList(pgLineHoleList,pgPileAcuManager,pgRoadManager);
         return pgLineHoleDTOList;
     }
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
index 0fd9e1f..841a386 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
@@ -1,12 +1,15 @@
 package com.casic.PgInterface.intelPlan.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.devTable.domain.PgPartition;
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
 import com.casic.PgInterface.intelPlan.domain.PgLineHole;
 import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
 import com.casic.PgInterface.intelPlan.domain.PgSection;
 import com.casic.PgInterface.intelPlan.dto.PgPlanResult;
 import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
 import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -22,6 +25,9 @@
     @Resource
     private PgLineHoleManager pgLineHoleManager;
 
+    @Resource
+    private PgRoadManager pgRoadManager;
+
     public PgPileAcu getPgPileAcuByCode(String acuCode){
         List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
 
@@ -58,7 +64,9 @@
         for(PgPlanTask pgPlanTask:pgPlanTaskList){
             List<PgPlanResult> pgPlanResultList=getPgPlanResultByPlantask(pgPlanTask);
             PgPlanResultRe pgPlanResultRe=new PgPlanResultRe();
+
             pgPlanResultRe.setTaskKey(pgPlanTask.getTaskKey());
+            pgPlanResultRe.setPileAcuList(pgPlanTask.getPileAcuList());
             pgPlanResultRe.setPgPlanResultList(pgPlanResultList);
 
             pgPlanResultReList.add(pgPlanResultRe);
@@ -142,4 +150,57 @@
         return length;
     }
 
+    private PgPileAcu getPgPileAcuByAcuCode(String acuCode){
+        List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
+
+        if(pgPileAcuList==null||pgPileAcuList.size()==0)
+            return null;
+        else
+            return pgPileAcuList.get(0);
+    }
+
+    public List<PgAcuTask> getACUTask(String pileAcuList){
+        String[] acuArray=pileAcuList.split(",");
+        List<PgAcuTask> pgAcuTaskList=new ArrayList<>();
+
+        for(String acu:acuArray){
+            PgPileAcu pgPileAcu=this.getPgPileAcuByCode(acu);
+            String roadName=pgRoadManager.get(pgPileAcu.getRoadId()).getRoadName();
+
+            if(!containRoad(roadName,pgAcuTaskList))
+            {
+                PgAcuTask pgAcuTask=new PgAcuTask();
+                pgAcuTask.setRoadName(roadName);
+                pgAcuTask.setPileAcuList(acu);
+                pgAcuTaskList.add(pgAcuTask);
+            }
+            else{
+                PgAcuTask pgAcuTask=getIndexRoad(roadName,pgAcuTaskList);
+                if(pgAcuTask!=null)
+                    pgAcuTask.setPileAcuList(pgAcuTask.getPileAcuList()+","+acu);
+            }
+        }
+
+        return pgAcuTaskList;
+    }
+
+    private boolean containRoad(String roadName,List<PgAcuTask> pgAcuTaskList){
+        if(pgAcuTaskList==null||pgAcuTaskList.size()==0) return false;
+        for(PgAcuTask pgAcuTask:pgAcuTaskList){
+            if(pgAcuTask.getRoadName().equals(roadName))
+                return true;
+        }
+
+        return false;
+    }
+
+    private PgAcuTask getIndexRoad(String roadName, List<PgAcuTask> pgAcuTaskList){
+        for(PgAcuTask pgAcuTask:pgAcuTaskList){
+            if(pgAcuTask.getRoadName().equals(roadName))
+                return pgAcuTask;
+        }
+
+        return null;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java
new file mode 100644
index 0000000..323f7ef
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java
@@ -0,0 +1,25 @@
+package com.casic.PgInterface.reservePlan.dto;
+
+import java.util.List;
+
+public class PgAcuTask {
+
+    private String roadName;//道路
+    private String pileAcuList;//acu分区
+
+    public String getRoadName() {
+        return roadName;
+    }
+
+    public void setRoadName(String roadName) {
+        this.roadName = roadName;
+    }
+
+    public String getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(String pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
index c25e926..c7d7693 100644
--- a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
@@ -70,9 +70,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(Long.valueOf(inPgPersonId));
         PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("hostName",pgInPgPerson.getAssetCode());
-//        PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode());
-//        long maxId = pgTagPositionManager.getMaxId(pgTagMac.getTagMac());
-//        PGTagPosition pgTagPosition = pgTagPositionManager.get(maxId);
+
         PGTagPosition pgTagPosition = tagmacRun.GetTagStatus(pgTagMac);
         boolean bExist = false;
         bExist = pgTagPositionManager.findTagPosition(pgTagPosition.getPositionUpdatetime(),pgTagPosition.getHostId());
@@ -104,8 +102,7 @@
         PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(Long.valueOf(inPgPersonId));
         PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pgInPgPersonId",pgInPgPerson);
         System.out.println("time:"+pgInPgStatus.getInTime());
-//        PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pgInPgPersonId",inPgPersonId);
-//        PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode());
+
         PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("hostName",pgInPgPerson.getAssetCode());
 
         Map<Object,Object> mapPosition = new HashMap<>();
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
index 082ba5d..3eed00a 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
@@ -48,6 +48,7 @@
     public Map<String, Object> linkDevice(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         PgDeviceDto pgDeviceDto = null;
         try {
@@ -62,6 +63,7 @@
                     else {
                         pgDeviceDto = new PgDeviceDto(pgDevice);
                         msg = "报警关联设备获取成功";
+                        code="200";
                     }
                 }
             }
@@ -71,6 +73,7 @@
             e.printStackTrace();
             msg = "获取关联设备失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceDto);
 
@@ -86,6 +89,7 @@
     public Map<String, Object> linkPartitionCamera(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
         try {
@@ -106,6 +110,7 @@
 
                         pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(partition,position);
                         msg = "关联设备获取成功";
+                        code="200";
                     }
                 }
             }
@@ -115,6 +120,7 @@
             e.printStackTrace();
             msg = "分区设备关联失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceDtoList);
         return resultMap;
@@ -129,6 +135,7 @@
     public Map<String, Object> linkReservePlan(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgReservePlanDto> pgReservePlanDtoList=new ArrayList<>();
         try{
@@ -139,10 +146,12 @@
                 else {
                     pgReservePlanDtoList = pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
 
-                    if(pgReservePlanDtoList==null||pgReservePlanDtoList.size()==0)
-                        msg="不存在关联的报警预案";
-                    else
+                    if (pgReservePlanDtoList == null || pgReservePlanDtoList.size() == 0)
+                        msg = "不存在关联的报警预案";
+                    else {
                         msg = "关联预案获取成功";
+                        code="200";
+                    }
                 }
             }
             else
@@ -153,6 +162,7 @@
             e.printStackTrace();
             msg="预案关联失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgReservePlanDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
index 0ddbc4d..0ce886b 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
@@ -41,25 +41,19 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getAlarmList(@FormParam("alarmType") String alarmType,
                                             @FormParam("startDay") String startDay,
+                                            @FormParam("partition") String partition,
                                             @FormParam("endDay") String endDay,
                                             @FormParam("isNew") String isNew,
                                             @FormParam("page") int page,
                                             @FormParam("rows") int rows) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
         try {
-            pgAlarmDtoList = pgAlarmManager.getAllAlarm(alarmType,startDay,endDay,isNew,page,rows);
-            if (pgAlarmDtoList==null||pgAlarmDtoList.size() == 0)
-                msg = "没有报警信息";
-            else
-                msg = "报警信息获取成功";
+            resultMap = pgAlarmManager.getAllAlarm(alarmType,partition,startDay,endDay,isNew,page,rows);
+
         } catch (Exception e) {
             e.printStackTrace();
-            msg = "报警信息获取失败";
         }
-        resultMap.put("msg", msg);
-        resultMap.put("result", pgAlarmDtoList);
         return resultMap;
     }
 
@@ -71,9 +65,10 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> clearAlarmList(@FormParam("id") String id) throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        String result = "false";
+        String result = "";
+        String code="0";
 
         try {
             PgAlarm pgAlarm = new PgAlarm();
@@ -86,12 +81,14 @@
                 pgAlarmManager.save(pgAlarm);
                 msg = "报警信息清除成功";
                 result = "true";
+                code = "200";
             }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警信息清除失败";
             result = "false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
@@ -106,21 +103,26 @@
     public Map<String, Object> getAlarmByTypeOrTime(@FormParam("alarmType") String alarmType,
                                                     @FormParam("startTime") String startTime,
                                                     @FormParam("endTime") String endTime) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
-        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<PgAlarmDto>();
+        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
         try {
             pgAlarmDtoList = pgAlarmManager.getAlarmByTypeAndTime(alarmType, startTime, endTime);
             if (pgAlarmDtoList == null || pgAlarmDtoList.size() == 0)
                 msg = "报警信息不存在";
             else
+            {
                 msg = "报警信息获取成功";
+                code="200";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警信息获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
index 29ce8a4..ed0bf34 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
@@ -39,8 +39,8 @@
     public Map<String, Object> getAlarmRule(@FormParam("devType") String devType) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
-        System.out.println("devType:"+devType);
         List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<>();
         try {
             pgAlarmRuleDtoList = pgAlarmRuleManager.getAlarmRuleDto(devType);
@@ -52,6 +52,7 @@
             e.printStackTrace();
             msg = "报警阈值信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmRuleDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
index 24ab894..abef1b1 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
@@ -39,16 +39,21 @@
                                                      @FormParam("endDate") String endDate)throws Exception{
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
+
         List<PgAlarmTjDto> pgAlarmTjDtoList=null;
         try{
             pgAlarmTjDtoList=pgAlarmTjManager.getAlarmTjResultByType(startDate,endDate);
             msg="获取成功";
+            code="200";
         }
         catch(Exception ex) {
             msg = "统计失败";
         }
-        resultMap.put("result",pgAlarmTjDtoList);
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
+        resultMap.put("result",pgAlarmTjDtoList);
+
         return resultMap;
     }
 
@@ -61,23 +66,27 @@
     public Map<String, Object> getAlarmByTime(@FormParam("startTime") String startTime,
                                               @FormParam("endTime") String endTime,
                                               @FormParam("statisticType") String statisticType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code = "0";
 
-        List<PgAlarmTjDto> pgAlarmTjDtoList = new ArrayList<PgAlarmTjDto>();
+        List<PgAlarmTjDto> pgAlarmTjDtoList = new ArrayList<>();
         try {
             pgAlarmTjDtoList = pgAlarmTjManager.getAlarmByTime(startTime, endTime, statisticType);
             if(pgAlarmTjDtoList==null)
                 msg="报警统计信息获取失败";
-            else
-                msg="报警统计信息获取成功";
+            else {
+                msg = "报警统计信息获取成功";
+                code="200";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警统计信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmTjDtoList);
         return resultMap;
     }
 
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
index 28bc811..b6278a9 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
@@ -30,7 +30,6 @@
     @Resource
     private PgAlarmTypeManager pgAlarmTypeManager;
 
-
     /**
      * 获取报警类型
      */
@@ -38,19 +37,24 @@
     @Path("getAlarmType")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getAlarmTypeList()throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
-        List<PgAlarmTypeDto> pgAlarmTypeDtoList=new ArrayList<PgAlarmTypeDto>();
+        String code="";
+
+        List<PgAlarmTypeDto> pgAlarmTypeDtoList=new ArrayList<>();
         try {
             pgAlarmTypeDtoList = pgAlarmTypeManager.getAllAlarmTypeDto();
             if(pgAlarmTypeDtoList.size()==0)
                 msg="没有报警类型信息";
-            else
-                msg="报警类型信息获取成功";
+            else {
+                code="200";
+                msg = "报警类型信息获取成功";
+            }
         }catch(Exception e){
             e.printStackTrace();
             msg="报警类型信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAlarmTypeDtoList);
         return resultMap;
@@ -66,6 +70,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
@@ -83,6 +88,7 @@
                 logger.info("成功保存");
                 result = "true";
                 msg = "保存成功";
+                code="200";
             }
         } catch (Exception e) {
             result = "false";
@@ -90,6 +96,7 @@
             e.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -106,6 +113,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try{
             if(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
@@ -119,6 +127,7 @@
                 pgAlarmTypeManager.save(pgAlarmType);
                 result = "true";
                 msg = "编辑成功";
+                code="200";
             }
         }
         catch(Exception e)
@@ -128,6 +137,7 @@
             e.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("result",result);
         resultMap.put("msg",msg);
 
@@ -146,6 +156,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
         String result="false";
+        String code="0";
 
         try {
             PgAlarmType pgAlarmType=pgAlarmTypeManager.get(Long.valueOf(id));
@@ -157,6 +168,7 @@
             {
                 pgAlarmType.setActive(0);
                 pgAlarmTypeManager.save(pgAlarmType);
+                code="200";
                 msg="报警类型删除成功";
                 result="true";
             }
@@ -165,6 +177,7 @@
             msg="报警类型删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
index 4533e1a..85940bb 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
@@ -33,12 +33,15 @@
                                                  @FormParam("inSpectionPlace") String inSpectionPlace){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
         List<PgAssetPlanDto> pgAssetPlanDtoList=new ArrayList<>();
         try{
             pgAssetPlanDtoList=pgAssetPlanManager.getPgAssetPlanDtoList(startDay,endDay,inSpectionPlace);
-            if(pgAssetPlanDtoList!=null&&pgAssetPlanDtoList.size()!=0)
-                msg="巡检信息获取成功";
+            if(pgAssetPlanDtoList!=null&&pgAssetPlanDtoList.size()!=0) {
+                code="200";
+                msg = "巡检信息获取成功";
+            }
             else
                 msg="不存在巡检信息";
         }
@@ -47,6 +50,7 @@
             msg="巡检信息获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAssetPlanDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
index 47ef9d1..5cbdfcb 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
@@ -30,12 +30,15 @@
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
         String result="";
+        String code="0";
 
         List<PgAssetPlanStatic> pgAssetPlanStaticList = null;
         try{
             pgAssetPlanStaticList=pgAssetPlanManager.getPgAssetPlanStaticLisByTime(startTime,endTime,staticType);
-            if(pgAssetPlanStaticList!=null&&pgAssetPlanStaticList.size()!=0)
-                msg="巡检统计信息获取成功";
+            if(pgAssetPlanStaticList!=null&&pgAssetPlanStaticList.size()!=0) {
+                code = "200";
+                msg = "巡检统计信息获取成功";
+            }
             else
                 msg="统计信息获取失败";
         }
@@ -44,6 +47,7 @@
             msg="统计失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAssetPlanStaticList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
index 26f5d6a..503bfe3 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
@@ -40,6 +40,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="";
 
         try{
             PgAuthority pgAuthority=new PgAuthority();
@@ -50,6 +51,7 @@
 
             pgAuthorityManager.save(pgAuthority);
             msg="用户权限保存成功";
+            code="200";
             result="true";
         }
         catch(Exception e) {
@@ -57,6 +59,7 @@
             msg = "新增权限失败";
             result = "false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -65,22 +68,25 @@
 
     /*
        *编辑角权限信息
-        */
+    */
     @POST
     @Path("editAuthority")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> editAuthority(@FormParam("id") String id,
                                        @FormParam("authority") String authority,
                                        @FormParam("concent") String concent) throws Exception{
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
+
         try {
             PgAuthority pgAuthority=pgAuthorityManager.get(Long.valueOf(id));
             pgAuthority.setAuthority(authority);
             pgAuthority.setConcent(concent);
 
             pgAuthorityManager.save(pgAuthority);
+            code="200";
             msg="权限保存成功";
             result="true";
         }
@@ -90,7 +96,7 @@
             msg="权限编辑失败";
             result="false";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -105,9 +111,10 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> deleteAuthority(@FormParam("id") String id)throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
-        String result="false";
+        String result="";
+        String code="0";
 
         try {
             PgAuthority pgAuthority= pgAuthorityManager.get(Long.valueOf(id));
@@ -119,6 +126,7 @@
             {
                 pgAuthority.setActive(0);
                 pgAuthorityManager.save(pgAuthority);
+                code="200";
                 msg="删除权限成功";
                 result="true";
             }
@@ -127,37 +135,40 @@
             msg="删除权限失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
     }
 
     /*
-* 获取权限信息
- */
+    * 获取权限信息
+    */
     @POST
     @Path("getAuthorityList")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> getAuthorityList() {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgAuthorityDto> pgAuthorityDtoList = new ArrayList<PgAuthorityDto>();
         try {
             pgAuthorityDtoList = pgAuthorityManager.getAuthorityList();
             if (pgAuthorityDtoList == null)
                 msg = "不存在权限信息";
-            else
+            else {
+                code = "200";
                 msg = "权限信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "权限信息获取是失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAuthorityDtoList);
         return resultMap;
     }
 
 
-
-
 }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
index a9ef521..a74ecc7 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
@@ -45,6 +45,7 @@
                                                @FormParam("endDate") String endDate)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgHistoryDataDto> pgHistoryDataDtoList=new ArrayList<>();
 
         try {
@@ -55,13 +56,16 @@
                 pgHistoryDataDtoList=pgCh4Manager.getAllCH4Data(pgDevice,startDate,endDate);
                 if(pgHistoryDataDtoList==null)
                     msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+                else {
+                    code = "200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgHistoryDataDtoList);
         return resultMap;
@@ -75,8 +79,9 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getNewestCh4InfoByDev(@FormParam("assetCode") String assetCode)throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
+        String code="0";
         PgCh4Dto pgCh4Dto=new PgCh4Dto(null);
 
         try {
@@ -87,13 +92,17 @@
                 pgCh4Dto=pgCh4Manager.getNewestCH4Data(pgDevice);
                 if(pgCh4Dto==null)
                     msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgCh4Dto);
         return resultMap;
@@ -111,6 +120,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
@@ -127,6 +137,7 @@
                 pgCh4.setPgDeviceId(pgDevice);
 
                 pgCh4Manager.save(pgCh4);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -135,7 +146,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
index a7eac39..dfc8ca5 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
@@ -43,23 +43,27 @@
                                                       @FormParam("endDate") String endDate)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgHistoryDataDto> pgHistoryDataDtoList=new ArrayList<>();
 
         try {
             PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
                 msg="设备不存在";
-            else{
-                pgHistoryDataDtoList=pgCoManager.getAllCoData(pgDevice, startDate, endDate);
-                if(pgHistoryDataDtoList==null)
-                    msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+            else {
+                pgHistoryDataDtoList = pgCoManager.getAllCoData(pgDevice, startDate, endDate);
+                if (pgHistoryDataDtoList == null)
+                    msg = "没有满足要求的数据";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgHistoryDataDtoList);
         return resultMap;
@@ -75,6 +79,7 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         PgCoDto pgCoDto=new PgCoDto(null);
 
         try {
@@ -85,13 +90,16 @@
                 pgCoDto=pgCoManager.getNewestCoData(pgDevice);
                 if(pgCoDto==null)
                     msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgCoDto);
         return resultMap;
@@ -110,6 +118,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         try {
@@ -126,6 +135,7 @@
 
                 pgCoManager.save(pgCo);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
         } catch (Exception e) {
@@ -133,7 +143,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
index b4b826e..9af98a3 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
@@ -60,6 +60,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         try {
 
@@ -80,8 +81,8 @@
                 pgConstruction.setPgConstructionTypeId(pgConstructionType.getId());
                 pgConstruction.setActive(1);
                 pgConstruction.setParName(parName);
-                logger.info("保存成功");
                 pgConstructionManager.save(pgConstruction);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -90,6 +91,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("success", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -116,6 +118,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
@@ -140,6 +143,7 @@
                 pgConstruction.setParName(parName);
 
                 pgConstructionManager.save(pgConstruction);
+                code="200";
                 result = "true";
                 msg = "编辑成功";
             }
@@ -150,7 +154,7 @@
             e.printStackTrace();
 
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -167,6 +171,8 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
+
         try {
             PgConstruction pgConstruction = pgConstructionManager.get(Long.valueOf(id));
             if (pgConstruction == null)
@@ -177,6 +183,7 @@
             {
                 pgConstruction.setActive(0);
                 pgConstructionManager.save(pgConstruction);
+                code="200";
                 result = "true";
                 msg = "成功删除信息";
             }
@@ -185,6 +192,7 @@
             result = "false";
             msg = "删除失败";
         }
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -204,9 +212,11 @@
                                                   @FormParam("rows") int rows)throws Exception{
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
         List<PgConstructionDto> pgConstructionDtoList=new ArrayList<>();
         try{
             pgConstructionDtoList=pgConstructionManager.getPgContructionDto(cs_name,cs_type,startTime,endTime,page,rows);
+            code="200";
             msg="信息获取成功";
         }
         catch(Exception e)
@@ -214,6 +224,7 @@
             e.printStackTrace();
             msg="查询失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
 
@@ -231,18 +242,22 @@
                                                               @FormParam("statisticType") String statisticType) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgConstructionStiatistic> pgConstructionStiatisticList=new ArrayList<>();
         try {
             pgConstructionStiatisticList = pgConstructionManager.getConstructionByTimeAndStatus(startTime, endTime, statisticType);
             if(pgConstructionStiatisticList==null)
                 msg="施工统计信息获取失败";
-            else
-                msg="施工统计信息获取成功";
+            else {
+                code="200";
+                msg = "施工统计信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "施工统计信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgConstructionStiatisticList);
         return resultMap;
@@ -257,6 +272,7 @@
     public Map<String, Object> getConstructionByType(@FormParam("statisticType") String statisticType){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
         List<PgConstructionStiatistic> pgConstructionStiatisticList=new ArrayList<>();
 
         try{
@@ -268,6 +284,7 @@
                 resultMap.put("result",null);
             }
             else {
+                code="200";
                 msg = "统计信息获取成功";
                 resultMap.put("result", pgConstructionStiatisticList);
             }
@@ -278,6 +295,7 @@
             msg="统计失败";
             resultMap.put("result",null);
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         return resultMap;
     }
@@ -291,9 +309,11 @@
     public Map<String, Object> getConstructionToday() throws Exception{
         Map<String,Object> resultMap=new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgConstructionDto> pgConstructionDtoList=new ArrayList<PgConstructionDto>();
         try {
             pgConstructionDtoList = pgConstructionManager.getConstructionToday();
+            code="200";
             msg = "当天施工信息获取成功";
         }
         catch(Exception e)
@@ -301,7 +321,7 @@
             e.printStackTrace();
             msg="获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
         return resultMap;
@@ -316,6 +336,7 @@
     public Map<String, Object> getConstructionDev(@FormParam("id") String id) throws Exception{
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
         List<PgDeviceDto> pgDeviceDtoList =new ArrayList<>();
         try{
@@ -325,14 +346,17 @@
 
             if(pgDeviceDtoList==null)
                 msg="信息获取失败";
-            else
-                msg="信息获取成功";
+            else {
+                code="200";
+                msg = "信息获取成功";
+            }
         }
         catch(Exception e)
         {
             e.printStackTrace();
-            msg="设备信息获取成功";
+            msg="信息获取是被";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgDeviceDtoList);
 
@@ -346,17 +370,21 @@
     @Path("getConstruction")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getConstruction() throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
-        List<PgConstructionDto> pgConstructionDtoList=new ArrayList<PgConstructionDto>();
+        String code="0";
+
+        List<PgConstructionDto> pgConstructionDtoList=new ArrayList<>();
 
         try{
             pgConstructionDtoList=pgConstructionManager.getPgConstructionList();
             if(pgConstructionDtoList==null||pgConstructionDtoList.size()==0)
                 msg="不存在施工记录";
-            else
-                msg="施工信息获取成功";
+            else {
+                code = "200";
+                msg = "施工信息获取成功";
+            }
         }
         catch(Exception e)
         {
@@ -364,6 +392,7 @@
             msg="施工信息获取失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java
index fd3d53e..2019502 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java
@@ -39,12 +39,12 @@
         try {
             pgConstructionTypeDtoList = pgConstructionTypeManager.getAllConstructionTypeDto();
             if (pgConstructionTypeDtoList.size() == 0)
-                msg = "没有项目类型信息";
+                msg = "获取失败";
             else
-                msg = "项目类型获取成功";
+                msg = "获取成功";
         } catch (Exception e) {
             e.printStackTrace();
-            msg = "项目类型信息获取失败";
+            msg = "获取失败";
         }
         resultMap.put("msg", msg);
         resultMap.put("result", pgConstructionTypeDtoList);
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
index 90d001c..037a399 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
@@ -51,6 +51,7 @@
 
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if (StringUtils.isBlank(construct_doc)||StringUtils.isBlank(doc_name))
@@ -65,6 +66,7 @@
             pgCsDocument.setActive(1);
             pgCsDocumentManager.save(pgCsDocument);
 
+            code="200";
             result = "true";
             msg = "保存成功";
 
@@ -74,6 +76,7 @@
             ex.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("success", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -90,6 +93,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             PgCsDocument pgCsDocument = pgCsDocumentManager.get(Long.valueOf(id));
@@ -103,6 +107,7 @@
 
                 pgCsDocumentManager.save(pgCsDocument);
 
+                code="200";
                 result = "true";
                 msg = "编辑成功";
             }
@@ -112,6 +117,7 @@
             msg = "编辑失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -125,9 +131,9 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
         String result="";
+        String code="0";
 
         try{
-
             PgCsDocument pgCsDocument = pgCsDocumentManager.get(Long.valueOf(id));
             if(pgCsDocument==null)
             {
@@ -137,6 +143,7 @@
             else{
                 pgCsDocument.setActive(0);
                 pgCsDocumentManager.save(pgCsDocument);
+                code="200";
                 result="true";
                 msg="删除成功";
             }
@@ -147,7 +154,7 @@
             msg="预案删除失败";
             result="false";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -168,18 +175,21 @@
 
         String msg="";
         String result="";
+        String code="0";
 
         try {
             pgCsDocumentDtoList = pgCsDocumentManager.getAllDocData(cs_name);
-            if (pgCsDocumentDtoList != null)
+            if (pgCsDocumentDtoList != null) {
+                code="200";
                 msg = "获取数据成功";
+            }
             else
                 msg = "没有满足条件的数据";
         }catch (Exception e){
             e.printStackTrace();
             msg = "获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgCsDocumentDtoList);
         return resultMap;
@@ -192,20 +202,22 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
 
         String msg = "";
+        String code="0";
         ResponseEntity<byte[]> path = null;
         try {
             PgCsDocument pgCsDocument = pgCsDocumentManager.get(Long.valueOf(id));
             path = pgCsDocumentManager.downloadFile(pgCsDocument);
             if (path == null)
                 msg = "不存在该文档";
-            else
+            else {
+                code = "200";
                 msg = "下载成功";
-
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "下载失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", path.getBody());
         resultMap.put("msg", msg);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
index 94c5c84..ffc8b95 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
@@ -41,22 +41,24 @@
     public Map<String, Object> getPgDeviceByDevType(@FormParam("devType") String devType) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
         try {
-            pgDeviceDtoList = pgDeviceManager.getDeviceByDevTypee(devType);
+            pgDeviceDtoList = pgDeviceManager.getDeviceByDevType(devType);
             if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0){
                 msg="不存在满足要求的数据";
-                resultMap.put("result",null);
             }
             else{
-                resultMap.put("result", pgDeviceDtoList);
+                code="200";
                 msg = "获取成功";
             }
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", pgDeviceDtoList);
         return resultMap;
     }
 
@@ -69,25 +71,26 @@
     public Map<String, Object> getPgDeviceByAssetCode(@FormParam("assetCode") String assetCode) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         PgDeviceDto pgDeviceDto=null;
         try {
             PgDevice pgDevice = pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
             {
                 msg="不存在设备信息";
-                resultMap.put("result",null);
             }
             else {
                 pgDeviceDto = new PgDeviceDto(pgDevice);
                 msg = "获取成功";
-                resultMap.put("result", pgDeviceDto);
+                code="200";
             }
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", pgDeviceDto);
         return resultMap;
     }
 
@@ -102,27 +105,61 @@
                                              @FormParam("devType") String devType)throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
         try {
             pgDeviceDtoList = pgDeviceManager.getAllDevice(road,partition,devType);
             if(pgDeviceDtoList.size()==0) {
                 msg = "没有找到设备信息";
-                resultMap.put("result",null);
             }
             else {
                 msg = "设备信息获取成功";
-                resultMap.put("result", pgDeviceDtoList);
+                code="200";
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result", pgDeviceDtoList);
         return resultMap;
     }
 
     /**
+     * 显示设备列表
+     */
+    @POST
+    @Path("getPgDev")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String, Object> getPgDev(@FormParam("road") String road,
+                                             @FormParam("partition") String partition,
+                                             @FormParam("devType") String devType)throws Exception {
+        Map<String, Object> resultMap = new HashMap<>();
+        String msg="";
+        String code="0";
+        List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
+        try {
+            pgDeviceDtoList = pgDeviceManager.getAllDev(road,partition,devType);
+            if(pgDeviceDtoList.size()==0) {
+                msg = "没有找到设备信息";
+            }
+            else {
+                code="200";
+                msg = "设备信息获取成功";
+            }
+        }catch(Exception e){
+            e.printStackTrace();
+            msg="设备信息获取失败";
+        }
+        resultMap.put("code",code);
+        resultMap.put("msg",msg);
+        resultMap.put("result", pgDeviceDtoList);
+        return resultMap;
+    }
+
+
+    /**
      * 新增设备
      */
     @POST
@@ -145,6 +182,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if (pgDeviceManager.getDeviceByAssetCode(assetCode)!=null) {
@@ -169,6 +207,7 @@
 
                 pgDeviceManager.save(pgDevice);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
 
@@ -177,10 +216,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -208,14 +246,9 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
-            /*
-            if (pgDeviceManager.getDeviceByAssetCode(assetCode)!=null) {
-                result = "false";
-                msg = "已存在同名设备";
-            } else {
-            */
             PgDevice pgDevice = pgDeviceManager.get(Long.valueOf(id));
             pgDevice.setPipeGallery(pipeGallery);
             pgDevice.setPartition(partition);
@@ -233,14 +266,14 @@
 
             pgDeviceManager.save(pgDevice);
             result = "true";
+            code="200";
             msg = "编辑成功";
-            //}
         } catch (Exception e) {
             result = "false";
             msg = "编辑失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("result",result);
         resultMap.put("msg",msg);
         return resultMap;
@@ -256,7 +289,8 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
-        String result="false";
+        String result="";
+        String code="0";
 
         try {
             PgDevice pgDevice=pgDeviceManager.get(Long.valueOf(id));
@@ -268,6 +302,7 @@
             {
                 pgDevice.setActive(0);
                 pgDeviceManager.save(pgDevice);
+                code="200";
                 msg="设备删除成功";
                 result="true";
             }
@@ -276,6 +311,7 @@
             msg="设备删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -291,18 +327,18 @@
     {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         PgDeviceDto pgDeviceDto=null;
 
         try{
             PgDevice pgDevice=pgDeviceManager.getDeviceBydevCode(devCode);
             if(pgDevice==null) {
                 msg = "设备信息获取失败";
-                resultMap.put("result",null);
             }
             else{
                 pgDeviceDto = new PgDeviceDto(pgDevice);
                 msg = "设备信息获取成功";
-                resultMap.put("result",pgDeviceDto);
+                code="200";
             }
         }
         catch(Exception ex)
@@ -310,8 +346,9 @@
             ex.printStackTrace();
             msg="设备状态获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgDeviceDto);
         return resultMap;
     }
 
@@ -324,17 +361,17 @@
     public Map<String,Object> getDeviceByPartition(@FormParam("partition") String partition) throws Exception{
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<PgDeviceDto>();
 
         try{
             pgDeviceDtoList=pgDeviceManager.getPgDeviceDtoListByPartition(partition);
             if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0) {
                 msg = "设备信息获取失败";
-                resultMap.put("result",null);
             }
             else {
+                code="200";
                 msg = "设备信息获取成功";
-                resultMap.put("result",pgDeviceDtoList);
             }
         }
         catch(Exception e)
@@ -342,8 +379,9 @@
             e.printStackTrace();
             msg="设备信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgDeviceDtoList);
         return resultMap;
     }
 
@@ -353,17 +391,16 @@
     public Map<String,Object> getDeviceByOldDAssetCodeCode(@FormParam("assetCode") String assetCode) throws Exception{
         Map<String, Object> resultMap = new HashMap<>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
 
         try{
             pgDeviceDtoList=pgDeviceManager.getDeviceByOldDAssetCodeCode(assetCode);
-            if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0) {
-                msg = "设备信息获取失败";;
-                resultMap.put("result",null);
-            }
+            if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0)
+                msg = "设备信息获取失败";
             else {
                 msg = "设备信息获取成功";
-                resultMap.put("result",pgDeviceDtoList);
+                code="200";
             }
         }
         catch(Exception e)
@@ -372,8 +409,9 @@
             msg="设备信息获取失败";
             resultMap.put("result",null);
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgDeviceDtoList);
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java
index 421d249..f6f167d 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java
@@ -38,17 +38,21 @@
     public Map<String, Object> getDeviceTpeyList()throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgDeviceTypeDto> pgDeviceTypeDtoList=new ArrayList<PgDeviceTypeDto>();
         try {
             pgDeviceTypeDtoList = pgDeviceTypeManager.getAllDeviceType();
             if(pgDeviceTypeDtoList.size()==0)
                 msg="没有找到设备类型信息";
-            else
-                msg="设备类型信息获取成功";
+            else {
+                code="200";
+                msg = "设备类型信息获取成功";
+            }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备类型信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgDeviceTypeDtoList);
         return resultMap;
@@ -66,6 +70,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if (pgDeviceTypeManager.getDeviceTypeByDeType(devType)!=null) {
@@ -79,6 +84,7 @@
 
                 pgDeviceTypeManager.save(pgDeviceType);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
 
@@ -87,10 +93,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
index c276fb3..c789960 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
@@ -44,6 +44,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 
         try {
@@ -62,6 +63,7 @@
                 pgEquipment.setActive(1);
 
                 pgEquipmentManager.save(pgEquipment);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -70,9 +72,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -89,9 +91,10 @@
                                             @FormParam("ownerUnit") String ownerUnit,
                                             @FormParam("enterDate") String enterDate,
                                             @FormParam("curUser") String curUser) {
-        HashMap<String, Object> resultMap = new HashMap<String, Object>();
+        HashMap<String, Object> resultMap = new HashMap<>();
         String msg = "";
         String result = "";
+        String code="0";
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 
         try {
@@ -111,6 +114,7 @@
                 pgEquipment.setEnterDate(sdf.parse(enterDate));
 
                 pgEquipmentManager.save(pgEquipment);
+                code="200";
                 msg="编辑成功";
                 result="true";
             }
@@ -119,9 +123,9 @@
             result = "false";
             msg = "编辑失败";
         }
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -134,16 +138,19 @@
     public Map<String, Object> getEquipment(@FormParam("eqName") String eqName,
                                             @FormParam("eqCode") String eqCode,
                                             @FormParam("eqType") String eqType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        List<PgEquipmentDto> pgEquipmentDtoList=new ArrayList<PgEquipmentDto>();
+        String code="0";
+        List<PgEquipmentDto> pgEquipmentDtoList=new ArrayList<>();
 
         try{
             pgEquipmentDtoList=pgEquipmentManager.getEquipmentDtiList(eqName,eqCode,eqType);
             if(pgEquipmentDtoList==null||pgEquipmentDtoList.size()==0)
                 msg="不存在工器具记录";
-            else
-                msg="维获取成功";
+            else {
+                code = "200";
+                msg = "维获取成功";
+            }
         }
         catch(Exception e)
         {
@@ -166,6 +173,7 @@
         HashMap<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
         String result = "";
+        String code="";
 
         try {
             PgEquipment pgEquipment=pgEquipmentManager.get(Long.valueOf(id));
@@ -178,6 +186,7 @@
             {
                 pgEquipment.setActive(0);
                 pgEquipmentManager.save(pgEquipment);
+                code="200";
                 msg="删除成功";
                 result="true";
             }
@@ -186,6 +195,7 @@
             msg="设备信息获取失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -201,16 +211,19 @@
             throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=new ArrayList<PgDeviceTypeStatisticDto>();
 
         try {
             pgDeviceTypeStatisticDtoList=pgEquipmentManager.getDeviceStatisticByDevType(eqType);
 
+            code="200";
             msg = "获取成功";
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceTypeStatisticDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
index 05a9709..a90fd6c 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
@@ -4,9 +4,9 @@
 import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
 import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
 import com.casic.PgInterface.intelPlan.manager.PgPileAcuManager;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import com.casic.PgInterface.test.PlanData;
 import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.ModelAttribute;
 
 import javax.annotation.Resource;
 import javax.ws.rs.FormParam;
@@ -32,23 +32,25 @@
     public Map<String,Object> getPlanResult(@FormParam("planParamStr") String planParamStr){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
-        //List<PgPlanTask> pgPlanTaskList=pgPlanParams.getPgPlanTaskList();
         List<PgPlanTask> pgPlanTaskList=new PgPlanParams().getPgPlanParamsByString(planParamStr);
         List<PgPlanResultRe> pgPlanResultReList=new ArrayList<>();
 
-        try{
-                pgPlanResultReList=pgPileAcuManager.getPgPlanResultList(pgPlanTaskList);
-                if(pgPlanResultReList==null)
-                    msg="管线智能规划出错";
-                else
-                    msg="管线智能规划完成";
+        try {
+            pgPlanResultReList = pgPileAcuManager.getPgPlanResultList(pgPlanTaskList);
+            if (pgPlanResultReList == null)
+                msg = "管线智能规划出错";
+            else {
+                code="200";
+                msg = "管线智能规划完成";
+            }
         }
         catch(Exception ex){
             msg="智能规划出错";
             ex.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgPlanResultReList);
 
@@ -80,4 +82,30 @@
         return resultMap;
     }
 
+    @POST
+    @Path("getPlanTask")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getACUTask(@FormParam("pileAcuList") String pileAcuList){
+
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        String code="0";
+        List<PgAcuTask> pgAcuTaskList=new ArrayList<>();
+
+        try{
+            pgAcuTaskList=pgPileAcuManager.getACUTask(pileAcuList);
+            code="200";
+            msg="任务获取成功";
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            msg="任务获取失败";
+        }
+        resultMap.put("code",code);
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgAcuTaskList);
+
+        return resultMap;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
index ff85c61..66eec76 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
@@ -55,13 +55,13 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         try {
             PgInPgPerson pgInPgPerson = null;//pgInPgPersonManager.getPersonByUserName(userName);
             int iHostName = pgTagMacManager.getCount("select count(1) from PGTagMac where hostname = ?",assetCode);
-//            int iTagMac = pgTagMacManager.getCount("select count(1) from PGTagMac where tagmac = ?",assetCode.toUpperCase());
             if (0==iHostName)
             {
                 result = "false";
@@ -92,9 +92,8 @@
 
                 pgInPgStatusManager.save(pgInPgStatus);
 
-//                String syResult=pgInPgPersonManager.synchorizedInPgInfo(assetCode,userCode,userName,personType);
+                code="200";
                 result = "true";
-//                msg = "人员注册保存成功"+syResult;
                 msg = "人员注册保存成功";
             }
             else {
@@ -106,6 +105,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -120,6 +120,7 @@
     public Map<String, Object> getInPgPerson() throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<>();
         try {
@@ -127,11 +128,15 @@
             if (pgInPgInfoDtoList == null || pgInPgInfoDtoList.size() == 0)
                 msg = "没有找到入廊人员信息";
             else
+            {
+                code="200";
                 msg = "入廊人员信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "入廊人员信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
         return resultMap;
@@ -146,18 +151,22 @@
     public Map<String, Object> getInPgPersonInPg() throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
 
-        List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<PgInPgInfoDto>();
+        List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<>();
         try {
             pgInPgInfoDtoList = pgInPgPersonManager.getPgInPersonList(1);
             if (pgInPgInfoDtoList == null || pgInPgInfoDtoList.size() == 0)
                 msg = "没有找到入廊人员信息";
-            else
+            else {
+                code="200";
                 msg = "入廊人员信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "入廊人员信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
         return resultMap;
@@ -172,6 +181,7 @@
     public Map<String, Object> getInPgPersonByName(@FormParam("userName") String userName) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
 
         PgInPgPerson pgInPgPerson = null;
         PgInPgPersonDto pgInPgPersonDto=null;
@@ -184,12 +194,13 @@
                 pgInPgPersonDto=new PgInPgPersonDto(pgInPgPerson);
                 pgInPgPersonDtoList.add(pgInPgPersonDto);
                 msg = "人员信息获取成功";
+                code="200";
             }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "人员信息获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgPersonDtoList);
         return resultMap;
@@ -206,6 +217,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             PgInPgPerson pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName);
@@ -221,6 +233,7 @@
                     pgInPgPersonManager.save(pgInPgPerson);
                     result = "true";
                     msg = "编辑成功";
+                    code="200";
                 }
             }
         } catch (Exception e) {
@@ -228,9 +241,9 @@
             msg = "编辑失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -244,10 +257,12 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         int inPgNum=0;
         String msg = "";
+        String code="0";
 
         try{
             inPgNum=pgInPgStatusManager.getInPgNum();
 
+            code="200";
             msg="人员入廊次数获取成功";
         }
         catch(Exception e)
@@ -255,6 +270,7 @@
             e.printStackTrace();
             msg="人员入廊次数获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",inPgNum);
 
@@ -272,18 +288,22 @@
                                                    @FormParam("statisticType") String statisticType) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
 
         List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<PgInPgInfoDto>();
         try {
             pgInPgInfoDtoList = pgInPgPersonManager.getPgInPersonListByTime(startTime, endTime, statisticType);
             if(pgInPgInfoDtoList==null)
                 msg="入廊人员统计信息获取失败";
-            else
-                msg="入廊人员统计信息获取成功";
+            else {
+                code="200";
+                msg = "入廊人员统计信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "入廊人员统计信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
         return resultMap;
@@ -296,6 +316,7 @@
 
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
 
         try {
@@ -304,8 +325,10 @@
                 pgDeviceDtoList=pgDeviceManager.getPgCameraListByPosition("",apCodeStr);
                 if(pgDeviceDtoList==null)
                     msg="不存在关联摄像机";
-                else
-                    msg="关联摄像机获取成功";
+                else {
+                    code="200";
+                    msg = "关联摄像机获取成功";
+                }
             } else {
                 msg="请输入Ap编号";
             }
@@ -315,6 +338,7 @@
             msg="关联摄像机获取成功";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgDeviceDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java
index 507b3fe..b43f077 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java
@@ -34,6 +34,7 @@
 
         String result="";
         String msg="";
+        String code="";
         try{
             PgInPgStatus pgInPgStatus=new PgInPgStatus();
 
@@ -44,6 +45,7 @@
             pgInPgStatusManager.save(pgInPgStatus);
             msg="入廊时间提交成功";
             result="true";
+            code="200";
         }
         catch (Exception e){
             e.printStackTrace();
@@ -51,6 +53,7 @@
             result="false";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -66,6 +69,7 @@
 
         String result="";
         String msg="";
+        String code="0";
         try{
             PgInPgPerson pgInPgPerson=pgInPgPersonManager.getPgInPgPersonByAssetCode(assetCode);
 
@@ -79,6 +83,7 @@
             pgInPgStatusManager.save(pgInPgStatus);
 
             msg="出廊时间提交成功";
+            code="200";
             result="true";
         }
         catch (Exception e){
@@ -87,6 +92,7 @@
             result="false";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
index 9def330..9c0ba1f 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
@@ -33,17 +33,20 @@
                                             @FormParam("existNum") String existNum) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         String result="";
 
         try {
             pgIntelPlanManager.savePgIntelPlan(parName,lineName,maxNum,existNum);
             msg="规划数据保存成功";
+            code="200";
             result="true";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "规划数据保存失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
@@ -55,15 +58,18 @@
     public Map<String, Object> getIntelLineType() throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgIntelPlanTypeDto> pgIntelPlanTypeDtoList=new ArrayList<>();
         try {
             pgIntelPlanTypeDtoList=pgIntelPlanManager.getIntelPlanType();
+            code="200";
             msg="获取排线类型成功";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "获取排线类型失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgIntelPlanTypeDtoList);
         return resultMap;
@@ -76,6 +82,7 @@
                                             @FormParam("partitionStr") String partitionStr) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgIntelPlanDto> pgIntelPlanDtoList = new ArrayList<>();
 
@@ -83,8 +90,10 @@
             pgIntelPlanDtoList = pgIntelPlanManager.getPgIntelPlanListByPartion(lineName, partitionStr);
             if(pgIntelPlanDtoList==null||pgIntelPlanDtoList.size()==0)
                 msg="请输入正确的规划参数";
-            else
-                msg="规划数据获取成功";
+            else {
+                code="200";
+                msg = "规划数据获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "规划数据获取失败";
@@ -103,10 +112,12 @@
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
         String result="";
+        String code="0";
 
         try {
             boolean bl=pgIntelPlanManager.addLineUse(lineName,partitionStr,num);
             if(bl){
+                code="200";
                 msg="排线入廊成功";
                 result="true";
             }
@@ -119,6 +130,7 @@
             msg = "排线入廊失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
@@ -132,6 +144,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
         String result="";
+        String code="0";
 
         try {
             PgIntelPlan pgIntelPlan=pgIntelPlanManager.getPgIntelPlanByParNameAndLine(lineName,parName);
@@ -140,11 +153,13 @@
             pgIntelPlanManager.save(pgIntelPlan);
             msg="规划数据删除成功";
             result="true";
+            code="200";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "规划数据删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java b/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java
index 378af00..9c39523 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java
@@ -1,5 +1,6 @@
 package com.casic.PgInterface.rs;
 
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
 import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
 import com.casic.PgInterface.intelPlan.dto.PgLineHoleDTO;
 import com.casic.PgInterface.intelPlan.manager.PgLineHoleManager;
@@ -27,6 +28,9 @@
     @Resource
     private PgPileAcuManager pgPileAcuManager;
 
+    @Resource
+    private PgRoadManager pgRoadManager;
+
     @POST
     @Path("getPgLineAcuHole")
     @Produces(MediaType.APPLICATION_JSON)
@@ -34,23 +38,32 @@
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
         String result="";
+        String code="0";
         List<PgLineHoleDTO> pgLineHoleDTOList=new ArrayList<>();
 
         try {
             PgPileAcu pgPileAcu=pgPileAcuManager.getPgPileAcuByCode(acuCode);
             if(pgPileAcu==null){
                 msg="不存在分区";
-            }else{
-                pgLineHoleDTOList=pgLineHoleManager.getCurrentHoleByAcu(pgPileAcu.getId());
-                if(pgLineHoleDTOList!=null&&pgLineHoleDTOList.size()!=0)
-                    msg="获取成功";
-                else
-                    msg="未找到入廊数据";
+            }else {
+                pgLineHoleDTOList = pgLineHoleManager.getCurrentHoleByAcu(pgPileAcu.getId());
+                if (pgLineHoleDTOList != null && pgLineHoleDTOList.size() != 0)
+                {
+                    code="200";
+                    msg = "获取成功";
+                }
+                else {
+                    PgLineHoleDTO pgLineHoleDTO=new PgLineHoleDTO();
+                    pgLineHoleDTO.setRoad(pgRoadManager.get(pgPileAcu.getRoadId()).getRoadName());
+                    pgLineHoleDTOList.add(pgLineHoleDTO);
+                    msg = "未找到入廊数据";
+                }
             }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgLineHoleDTOList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgLogRs.java b/src/main/java/com/casic/PgInterface/rs/PgLogRs.java
index 39cff52..30db63b 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgLogRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgLogRs.java
@@ -45,6 +45,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         PgLog pgLog=new PgLog();
         try {
             PgUser pgUser = new PgUser();
@@ -60,14 +61,15 @@
             pgLogManager.save(pgLog);
             result = "true";
             msg = "保存成功";
-
+            code="200";
         } catch (Exception e) {
             result = "false";
             msg = "保存失败";
             e.printStackTrace();
         }
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -83,17 +85,21 @@
             throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgLogDto> pgLogDtoList = new ArrayList<PgLogDto>();
         try {
             pgLogDtoList = pgLogManager.getAllLogs(userName, startTime, endTime);
             if (pgLogDtoList == null || pgLogDtoList.size() == 0)
                 msg = "没有找到日志信息";
-            else
+            else {
+                code="200";
                 msg = "日志信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "日志信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgLogDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java
index 9fd0a5f..37b72f6 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java
@@ -36,19 +36,23 @@
         Map<String,Object> resultMap=new HashMap<>();
 
         String msg = "";
+        String code="0";
         List<PgMaintainType> pgMaintainTypeList=new ArrayList<>();
         try{
             pgMaintainTypeList=pgMaintainTypeManager.getMaintainType();
             if(pgMaintainTypeList!=null&&pgMaintainTypeList.size()!=0)
                 msg="不存在运维类别";
-            else
-                msg="运维类别获取成功";
+            else {
+                code="200";
+                msg = "运维类别获取成功";
+            }
         }
         catch(Exception ex)
         {
             ex.printStackTrace();
             msg="运维类别获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgMaintainTypeList);
 
@@ -65,10 +69,11 @@
         Map<String,Object> resultMap=new HashMap<>();
 
         String msg = "";
+        String code="0";
         List<PgMaintainTypeDto> pgMaintainTypeDtoList=new ArrayList<PgMaintainTypeDto>();
         try{
             pgMaintainTypeDtoList=pgMaintainTypeManager.getMaintainTypeModel(type);
-
+            code="200";
             msg="维护类型获取成功";
         }
         catch(Exception ex)
@@ -77,9 +82,9 @@
             msg="维护类型获取失败";
         }
 
-        resultMap.put("result",pgMaintainTypeDtoList);
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgMaintainTypeDtoList);
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java
index d735cc9..82ffca4 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java
@@ -33,12 +33,16 @@
                                                  @FormParam("endTime") String endTime){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
         List<PgMaintanceRecordHeadDto> pgMaintanceRecordHeadDtoList=new ArrayList<>();
         try{
             pgMaintanceRecordHeadDtoList=pgMaintanceRecordHeadManager.getPgMaintanceRecordHeadLsit(repairMan,startTime,endTime);
             if(pgMaintanceRecordHeadDtoList!=null&&pgMaintanceRecordHeadDtoList.size()!=0)
+            {
+                code="200";
                 msg="维护信息获取成功";
+            }
             else
                 msg="不存在维护信息";
         }
@@ -47,6 +51,7 @@
             msg="巡检信息获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgMaintanceRecordHeadDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java
index effc9df..9f46fc8 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java
@@ -32,12 +32,16 @@
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
         String result="";
+        String code="0";
 
         List<PgMaintanceRecordHeadStatic> pgMaintanceRecordHeadStaticList=new ArrayList<>();
         try{
             pgMaintanceRecordHeadStaticList=pgMaintanceRecordHeadManager.getPgMaintanceRecordHeadStaticLisByTime(startTime,endTime,staticType);
             if(pgMaintanceRecordHeadStaticList!=null&&pgMaintanceRecordHeadStaticList.size()!=0)
+            {
+                code="200";
                 msg="维护统计信息获取成功";
+            }
             else
                 msg="维护统计失败";
         }
@@ -46,7 +50,7 @@
             ex.printStackTrace();
             msg="统计失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgMaintanceRecordHeadStaticList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java b/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java
index 3a67bf3..6a5f4dc 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java
@@ -39,27 +39,31 @@
     @Path("getO2InfoByDevAndDate")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getO2InfoByDevAndDate(@FormParam("assetCode") String assetCode,
-                                                      @FormParam("startDate") String startDate,
-                                                      @FormParam("endDate") String endDate)throws Exception {
+                                                     @FormParam("startDate") String startDate,
+                                                     @FormParam("endDate") String endDate)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgHistoryDataDto> pgHistoryDataDtoList=new ArrayList<>();
 
         try {
             PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
                 msg="设备不存在";
-            else{
-                pgHistoryDataDtoList=pgO2Manager.getAllO2Data(pgDevice, startDate, endDate);
-                if(pgHistoryDataDtoList==null)
-                    msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+            else {
+                pgHistoryDataDtoList = pgO2Manager.getAllO2Data(pgDevice, startDate, endDate);
+                if (pgHistoryDataDtoList == null)
+                    msg = "没有满足要求的数据";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgHistoryDataDtoList);
         return resultMap;
@@ -75,23 +79,27 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         PgO2Dto pgO2Dto=new PgO2Dto(null);
 
         try {
             PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
                 msg="设备不存在";
-            else{
-                pgO2Dto=pgO2Manager.getNewestO2Data(pgDevice);
-                if(pgO2Dto==null)
-                    msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+            else {
+                pgO2Dto = pgO2Manager.getNewestO2Data(pgDevice);
+                if (pgO2Dto == null)
+                    msg = "没有满足要求的数据";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgO2Dto);
         return resultMap;
@@ -104,11 +112,12 @@
     @Path("addO2Data")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> addO2Data(@FormParam("devCode") String devCode,
-                                          @FormParam("upTime") String upTime,
-                                          @FormParam("o2") String o2)throws Exception {
+                                         @FormParam("upTime") String upTime,
+                                         @FormParam("o2") String o2)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
@@ -125,6 +134,7 @@
                 pgO2.setPgDeviceId(pgDevice);
 
                 pgO2Manager.save(pgO2);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -133,9 +143,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java b/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java
index 6217cde..70b3b41 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java
@@ -30,8 +30,6 @@
 public class PgOverViewRs {
 
     @Resource
-    private PgInPgPersonManager pgInPgPersonManager;
-    @Resource
     private PgInPgStatusManager pgInPgStatusManager;
     @Resource
     private PgAlarmManager pgAlarmManager;
@@ -46,18 +44,21 @@
     @Path("getPersonNumInPgByMonth")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<Object, String> getMonthInPgPersonNum() throws Exception {
-        Map<Object, String> resultMap = new HashMap<Object, String>();
+        Map<Object, String> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         int inNum = 0;
 
         try {
             inNum = pgInPgStatusManager.getMonthInPgPersonNum();
+            code="200";
             msg = "本月入廊人员次数获取成功";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "本月入廊人员次数获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", String.valueOf(inNum));
 
@@ -73,15 +74,18 @@
     public Map<Object, String> getWeekInPgPersonNum() throws Exception {
         Map<Object, String> resultMap = new HashMap<Object, String>();
         String msg = "";
+        String code="0";
         int inNum = 0;
         try {
             inNum = pgInPgStatusManager.getWeekInPgPersonNum();
+            code="200";
             msg = "本周入廊人员次数获取成功";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "本周入廊人员次数获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", String.valueOf(inNum));
 
@@ -97,19 +101,22 @@
     public Map<String, Object> getDayInPgStatistic() throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<>();
         try {
             pgInPgInfoDtoList = pgInPgStatusManager.getPgInPersonListByDay();
             if (pgInPgInfoDtoList == null)
                 msg = "信息获取失败";
-            else
+            else {
+                code="200";
                 msg = "信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "信息获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
         return resultMap;
@@ -124,18 +131,23 @@
     public Map<String, Object> getTodayInPgInfo() throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
 
         List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<PgInPgInfoDto>();
         try {
             pgInPgInfoDtoList = pgInPgStatusManager.getTodayInPgInfo();
             if(pgInPgInfoDtoList!=null||pgInPgInfoDtoList.size()!=0)
+            {
+                code="200";
                 msg = "信息获取成功";
+            }
             else
                 msg="当天没有入廊人员信息";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
 
@@ -149,18 +161,22 @@
     public Map<String, Object> getAlarmNum(@FormParam("isDevFault") String isDevFault) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         int num = 0;
 
         try {
             if(isDevFault!=null){
                 num = pgAlarmManager.getAlarmNum(isDevFault);
-                msg = "报警数量获取成功";}
+                msg = "报警数量获取成功";
+                code="200";
+            }
             else
                 msg="请输入统计参数";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警数量统计失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", num);
 
@@ -176,16 +192,18 @@
     public Map<Object, String> getMonthAlarmNum(@FormParam("isDevFault") String isDevFault) throws Exception {
         Map<Object, String> resultMap = new HashMap<Object, String>();
         String msg = "";
+        String code="0";
         int inNum = 0;
 
         try {
-                inNum = pgAlarmManager.getMonthAlarmNum(isDevFault);
-                msg = "报警次数获取成功";
+            inNum = pgAlarmManager.getMonthAlarmNum(isDevFault);
+            code="200";
+            msg = "报警次数获取成功";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警次数获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", String.valueOf(inNum));
 
@@ -201,15 +219,17 @@
     public Map<Object, String> getWeekAlarmNum(@FormParam("isDevFault") String isDevFault) throws Exception {
         Map<Object, String> resultMap = new HashMap<Object, String>();
         String msg = "";
+        String code="0";
         int inNum = 0;
         try {
             inNum = pgAlarmManager.getWeekAlarmNum(isDevFault);
+            code="200";
             msg = "报警次数获取成功";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警次数获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", String.valueOf(inNum));
 
@@ -225,14 +245,17 @@
     public Map<String, Object> getDayAlarmStatistic() throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgAlarmTjDto> pgAlarmTjDtoList = new ArrayList<PgAlarmTjDto>();
         try {
             pgAlarmTjDtoList = pgAlarmManager.getDayAlarmStatistic();
             if (pgAlarmTjDtoList == null)
                 msg = "信息获取失败";
-            else
+            else {
+                code="200";
                 msg = "信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "信息获取失败";
@@ -252,9 +275,11 @@
     public Map<String, Object> getAlarmList(@FormParam("isDevFault") String isDevFault) throws Exception{
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         List<PgAlarmDto> pgAlarmDtoList=new ArrayList<>();
         try{
             pgAlarmDtoList=pgAlarmManager.getAlarmList(isDevFault);
+            code="200";
             msg="信息获取成功";
         }
         catch(Exception e)
@@ -262,6 +287,7 @@
             e.printStackTrace();
             msg="信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAlarmDtoList);
 
@@ -278,17 +304,19 @@
     public Map<String,Object> getConstructionNum() throws Exception{
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgConstructionTypeNumStatisticDto> pgConstructionTypeNumDtoList=new ArrayList<PgConstructionTypeNumStatisticDto>();
         try{
             pgConstructionTypeNumDtoList=pgConstructionManager.getConstructionNum();
             msg="施工数量获取成功";
+            code="200";
         }
         catch(Exception e)
         {
             e.printStackTrace();
             msg="施工数量统计";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionTypeNumDtoList);
 
@@ -302,21 +330,25 @@
     @Path("getConstructionToday")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> getConstructionToday() throws Exception{
-        Map<String,Object > resultMap = new HashMap<String,Object>();
+        Map<String,Object > resultMap = new HashMap<>();
         String msg = "";
-        List<PgConstructionDto> pgConstructionDtoList=new ArrayList<PgConstructionDto>();
+        String code="0";
+        List<PgConstructionDto> pgConstructionDtoList=new ArrayList<>();
         try {
             pgConstructionDtoList = pgConstructionManager.getConstructionToday();
-            if (pgConstructionDtoList == null&&pgConstructionDtoList.size()==0)
+            if (pgConstructionDtoList == null && pgConstructionDtoList.size() == 0)
                 msg = "不存在施工信息";
-            else
+            else {
+                code="200";
                 msg = "施工信息获取成功";
+            }
         }
         catch(Exception e)
         {
             e.printStackTrace();
             msg="施工信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java b/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java
index d3c10d4..31ffcfc 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java
@@ -48,6 +48,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 
         try {
@@ -66,9 +67,9 @@
                 pgPartition.setMaterial(material);
                 pgPartition.setActive(1);
 
-                logger.info("成功保存");
                 pgPartitionManager.save(pgPartition);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
         } catch (Exception e) {
@@ -76,9 +77,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
         return resultMap;
     }
     /*
@@ -100,6 +101,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         PgPartition partition = new PgPartition();
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
@@ -122,6 +124,7 @@
 
                 pgPartitionManager.save(pgPartition);
                 result = "true";
+                code="200";
                 msg = "编辑成功";
             }
 
@@ -131,8 +134,10 @@
             e.printStackTrace();
         }
 
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
+
         return resultMap;
     }
 
@@ -147,7 +152,8 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
-        String result="false";
+        String result="";
+        String code="0";
 
         try {
             PgPartition pgPartition=pgPartitionManager.get(Long.valueOf(id));
@@ -161,12 +167,14 @@
                 pgPartitionManager.save(pgPartition);
                 msg="分区删除成功";
                 result="true";
+                code="200";
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="分区删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -181,14 +189,17 @@
     public Map<String, Object> getPartition() throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgPartitionDto> pgPartitionDtoList = new ArrayList<PgPartitionDto>();
         try {
             pgPartitionDtoList = pgPartitionManager.getPgPartitionDtoList();
+            code="200";
             msg = "获取成功";
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgPartitionDtoList);
         return resultMap;
@@ -203,14 +214,17 @@
     public Map<String, Object> getPartitionListByName(@FormParam("parName") String parName) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgPartitionDto> pgPartitionDtoList = new ArrayList<PgPartitionDto>();
         try {
             pgPartitionDtoList = pgPartitionManager.getPartitionByName(parName);
+            code="200";
             msg = "获取成功";
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgPartitionDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java b/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java
index 883adf9..cf81b72 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java
@@ -37,6 +37,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
         PgRoad pgRoad=pgRoadManager.getPgRoadByName(road);
         try {
             PgPileAcu pgPileAcu=new PgPileAcu();
@@ -49,6 +50,7 @@
             pgPileAcu.setActive(true);
 
             pgPileAcuManager.save(pgPileAcu);
+            code="200";
             result="true";
             msg="保存成功";
         } catch (Exception e) {
@@ -56,9 +58,10 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
+
         return resultMap;
     }
 
@@ -73,6 +76,7 @@
 
         String result="";
         String msg="";
+        String code="0";
         try{
             PgPileAcu pgPileAcu=pgPileAcuManager.get(id);
             if(pgPileAcu==null){
@@ -83,7 +87,7 @@
             {
                 pgPileAcu.setActive(false);
                 pgPileAcuManager.save(pgPileAcu);
-
+                code="200";
                 result="true";
                 msg="桩号删除成功";
             }
@@ -94,8 +98,9 @@
             ex.printStackTrace();
         }
 
-        resultMap.put("result",result);
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
+        resultMap.put("result",result);
 
         return resultMap;
     }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPileRs.java b/src/main/java/com/casic/PgInterface/rs/PgPileRs.java
index cf62954..c9999ac 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgPileRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgPileRs.java
@@ -33,6 +33,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             PgPile pgPile=new PgPile();
@@ -40,6 +41,7 @@
             pgPile.setActive(true);
 
             pgPileManager.save(pgPile);
+            code="200";
             result="true";
             msg="保存成功";
         } catch (Exception e) {
@@ -47,9 +49,10 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
+
         return resultMap;
     }
 
@@ -64,9 +67,10 @@
         Map<String,Object> resultMap=new HashMap<>();
         List<PgPileDTO> pgPileDTOList=new ArrayList<>();
         String msg="";
+        String code="0";
         try{
             pgPileDTOList=pgPileManager.getPgPileDTOList();
-
+            code="200";
             msg="获取成功";
         }
         catch(Exception ex){
@@ -74,8 +78,9 @@
             msg="获取成失败";
             ex.printStackTrace();
         }
-        resultMap.put("result",pgPileDTOList);
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
+        resultMap.put("result",pgPileDTOList);
 
         return resultMap;
     }
@@ -91,6 +96,7 @@
 
         String result="";
         String msg="";
+        String code="0";
         try{
             PgPile pgPile=pgPileManager.get(id);
             if(pgPile==null){
@@ -101,7 +107,7 @@
             {
                 pgPile.setActive(false);
                 pgPileManager.save(pgPile);
-
+                code="200";
                 result="true";
                 msg="桩号删除成功";
             }
@@ -111,9 +117,9 @@
             msg="桩号删除失败";
             ex.printStackTrace();
         }
-
-        resultMap.put("result",result);
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
+        resultMap.put("result",result);
 
         return resultMap;
     }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
index 6ee63ff..63b5597 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
@@ -53,10 +53,12 @@
         try {
                resultMap = pgPipeLineManager.addPipeLine(lineCode,lineType,secRow,secColumn,pileAcuList);
                resultMap.put("msg","提交成功");
+               resultMap.put("code","200");
                resultMap.put("result","true");
 
         } catch (Exception e) {
             e.printStackTrace();
+            resultMap.put("code","0");
             resultMap.put("result","false");
             resultMap.put("msg","提交失败");
             return  resultMap;
@@ -74,14 +76,17 @@
     public Map<String, Object> getPipeLineByLineType(@FormParam("lineType") String lineType) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgPipeLineDto> pgPipeLineDtoList=new ArrayList<PgPipeLineDto>();
         try {
             pgPipeLineDtoList = pgPipeLineManager.getPipeLineByLineType(lineType);
+            code="200";
             msg = "获取成功";
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgPipeLineDtoList);
         return resultMap;
@@ -96,6 +101,7 @@
     public Map<String, Object> getPipeLineByName(@FormParam("lineCode") String lineCode) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         PgPipeLineDto pgPipeLineDto=null;
         try {
             PgPipeLine pgPipeLine = pgPipeLineManager.getPipeLineBylineName(lineCode);
@@ -103,12 +109,14 @@
                 msg="不存在："+lineCode;
             else {
                 pgPipeLineDto = new PgPipeLineDto(pgPipeLine);
+                code="200";
                 msg = "获取成功";
             }
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgPipeLineDto);
         return resultMap;
@@ -123,15 +131,18 @@
     public Map<String,Object> getPipeLengthStatic()throws Exception{
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         List<PgPipeLineLengthStatic> pgPipeLineLengthStaticList=new ArrayList<PgPipeLineLengthStatic>();
         try {
             pgPipeLineLengthStaticList = pgPipeLineManager.getPipeLengthByName();
+            code="200";
             msg="管线长度获取成功";
         }catch(Exception e)
         {
             e.printStackTrace();
             msg="管线长度统计失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgPipeLineLengthStaticList);
 
@@ -147,14 +158,17 @@
     public Map<String, Object> getPipeLineType() throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgPipeLineTypeDto> pgPipeLineTypeDtoList=new ArrayList<PgPipeLineTypeDto>();
         try {
             pgPipeLineTypeDtoList = pgPipeLineManager.getPipeType();
+            code="200";
             msg = "获取成功";
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgPipeLineTypeDtoList);
         return resultMap;
@@ -170,20 +184,24 @@
         Map<String,Object> resultMap=new HashMap<String, Object>();
 
         String msg="";
+        String code="0";
         List<PgPipeLineTypeNumDto> pgPipeLineTypeNumDtoList=new ArrayList<PgPipeLineTypeNumDto>();
 
-        try{
-            pgPipeLineTypeNumDtoList=pgPipeLineManager.getPipeTypeNum();
+        try {
+            pgPipeLineTypeNumDtoList = pgPipeLineManager.getPipeTypeNum();
 
-            if(pgPipeLineTypeNumDtoList==null)
-                msg="不存在管线类型占比";
-            else
-                msg="管线占比获取成功";
+            if (pgPipeLineTypeNumDtoList == null)
+                msg = "不存在管线类型占比";
+            else {
+                code="200";
+                msg = "管线占比获取成功";
+            }
         }
         catch (Exception e){
             msg="管线占比数量获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgPipeLineTypeNumDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java
index 672b376..7042994 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java
@@ -43,17 +43,21 @@
     public Map<String,Object> getReservePlan() {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgReservePlanDto> pgReservePlanDtoList = new ArrayList<PgReservePlanDto>();
         try {
             pgReservePlanDtoList = pgReservePlanManager.getPgReservePlanDto();
             if (pgReservePlanDtoList == null)
                 msg = "不存在预案信息";
-            else
+            else {
+                code="200";
                 msg = "预案信息获取成功";
-        } catch (Exception e) {
+            }
+        }catch (Exception e) {
             e.printStackTrace();
             msg = "预案信息获取是失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgReservePlanDtoList);
         return resultMap;
@@ -66,6 +70,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
 
         String msg = "";
+        String code="0";
         ResponseEntity<byte[]> path = null;
         try {
             PgReservePlan pgReservePlan = pgReservePlanManager.get(Long.valueOf(id));
@@ -73,15 +78,17 @@
 
             if (path == null)
                 msg = "不存在该文档";
-            else
+            else {
+                code="200";
                 msg = "下载成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "下载失败";
         }
-
-        resultMap.put("result", path.getBody());
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", path.getBody());
         return resultMap;
     }
     /*
@@ -99,6 +106,7 @@
         Map<String,Object> resultMap=new HashMap<String, Object>();
         String msg="";
         String result="";
+        String code="0";
 
         try {
             PgReservePlan pgReservePlan = new PgReservePlan();
@@ -124,6 +132,7 @@
                 pgReservePlanManager.save(pgReservePlan);
                 msg = "新增成功";
                 result = "true";
+                code="200";
             }
         }
         catch(Exception e)
@@ -133,6 +142,7 @@
             result="false";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -152,6 +162,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             PgReservePlan pgReservePlan=pgReservePlanManager.get(Long.valueOf(id));
@@ -177,6 +188,7 @@
 
                     pgReservePlanManager.save(pgReservePlan);
 
+                    code="200";
                     result = "true";
                     msg = "编辑成功";
                 }
@@ -187,6 +199,7 @@
             msg = "编辑失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -201,6 +214,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
         String result="";
+        String code="0";
 
         try{
 
@@ -214,6 +228,7 @@
                 pgReservePlan.setActive(0);;
                 pgReservePlanManager.save(pgReservePlan);
                 result="true";
+                code="200";
                 msg="删除成功";
             }
         }
@@ -224,6 +239,7 @@
             result="false";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java b/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java
index 8f049c8..3c48a8d 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java
@@ -42,19 +42,22 @@
         Map<String,Object> resultMap=new HashMap<String, Object>();
 
         String msg="";
+        String code="0";
         List<PgRoadDto> pgRoadDtoList=new ArrayList<PgRoadDto>();
-        try{
+        try {
             pgRoadDtoList = pgRoadManager.getAllRoad();
             if (pgRoadDtoList.size() == 0)
                 msg = "没有道路信息";
-            else
+            else {
+                code="200";
                 msg = "道路信息获取成功";
+            }
         }
         catch(Exception e){
             msg="道路信息获取失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgRoadDtoList);
 
@@ -71,6 +74,7 @@
         Map<String,Object> resultMap=new HashMap<String, Object>();
         String msg="";
         String result="";
+        String code="0";
 
         try{
             PgRoad pgRoad=new PgRoad();
@@ -78,7 +82,7 @@
             pgRoad.setActive(1);
 
             pgRoadManager.save(pgRoad);
-
+            code="200";
             msg="新增道路成功";
             result="true";
         }
@@ -87,7 +91,7 @@
             result="true";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -107,6 +111,7 @@
 
         String msg="";
         String result="";
+        String code="0";
 
         try {
             PgRoad pgRoad=pgRoadManager.get(Long.valueOf(id));
@@ -123,6 +128,7 @@
                 pgRoadManager.save(pgRoad);
                 msg="道路信息保存成功";
                 result="true";
+                code="200";
             }
         }
         catch(Exception e){
@@ -130,6 +136,7 @@
             result="false";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -147,6 +154,7 @@
 
         String msg="";
         String result="";
+        String code="0";
         PgRoad pgRoad=null;
 
         try{
@@ -159,6 +167,7 @@
                 pgRoad.setActive(0);
                 pgRoadManager.save(pgRoad);
                 msg="道路删除成功";
+                code="200";
                 result="true";
             }
         }
@@ -168,6 +177,7 @@
             e.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -184,26 +194,29 @@
         Map<String,Object> resultMap=new HashMap<String, Object>();
         String msg="";
         String result="";
+        String code="0";
 
         List<PgPartitionDto> pgPartitionDtoList=null;
         try{
             PgRoad pgRoad=pgRoadManager.getPgRoadByName(roadName);
             if(pgRoad==null)
                 msg="不存在道路信息";
-            else
-            {
-                pgPartitionDtoList=pgPartitionManager.getPgPartitonDtoByRoad(pgRoad);
-                if(pgPartitionDtoList==null||pgPartitionDtoList.size()==0)
-                    msg="该道路没有分区信息";
-                else
-                    msg="分区信息获取成功";
+            else {
+                pgPartitionDtoList = pgPartitionManager.getPgPartitonDtoByRoad(pgRoad);
+                if (pgPartitionDtoList == null || pgPartitionDtoList.size() == 0)
+                    msg = "该道路没有分区信息";
+                else {
+                    code="200";
+                    msg = "分区信息获取成功";
+                }
             }
         }
         catch (Exception e)
         {
+            e.printStackTrace();
             msg="分区信息获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgPartitionDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java b/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java
index 90d709a..7a713bf 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java
@@ -42,17 +42,21 @@
     public Map<String,Object> getRoleList() {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgRoleDto> pgRoleDtoList = new ArrayList<PgRoleDto>();
         try {
             pgRoleDtoList = pgRoleManager.getPgRoleDtoList();
             if (pgRoleDtoList == null)
                 msg = "不存在角色信息";
-            else
+            else {
+                code="200";
                 msg = "角色信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "角色信息获取是失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgRoleDtoList);
         return resultMap;
@@ -69,6 +73,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try{
             PgAuthority pgAuthority=pgAuthorityManager.getAuthorityByAuthority(authority);
@@ -79,6 +84,7 @@
 
             pgRoleManager.save(pgRole);
             msg="用户角色保存成功";
+            code="200";
             result="true";
         }
         catch(Exception e) {
@@ -86,6 +92,7 @@
             msg = "新增角色失败";
             result = "false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -104,6 +111,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         try {
             PgRole pgRole = pgRoleManager.get(Long.valueOf(id));
 
@@ -112,6 +120,7 @@
             pgRole.setPgAuthorityId(pgAuthority);
             pgRoleManager.save(pgRole);
 
+            code="200";
             msg="角色保存成功";
             result="true";
         }
@@ -122,6 +131,7 @@
             result="false";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -138,7 +148,8 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
-        String result="false";
+        String result="";
+        String code="0";
 
         try {
             PgRole pgRole= pgRoleManager.get(Long.valueOf(id));
@@ -152,12 +163,14 @@
                 pgRoleManager.save(pgRole);
                 msg="删除角色成功";
                 result="true";
+                code="200";
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="删除角色失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java b/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java
index 0e413b8..d146811 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java
@@ -38,6 +38,7 @@
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
         String result="";
+        String code="0";
         PgRoad pgRoad=pgRoadManager.getPgRoadByName(road);
 
         try{
@@ -55,13 +56,14 @@
             pgSectionManager.save(pgSection);
             msg="截面信息保存成功";
             result="true";
+            code="200";
         }
         catch(Exception ex){
             msg="界面信息保存失败";
             result="false";
             ex.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -77,6 +79,7 @@
 
         String msg="";
         String result="";
+        String code="0";
 
         try{
             PgSection pgSection=pgSectionManager.get(id);
@@ -84,6 +87,7 @@
             pgSection.setActive(false);
             pgSectionManager.save(pgSection);
 
+            code="200";
             msg="截面删除成功";
             result="true";
         }
@@ -92,7 +96,7 @@
             result="false";
             ex.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -107,16 +111,19 @@
         Map<String,Object> resultMap=new HashMap<>();
         List<PgLineType> pgLineTypeList=new ArrayList<>();
         String msg="";
+        String code="0";
 
         try{
             pgLineTypeList=pgSectionManager.getLineType();
             msg="获取成功";
+            code="200";
         }
         catch(Exception ex){
             ex.printStackTrace();
             msg="获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgLineTypeList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgShRs.java b/src/main/java/com/casic/PgInterface/rs/PgShRs.java
index 1e35f4b..323c82f 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgShRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgShRs.java
@@ -45,23 +45,27 @@
                                                      @FormParam("endDate") String endDate)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgHistoryDataDto> pgHistoryDataDtoList=new ArrayList<>();
 
         try {
             PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
                 msg="设备不存在";
-            else{
-                pgHistoryDataDtoList=pgShManager.getAllShData(pgDevice, startDate, endDate);
-                if(pgHistoryDataDtoList==null)
-                    msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+            else {
+                pgHistoryDataDtoList = pgShManager.getAllShData(pgDevice, startDate, endDate);
+                if (pgHistoryDataDtoList == null)
+                    msg = "没有满足要求的数据";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgHistoryDataDtoList);
         return resultMap;
@@ -77,23 +81,27 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         PgShDto pgShDto=new PgShDto(null);
 
         try {
             PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
                 msg="设备不存在";
-            else{
-                pgShDto=pgShManager.getNewestShData(pgDevice);
-                if(pgShDto==null)
-                    msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+            else {
+                pgShDto = pgShManager.getNewestShData(pgDevice);
+                if (pgShDto == null)
+                    msg = "没有满足要求的数据";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgShDto);
         return resultMap;
@@ -111,6 +119,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
@@ -128,6 +137,7 @@
 
                 pgShManager.save(pgSh);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
         } catch (Exception e) {
@@ -135,9 +145,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
         return resultMap;
     }
 

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 25ded8a..283d7ab 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,20 +7,56 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" 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/construction/manager/PgCsDocumentManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/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/manager/PgAlarmManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/~$说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/~$说明20191207.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.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$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/接口说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明20191207.docx" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
@@ -51,7 +87,7 @@
         <counts>
           <entry key="class" value="4" />
           <entry key="iml" value="2" />
-          <entry key="java" value="707" />
+          <entry key="java" value="820" />
           <entry key="properties" value="14" />
           <entry key="xml" value="7" />
         </counts>
@@ -60,7 +96,7 @@
         <counts>
           <entry key="CLASS" value="4" />
           <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="707" />
+          <entry key="JAVA" value="820" />
           <entry key="Properties" value="14" />
           <entry key="XML" value="7" />
         </counts>
@@ -68,32 +104,32 @@
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
           <entry key="dummy" value="38" />
-          <entry key="java" value="30161" />
+          <entry key="java" value="40859" />
           <entry key="properties" value="100" />
-          <entry key="txt" value="176" />
+          <entry key="txt" value="186" />
           <entry key="xml" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="30161" />
-          <entry key="PLAIN_TEXT" value="214" />
+          <entry key="JAVA" value="40859" />
+          <entry key="PLAIN_TEXT" value="224" />
           <entry key="Properties" value="100" />
           <entry key="XML" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="48" />
+          <entry key="project.closed" value="51" />
           <entry key="project.open.time.1" value="5" />
           <entry key="project.open.time.12" value="2" />
           <entry key="project.open.time.13" value="1" />
           <entry key="project.open.time.15" value="1" />
           <entry key="project.open.time.16" value="1" />
           <entry key="project.open.time.17" value="1" />
-          <entry key="project.open.time.2" value="1" />
+          <entry key="project.open.time.2" value="2" />
           <entry key="project.open.time.20" value="1" />
-          <entry key="project.open.time.23" value="1" />
+          <entry key="project.open.time.23" value="2" />
           <entry key="project.open.time.24" value="2" />
           <entry key="project.open.time.251" value="1" />
           <entry key="project.open.time.27" value="2" />
@@ -106,8 +142,8 @@
           <entry key="project.open.time.36" value="1" />
           <entry key="project.open.time.37" value="1" />
           <entry key="project.open.time.39" value="2" />
-          <entry key="project.open.time.4" value="2" />
-          <entry key="project.open.time.40" value="1" />
+          <entry key="project.open.time.4" value="3" />
+          <entry key="project.open.time.40" value="2" />
           <entry key="project.open.time.41" value="2" />
           <entry key="project.open.time.42" value="2" />
           <entry key="project.open.time.43" value="2" />
@@ -122,23 +158,25 @@
           <entry key="project.open.time.6" value="3" />
           <entry key="project.open.time.63" value="2" />
           <entry key="project.open.time.64" value="1" />
+          <entry key="project.open.time.66" value="1" />
           <entry key="project.open.time.71" value="2" />
+          <entry key="project.open.time.74" value="1" />
           <entry key="project.open.time.76" value="1" />
           <entry key="project.open.time.8" value="2" />
           <entry key="project.open.time.9" value="1" />
           <entry key="project.open.time.97" value="1" />
-          <entry key="project.opened" value="78" />
+          <entry key="project.opened" value="84" />
         </counts>
       </usages-collector>
     </session>
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+            <state relative-caret-position="396">
+              <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
               <folding>
                 <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
                 <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -147,73 +185,6 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <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="99">
-              <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-              <folding>
-                <element signature="imports" expanded="true" />
-                <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-1170">
-              <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state>
-              <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
-              <folding>
-                <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-                <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="true">
-        <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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-              <folding>
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-                <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>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <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="352">
-              <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -225,18 +196,9 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>inCriteria</find>
-      <find>getPgPlanResulList</find>
-      <find>getPileAcuListByPileAcuStr</find>
-      <find>distinct</find>
-      <find>order</find>
-      <find>canPlanLine</find>
-      <find>isExistLine</find>
-      <find>getPlanResult</find>
       <find>pgPipeLine</find>
       <find>getPipeLineBylineName</find>
       <find>StringU</find>
-      <find>getAllAlarm</find>
       <find>getAlarmList</find>
       <find>getPgInPersonListByDay</find>
       <find>getDayInPgStatistic</find>
@@ -254,7 +216,16 @@
       <find>getPgContructionByNameOrType</find>
       <find>&quot;&quot;,&quot;&quot;,</find>
       <find>getPgContructionDtoByNameOrType</find>
+      <find>addConstruction</find>
+      <find>getPgLineAcuHole</find>
+      <find>getPlanResult</find>
       <find>getConstruction</find>
+      <find>addPipeLine</find>
+      <find>未找到入廊数据</find>
+      <find>getCurrentHoleByAcu</find>
+      <find>getAllAlarm</find>
+      <find>getPgDeviceDtoListByPartition</find>
+      <find>getPgDeviceByDevType</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -263,57 +234,57 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlan.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileHoleManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/planData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/PlanData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
       </list>
     </option>
   </component>
@@ -359,7 +330,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -421,53 +391,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="dto" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="manager" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -479,29 +402,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="rs" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -516,6 +416,7 @@
         </subPane>
       </pane>
       <pane id="Scope" />
+      <pane id="PackagesPane" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -710,7 +611,13 @@
       <workItem from="1574902733573" duration="1829000" />
       <workItem from="1574998240004" duration="7016000" />
       <workItem from="1575247959683" duration="6997000" />
-      <workItem from="1575704345590" duration="40473000" />
+      <workItem from="1575704345590" duration="69381000" />
+      <workItem from="1575869479666" duration="721000" />
+      <workItem from="1575947104878" duration="6101000" />
+      <workItem from="1576128264436" duration="3347000" />
+      <workItem from="1576208571543" duration="22000" />
+      <workItem from="1576227513917" duration="862000" />
+      <workItem from="1576293721220" duration="18246000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -817,11 +724,18 @@
       <option name="project" value="LOCAL" />
       <updated>1575775489149</updated>
     </task>
-    <option name="localTasksCounter" value="16" />
+    <task id="LOCAL-00016" summary="整改施工信息">
+      <created>1575791780774</created>
+      <option name="number" value="00016" />
+      <option name="presentableId" value="LOCAL-00016" />
+      <option name="project" value="LOCAL" />
+      <updated>1575791780774</updated>
+    </task>
+    <option name="localTasksCounter" value="17" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="452131000" />
+    <option name="totallyTimeSpent" value="510338000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -834,9 +748,8 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
-    <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.24205749" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2647504" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -847,7 +760,7 @@
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.3295082" />
       <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.4819672" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.65737706" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.3295082" />
@@ -939,7 +852,8 @@
     <MESSAGE value="重新设计智能规划部分" />
     <MESSAGE value="完成智能规划对接" />
     <MESSAGE value="修改报警统计" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改报警统计" />
+    <MESSAGE value="整改施工信息" />
+    <option name="LAST_COMMIT_MESSAGE" value="整改施工信息" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -951,16 +865,10 @@
           <option name="timeStamp" value="3" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java</url>
-          <line>69</line>
+          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java</url>
+          <line>40</line>
           <properties />
-          <option name="timeStamp" value="21" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java</url>
-          <line>96</line>
-          <properties />
-          <option name="timeStamp" value="38" />
+          <option name="timeStamp" value="122" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
@@ -970,394 +878,452 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <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="2068">
-          <caret line="154" column="35" selection-start-line="154" selection-start-column="35" selection-end-line="154" selection-end-column="35" />
-        </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="3300">
-          <caret line="297" column="22" selection-start-line="297" selection-start-column="22" selection-end-line="297" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/StringUtils.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
-          <caret line="13" column="48" lean-forward="true" selection-start-line="13" selection-start-column="48" selection-end-line="13" selection-end-column="48" />
+          <caret line="11" column="5" selection-start-line="11" selection-start-column="5" selection-end-line="11" selection-end-column="5" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="78" lean-forward="true" selection-start-line="78" selection-end-line="78" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="616">
-          <caret line="41" column="1" selection-start-line="41" selection-start-column="1" selection-end-line="41" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="110">
-          <caret line="12" column="23" selection-start-line="12" selection-start-column="23" selection-end-line="12" selection-end-column="23" />
+        <state relative-caret-position="516">
+          <caret line="114" column="12" selection-start-line="114" selection-start-column="12" selection-end-line="114" selection-end-column="12" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="164">
-          <caret line="56" lean-forward="true" selection-start-line="56" selection-end-line="56" />
+        <state relative-caret-position="418">
+          <caret line="33" column="44" selection-start-line="33" selection-start-column="44" selection-end-line="33" selection-end-column="44" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="258">
-          <caret line="27" column="12" lean-forward="true" selection-start-line="27" selection-start-column="12" selection-end-line="27" selection-end-column="12" />
+        <state relative-caret-position="132">
+          <caret line="11" column="20" lean-forward="true" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="20" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.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="-12">
-          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        <state relative-caret-position="516">
+          <caret line="142" column="54" selection-start-line="142" selection-start-column="54" selection-end-line="142" selection-end-column="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="858">
-          <caret line="55" column="27" lean-forward="true" selection-start-line="55" selection-start-column="27" selection-end-line="55" selection-end-column="27" />
+        <state relative-caret-position="66">
+          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="58">
+          <caret line="18" column="28" selection-start-line="18" selection-start-column="19" selection-end-line="18" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="305">
+          <caret line="24" column="31" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="714">
+          <caret line="58" column="5" lean-forward="true" selection-start-line="58" selection-start-column="5" selection-end-line="58" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="924">
+          <caret line="134" column="92" selection-start-line="134" selection-start-column="92" selection-end-line="134" selection-end-column="92" />
+          <folding>
+            <element signature="method#linkDevice#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkPartitionCamera#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkReservePlan#0;class#PgAlarmLinkRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1066">
+          <caret line="90" lean-forward="true" selection-start-line="90" selection-end-line="90" />
+          <folding>
+            <element signature="method#getTjResultByAlarmType#0;class#PgAlarmTjRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="946">
+          <caret line="148" column="11" lean-forward="true" selection-start-line="148" selection-start-column="11" selection-end-line="148" selection-end-column="11" />
+          <folding>
+            <element signature="method#getAlarmTypeList#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#addAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#editAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#deleteAlarmType#0;class#PgAlarmTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="208">
+          <caret line="46" column="23" lean-forward="true" selection-start-line="46" selection-start-column="23" selection-end-line="46" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="113" column="9" lean-forward="true" selection-start-line="113" selection-start-column="9" selection-end-line="113" selection-end-column="9" />
+          <folding>
+            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
+            <element signature="method#getNewestCh4InfoByDev#0;class#PgCh4Rs#0" />
+            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="145" column="6" lean-forward="true" selection-start-line="145" selection-start-column="6" selection-end-line="145" selection-end-column="6" />
+          <folding>
+            <element signature="method#addAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#editAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#deleteAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#getAuthorityList#0;class#PgAuthorityRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="58" column="1" lean-forward="true" selection-start-line="58" selection-start-column="1" selection-end-line="58" selection-end-column="1" />
+          <folding>
+            <element signature="method#getPgAssetPlanList#0;class#PgAssetPlanRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="370">
+          <caret line="371" column="66" selection-start-line="371" selection-start-column="66" selection-end-line="371" selection-end-column="66" />
+          <folding>
+            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#searchConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionDev#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="139" column="13" lean-forward="true" selection-start-line="139" selection-start-column="13" selection-end-line="139" selection-end-column="13" />
+          <folding>
+            <element signature="method#getCoInfoByDevAndDate#0;class#PgCoRs#0" />
+            <element signature="method#getNewestCoInfoByDev#0;class#PgCoRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="540">
+          <caret line="223" column="5" lean-forward="true" selection-start-line="223" selection-start-column="5" selection-end-line="223" selection-end-column="5" />
+          <folding>
+            <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="682">
+          <caret line="100" lean-forward="true" selection-start-line="100" selection-end-line="100" />
+          <folding>
+            <element signature="method#getDeviceTpeyList#0;class#PgDeviceTypeRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="377">
+          <caret line="225" column="35" selection-start-line="225" selection-start-column="35" selection-end-line="225" selection-end-column="35" />
+          <folding>
+            <element signature="method#addEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#addEquipment#1;class#PgEquipmentRs#0" />
+            <element signature="method#getEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#deleteEquipment#0;class#PgEquipmentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="406">
+          <caret line="109" lean-forward="true" selection-start-line="109" selection-end-line="109" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="154">
+          <caret line="28" column="19" selection-start-line="28" selection-start-column="19" selection-end-line="28" selection-end-column="19" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="748">
-          <caret line="49" column="5" lean-forward="true" selection-start-line="49" selection-start-column="5" selection-end-line="49" selection-end-column="5" />
+        <state relative-caret-position="296">
+          <caret line="161" column="35" selection-start-line="161" selection-start-column="35" selection-end-line="161" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="384">
+          <caret line="99" column="5" lean-forward="true" selection-start-line="99" selection-start-column="5" selection-end-line="99" selection-end-column="5" />
+        </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="362">
+          <caret line="340" column="35" selection-start-line="340" selection-start-column="35" selection-end-line="340" selection-end-column="35" />
+          <folding>
+            <element signature="method#addInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPersonInPg#0;class#PgInPgPersonRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-606">
+          <caret line="76" column="20" lean-forward="true" selection-start-line="76" selection-start-column="20" selection-end-line="76" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="65" column="35" selection-start-line="65" selection-start-column="35" selection-end-line="65" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="101" column="35" selection-start-line="101" selection-start-column="35" selection-end-line="101" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="84" column="35" selection-start-line="84" selection-start-column="35" selection-end-line="84" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="59" lean-forward="true" selection-start-line="59" selection-end-line="59" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="60" column="1" lean-forward="true" selection-start-line="60" selection-start-column="1" selection-end-line="60" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="145" column="35" selection-start-line="145" selection-start-column="35" selection-end-line="145" selection-end-column="35" />
+        </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="274">
+          <caret line="350" column="35" selection-start-line="350" selection-start-column="35" selection-end-line="350" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="121" column="39" selection-start-line="121" selection-start-column="39" selection-end-line="121" selection-end-column="39" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="28" column="8" lean-forward="true" selection-start-line="28" selection-start-column="8" selection-end-line="28" selection-end-column="8" />
+        <state relative-caret-position="340">
+          <caret line="103" selection-start-line="103" selection-end-line="103" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="226" column="35" selection-start-line="226" selection-start-column="35" selection-end-line="226" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="203" column="35" selection-start-line="203" selection-start-column="35" selection-end-line="203" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="241" column="35" selection-start-line="241" selection-start-column="35" selection-end-line="241" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="225" column="1" lean-forward="true" selection-start-line="225" selection-start-column="1" selection-end-line="225" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="176" column="5" lean-forward="true" selection-start-line="176" selection-start-column="5" selection-end-line="176" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="178" column="35" lean-forward="true" selection-start-line="178" selection-start-column="35" selection-end-line="178" selection-end-column="35" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="516">
-          <caret line="94" column="53" selection-start-line="94" selection-start-column="53" selection-end-line="94" selection-end-column="53" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="814">
-          <caret line="52" column="9" lean-forward="true" selection-start-line="52" selection-start-column="9" selection-end-line="52" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="182">
-          <caret line="58" column="12" lean-forward="true" selection-start-line="58" selection-start-column="12" selection-end-line="58" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="34" lean-forward="true" selection-start-line="34" selection-end-line="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="32" lean-forward="true" selection-start-line="32" selection-end-line="32" />
-          <folding>
-            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
-            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="185">
-          <caret line="63" column="13" selection-start-line="63" selection-start-column="13" selection-end-line="63" selection-end-column="13" />
-          <folding>
-            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
-            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
-            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="e#6319#6324#0" />
-            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
-          </folding>
+          <caret line="240" lean-forward="true" selection-start-line="240" selection-end-line="240" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
-          <caret line="58" column="28" lean-forward="true" selection-start-line="58" selection-start-column="28" selection-end-line="58" selection-end-column="28" />
-          <folding>
-            <element signature="method#addTempHumData#0;class#PgTempHumRs#0" />
-          </folding>
+        <state relative-caret-position="340">
+          <caret line="148" column="34" selection-start-line="148" selection-start-column="34" selection-end-line="148" selection-end-column="34" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
+        <state relative-caret-position="458">
+          <caret line="99" column="35" selection-start-line="99" selection-start-column="35" selection-end-line="99" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+        <state relative-caret-position="384">
+          <caret line="145" column="32" lean-forward="true" selection-start-line="145" selection-start-column="32" selection-end-line="145" selection-end-column="32" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="414">
-          <caret line="22" column="46" lean-forward="true" selection-start-line="22" selection-start-column="46" selection-end-line="22" selection-end-column="46" />
-        </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="396">
-          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" column="83" selection-start-line="11" selection-start-column="83" selection-end-line="11" selection-end-column="83" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="26">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
-          <folding>
-            <element signature="method#getPgInPgStatusByPerson#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNumByName#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNum#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPersonListByDay#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPgStatusByPgInPgPerson#0;class#PgInPgStatusManager#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="44">
-          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-12">
-          <caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="87" lean-forward="true" selection-start-line="87" selection-end-line="87" />
-          <folding>
-            <element signature="method#getConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#addConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#deleteConstructionType#0;class#PgConstructionTypeRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
-          <folding>
-            <element signature="method#getConstructionTypeByType#0;class#PgConstructionTypeManager#0" />
-            <element signature="method#getAllConstructionTypeDto#0;class#PgConstructionTypeManager#0" />
-          </folding>
-        </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="145">
-          <caret line="258" column="9" lean-forward="true" selection-start-line="258" selection-start-column="9" selection-end-line="258" selection-end-column="9" />
-          <folding>
-            <element signature="method#getMonthInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayInPgStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgOverViewRs#0" />
-            <element signature="method#getAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getMonthAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayAlarmStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgOverViewRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="103">
-          <caret line="105" column="50" lean-forward="true" selection-start-line="105" selection-start-column="50" selection-end-line="105" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateBasicDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="99">
-          <caret line="125" selection-start-line="125" selection-end-line="125" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="190">
-          <caret line="24" column="35" lean-forward="true" selection-start-line="24" selection-start-column="35" selection-end-line="24" selection-end-column="35" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="436">
-          <caret line="24" lean-forward="true" selection-start-line="24" selection-end-line="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" lean-forward="true" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="300">
-          <caret line="34" column="31" lean-forward="true" selection-start-line="34" selection-start-column="31" selection-end-line="34" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="42" column="13" lean-forward="true" selection-start-line="42" selection-start-column="13" selection-end-line="42" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="120" column="72" lean-forward="true" selection-start-line="120" selection-start-column="72" selection-end-line="120" selection-end-column="72" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="293">
-          <caret line="58" column="73" lean-forward="true" selection-start-line="58" selection-start-column="73" selection-end-line="58" selection-end-column="73" />
-          <folding>
-            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
-            <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
-          </folding>
-        </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="307">
-          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
+        <state relative-caret-position="758">
+          <caret line="130" column="5" lean-forward="true" selection-start-line="130" selection-start-column="5" selection-end-line="130" selection-end-column="5" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1170">
-          <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
+        <state relative-caret-position="494">
+          <caret line="86" column="62" lean-forward="true" selection-start-line="86" selection-start-column="62" selection-end-line="86" selection-end-column="62" />
           <folding>
-            <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-            <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+            <element signature="method#getAllDevice#0;class#PgDeviceManager#0" />
+            <element signature="method#getAllDev#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="195" column="28" lean-forward="true" selection-start-line="195" selection-start-column="28" selection-end-line="195" selection-end-column="28" />
+        <state relative-caret-position="166">
+          <caret line="174" column="13" lean-forward="true" selection-start-line="174" selection-start-column="13" selection-end-line="174" selection-end-column="13" />
           <folding>
-            <element signature="method#getAlarmByTypeAndTime#0;class#PgAlarmManager#0" />
-            <element signature="method#getAlarmNum#0;class#PgAlarmManager#0" />
             <element signature="method#getDayAlarmStatistic#0;class#PgAlarmManager#0" />
+            <element signature="method#getAlarmList#0;class#PgAlarmManager#0" />
             <element signature="method#createDTO#0;class#PgAlarmManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="364">
+          <caret line="46" column="56" lean-forward="true" selection-start-line="46" selection-start-column="56" selection-end-line="46" selection-end-column="56" />
+          <folding>
+            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
+            <element signature="method#getPgDev#0;class#PgDeviceRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
+            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+        <state relative-caret-position="396">
+          <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
           <folding>
             <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
             <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -1365,52 +1331,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="239">
-          <caret line="21" column="33" lean-forward="true" selection-start-line="21" selection-start-column="33" selection-end-line="21" selection-end-column="33" />
-        </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="352">
-          <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-        </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="99">
-          <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-          </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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-          <folding>
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-            <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>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
index c436c93..e913155 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
@@ -132,7 +132,10 @@
             this.setAlarmType("");
         else
             this.setAlarmType(pgAlarm.getAlarmTypeId().getAlarmType());
-        this.setAlarmValue(pgAlarm.getAlarmValue());
+        if(pgAlarm.getAlarmValue()==null)
+            this.setAlarmValue("");
+        else
+            this.setAlarmValue(pgAlarm.getAlarmValue());
         if (pgAlarm.getAlarmDate() != null)
             this.setAlarmDate(sdf.format(pgAlarm.getAlarmDate()));
         else
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
index a43965c..565cb41 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -159,11 +159,21 @@
     }
 
     //获取历史报警消息列表
-    public List<PgAlarmDto> getAllAlarm(String alarmType,String startDay,String endDay,String isNew,int page,int rows) {
-        try {
+    public  Map<String, Object> getAllAlarm(String alarmType,String partition,String startDay,String endDay,String isNew,int page,int rows) {
 
+        Map<String, Object> resultMap = new HashMap<>();
+        String msg="";
+
+        try {
             Criteria criteria = createCriteria(PgAlarm.class);
 
+            if (StringUtils.isNotBlank(partition)) {
+                DetachedCriteria inCriteria = DetachedCriteria.forClass(PgDevice.class);
+                inCriteria.add(Restrictions.eq("partition", partition));
+                inCriteria.setProjection(Property.forName("id"));
+                criteria.add(Property.forName("alarmDevId").in(inCriteria));
+            }
+
             if (StringUtils.isNotBlank(alarmType)&&!alarmType.contains("全部")&&pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
                 criteria.add(Restrictions.eq("alarmTypeId", pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)));
 
@@ -190,8 +200,16 @@
             for (PgAlarm pgAlarm : pgAlarmList) {
                 pgAlarmDtoList.add(new PgAlarmDto(pgAlarm));
             }
-
-            return pgAlarmDtoList;
+            if(pgAlarmDtoList==null||pgAlarmDtoList.size()==0) {
+                resultMap.put("msg", "没有报警信息");
+                resultMap.put("code","0");
+            }else {
+                resultMap.put("code","200");
+                resultMap.put("msg", "报警信息获取成功");
+            }
+            resultMap.put("count",pg.getTotalCount());
+            resultMap.put("result",pgAlarmDtoList);
+            return resultMap;
         }
         catch(Exception ex){
             ex.printStackTrace();
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index 7547560..654f49e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -24,11 +24,11 @@
 
         Criteria criteria = createCriteria(PgDevice.class);
 
-        if(road!=null)
+        if(StringUtils.isNotBlank(road))
             criteria.add(Restrictions.eq("road",road));
-        if(partition!=null)
+        if(StringUtils.isNotBlank(partition))
             criteria.add(Restrictions.eq("partition",partition));
-        if(devType!=null)
+        if(StringUtils.isNotBlank(devType))
             criteria.add(Restrictions.eq("devType",devType));
 
         criteria.add(Restrictions.eq("active", 1));
@@ -43,6 +43,29 @@
         return pgDeviceDtoList;
     }
 
+    public List<PgDeviceDto> getAllDev(String road,String partition,String devType) {
+
+        Criteria criteria = createCriteria(PgDevice.class);
+
+        if(StringUtils.isNotBlank(road))
+            criteria.add(Restrictions.eq("road",road));
+        if(StringUtils.isNotBlank(partition))
+            criteria.add(Restrictions.eq("partition",partition));
+        if(StringUtils.isNotBlank(devType))
+            criteria.add(Restrictions.like("devType","%"+devType+"%"));
+
+        criteria.add(Restrictions.eq("active", 1));
+        criteria.addOrder(Order.desc("id"));
+        List<PgDevice> pgDeviceList = criteria.list();
+
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
+        for (PgDevice pgDevice : pgDeviceList) {
+            pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
+        }
+
+        return pgDeviceDtoList;
+    }
+
     //根据名字获取当前设备
     public PgDevice getDeviceByAssetCode(String assetCode) {
         Criteria criteria=createCriteria(PgDevice.class);
@@ -56,9 +79,9 @@
     }
 
     //根据类型获取设备列表
-    public List<PgDeviceDto> getDeviceByDevTypee(String devType) {
+    public List<PgDeviceDto> getDeviceByDevType(String devType) {
         Criteria criteria=createCriteria(PgDevice.class);
-        criteria.add(Restrictions.eq("devType",devType));
+        criteria.add(Restrictions.like("devType","%"+devType+"%"));
 
         List<PgDevice> pgDeviceList=criteria.list();
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
@@ -106,7 +129,7 @@
         criteria.add(Restrictions.eq("partition",partition));
 
         List<PgDevice> pgDeviceList=criteria.list();
-        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<PgDeviceDto>();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
 
         for (PgDevice pgDevice : pgDeviceList) {
             pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
index 3a3bccd..595730e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
@@ -1,10 +1,13 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.devTable.domain.PgAlarmType;
 import com.casic.PgInterface.devTable.domain.PgPartition;
 import com.casic.PgInterface.devTable.domain.PgRoad;
 import com.casic.PgInterface.devTable.domain.PipeGallery;
 import com.casic.PgInterface.devTable.dto.PgPartitionDto;
+import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
@@ -12,7 +15,9 @@
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Created by yxw on 2017/11/4.
@@ -21,7 +26,8 @@
 public class PgPartitionManager extends HibernateEntityDao<PgPartition> {
 
     @Resource
-    PgRoadManager pgRoadManager;
+    private PgRoadManager pgRoadManager;
+
 
     public PgPartition getPartitionByParName(String parName) {
         Criteria criteria = getSession().createCriteria(PgPartition.class);
@@ -99,4 +105,5 @@
         return pgPartitionDtoList;
     }
 
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
index f216360..a6928f1 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
@@ -5,6 +5,7 @@
 public class PgPlanResultRe {
 
     private String taskKey;
+    private List<String> pileAcuList;
     private List<PgPlanResult> pgPlanResultList;
 
     public String getTaskKey() {
@@ -15,6 +16,14 @@
         this.taskKey = taskKey;
     }
 
+    public List<String> getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(List<String> pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+
     public List<PgPlanResult> getPgPlanResultList() {
         return pgPlanResultList;
     }
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
index 71ea765..47eea07 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
@@ -54,9 +54,7 @@
 
         List<PgLineHole> pgLineHoleList=criteria.list();
         List<PgLineHoleDTO> pgLineHoleDTOList=new ArrayList<>();
-        if(pgLineHoleList==null||pgLineHoleList.size()==0)
-            return null;
-        else
+        if(pgLineHoleList!=null&&pgLineHoleList.size()!=0)
             pgLineHoleDTOList=PgLineHoleDTO.ConvertToDTOList(pgLineHoleList,pgPileAcuManager,pgRoadManager);
         return pgLineHoleDTOList;
     }
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
index 0fd9e1f..841a386 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
@@ -1,12 +1,15 @@
 package com.casic.PgInterface.intelPlan.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.devTable.domain.PgPartition;
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
 import com.casic.PgInterface.intelPlan.domain.PgLineHole;
 import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
 import com.casic.PgInterface.intelPlan.domain.PgSection;
 import com.casic.PgInterface.intelPlan.dto.PgPlanResult;
 import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
 import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -22,6 +25,9 @@
     @Resource
     private PgLineHoleManager pgLineHoleManager;
 
+    @Resource
+    private PgRoadManager pgRoadManager;
+
     public PgPileAcu getPgPileAcuByCode(String acuCode){
         List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
 
@@ -58,7 +64,9 @@
         for(PgPlanTask pgPlanTask:pgPlanTaskList){
             List<PgPlanResult> pgPlanResultList=getPgPlanResultByPlantask(pgPlanTask);
             PgPlanResultRe pgPlanResultRe=new PgPlanResultRe();
+
             pgPlanResultRe.setTaskKey(pgPlanTask.getTaskKey());
+            pgPlanResultRe.setPileAcuList(pgPlanTask.getPileAcuList());
             pgPlanResultRe.setPgPlanResultList(pgPlanResultList);
 
             pgPlanResultReList.add(pgPlanResultRe);
@@ -142,4 +150,57 @@
         return length;
     }
 
+    private PgPileAcu getPgPileAcuByAcuCode(String acuCode){
+        List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
+
+        if(pgPileAcuList==null||pgPileAcuList.size()==0)
+            return null;
+        else
+            return pgPileAcuList.get(0);
+    }
+
+    public List<PgAcuTask> getACUTask(String pileAcuList){
+        String[] acuArray=pileAcuList.split(",");
+        List<PgAcuTask> pgAcuTaskList=new ArrayList<>();
+
+        for(String acu:acuArray){
+            PgPileAcu pgPileAcu=this.getPgPileAcuByCode(acu);
+            String roadName=pgRoadManager.get(pgPileAcu.getRoadId()).getRoadName();
+
+            if(!containRoad(roadName,pgAcuTaskList))
+            {
+                PgAcuTask pgAcuTask=new PgAcuTask();
+                pgAcuTask.setRoadName(roadName);
+                pgAcuTask.setPileAcuList(acu);
+                pgAcuTaskList.add(pgAcuTask);
+            }
+            else{
+                PgAcuTask pgAcuTask=getIndexRoad(roadName,pgAcuTaskList);
+                if(pgAcuTask!=null)
+                    pgAcuTask.setPileAcuList(pgAcuTask.getPileAcuList()+","+acu);
+            }
+        }
+
+        return pgAcuTaskList;
+    }
+
+    private boolean containRoad(String roadName,List<PgAcuTask> pgAcuTaskList){
+        if(pgAcuTaskList==null||pgAcuTaskList.size()==0) return false;
+        for(PgAcuTask pgAcuTask:pgAcuTaskList){
+            if(pgAcuTask.getRoadName().equals(roadName))
+                return true;
+        }
+
+        return false;
+    }
+
+    private PgAcuTask getIndexRoad(String roadName, List<PgAcuTask> pgAcuTaskList){
+        for(PgAcuTask pgAcuTask:pgAcuTaskList){
+            if(pgAcuTask.getRoadName().equals(roadName))
+                return pgAcuTask;
+        }
+
+        return null;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java
new file mode 100644
index 0000000..323f7ef
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java
@@ -0,0 +1,25 @@
+package com.casic.PgInterface.reservePlan.dto;
+
+import java.util.List;
+
+public class PgAcuTask {
+
+    private String roadName;//道路
+    private String pileAcuList;//acu分区
+
+    public String getRoadName() {
+        return roadName;
+    }
+
+    public void setRoadName(String roadName) {
+        this.roadName = roadName;
+    }
+
+    public String getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(String pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
index c25e926..c7d7693 100644
--- a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
@@ -70,9 +70,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(Long.valueOf(inPgPersonId));
         PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("hostName",pgInPgPerson.getAssetCode());
-//        PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode());
-//        long maxId = pgTagPositionManager.getMaxId(pgTagMac.getTagMac());
-//        PGTagPosition pgTagPosition = pgTagPositionManager.get(maxId);
+
         PGTagPosition pgTagPosition = tagmacRun.GetTagStatus(pgTagMac);
         boolean bExist = false;
         bExist = pgTagPositionManager.findTagPosition(pgTagPosition.getPositionUpdatetime(),pgTagPosition.getHostId());
@@ -104,8 +102,7 @@
         PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(Long.valueOf(inPgPersonId));
         PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pgInPgPersonId",pgInPgPerson);
         System.out.println("time:"+pgInPgStatus.getInTime());
-//        PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pgInPgPersonId",inPgPersonId);
-//        PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode());
+
         PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("hostName",pgInPgPerson.getAssetCode());
 
         Map<Object,Object> mapPosition = new HashMap<>();
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
index 082ba5d..3eed00a 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
@@ -48,6 +48,7 @@
     public Map<String, Object> linkDevice(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         PgDeviceDto pgDeviceDto = null;
         try {
@@ -62,6 +63,7 @@
                     else {
                         pgDeviceDto = new PgDeviceDto(pgDevice);
                         msg = "报警关联设备获取成功";
+                        code="200";
                     }
                 }
             }
@@ -71,6 +73,7 @@
             e.printStackTrace();
             msg = "获取关联设备失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceDto);
 
@@ -86,6 +89,7 @@
     public Map<String, Object> linkPartitionCamera(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
         try {
@@ -106,6 +110,7 @@
 
                         pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(partition,position);
                         msg = "关联设备获取成功";
+                        code="200";
                     }
                 }
             }
@@ -115,6 +120,7 @@
             e.printStackTrace();
             msg = "分区设备关联失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceDtoList);
         return resultMap;
@@ -129,6 +135,7 @@
     public Map<String, Object> linkReservePlan(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgReservePlanDto> pgReservePlanDtoList=new ArrayList<>();
         try{
@@ -139,10 +146,12 @@
                 else {
                     pgReservePlanDtoList = pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
 
-                    if(pgReservePlanDtoList==null||pgReservePlanDtoList.size()==0)
-                        msg="不存在关联的报警预案";
-                    else
+                    if (pgReservePlanDtoList == null || pgReservePlanDtoList.size() == 0)
+                        msg = "不存在关联的报警预案";
+                    else {
                         msg = "关联预案获取成功";
+                        code="200";
+                    }
                 }
             }
             else
@@ -153,6 +162,7 @@
             e.printStackTrace();
             msg="预案关联失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgReservePlanDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
index 0ddbc4d..0ce886b 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
@@ -41,25 +41,19 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getAlarmList(@FormParam("alarmType") String alarmType,
                                             @FormParam("startDay") String startDay,
+                                            @FormParam("partition") String partition,
                                             @FormParam("endDay") String endDay,
                                             @FormParam("isNew") String isNew,
                                             @FormParam("page") int page,
                                             @FormParam("rows") int rows) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
         try {
-            pgAlarmDtoList = pgAlarmManager.getAllAlarm(alarmType,startDay,endDay,isNew,page,rows);
-            if (pgAlarmDtoList==null||pgAlarmDtoList.size() == 0)
-                msg = "没有报警信息";
-            else
-                msg = "报警信息获取成功";
+            resultMap = pgAlarmManager.getAllAlarm(alarmType,partition,startDay,endDay,isNew,page,rows);
+
         } catch (Exception e) {
             e.printStackTrace();
-            msg = "报警信息获取失败";
         }
-        resultMap.put("msg", msg);
-        resultMap.put("result", pgAlarmDtoList);
         return resultMap;
     }
 
@@ -71,9 +65,10 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> clearAlarmList(@FormParam("id") String id) throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        String result = "false";
+        String result = "";
+        String code="0";
 
         try {
             PgAlarm pgAlarm = new PgAlarm();
@@ -86,12 +81,14 @@
                 pgAlarmManager.save(pgAlarm);
                 msg = "报警信息清除成功";
                 result = "true";
+                code = "200";
             }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警信息清除失败";
             result = "false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
@@ -106,21 +103,26 @@
     public Map<String, Object> getAlarmByTypeOrTime(@FormParam("alarmType") String alarmType,
                                                     @FormParam("startTime") String startTime,
                                                     @FormParam("endTime") String endTime) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
-        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<PgAlarmDto>();
+        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
         try {
             pgAlarmDtoList = pgAlarmManager.getAlarmByTypeAndTime(alarmType, startTime, endTime);
             if (pgAlarmDtoList == null || pgAlarmDtoList.size() == 0)
                 msg = "报警信息不存在";
             else
+            {
                 msg = "报警信息获取成功";
+                code="200";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警信息获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
index 29ce8a4..ed0bf34 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
@@ -39,8 +39,8 @@
     public Map<String, Object> getAlarmRule(@FormParam("devType") String devType) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
-        System.out.println("devType:"+devType);
         List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<>();
         try {
             pgAlarmRuleDtoList = pgAlarmRuleManager.getAlarmRuleDto(devType);
@@ -52,6 +52,7 @@
             e.printStackTrace();
             msg = "报警阈值信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmRuleDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
index 24ab894..abef1b1 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
@@ -39,16 +39,21 @@
                                                      @FormParam("endDate") String endDate)throws Exception{
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
+
         List<PgAlarmTjDto> pgAlarmTjDtoList=null;
         try{
             pgAlarmTjDtoList=pgAlarmTjManager.getAlarmTjResultByType(startDate,endDate);
             msg="获取成功";
+            code="200";
         }
         catch(Exception ex) {
             msg = "统计失败";
         }
-        resultMap.put("result",pgAlarmTjDtoList);
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
+        resultMap.put("result",pgAlarmTjDtoList);
+
         return resultMap;
     }
 
@@ -61,23 +66,27 @@
     public Map<String, Object> getAlarmByTime(@FormParam("startTime") String startTime,
                                               @FormParam("endTime") String endTime,
                                               @FormParam("statisticType") String statisticType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code = "0";
 
-        List<PgAlarmTjDto> pgAlarmTjDtoList = new ArrayList<PgAlarmTjDto>();
+        List<PgAlarmTjDto> pgAlarmTjDtoList = new ArrayList<>();
         try {
             pgAlarmTjDtoList = pgAlarmTjManager.getAlarmByTime(startTime, endTime, statisticType);
             if(pgAlarmTjDtoList==null)
                 msg="报警统计信息获取失败";
-            else
-                msg="报警统计信息获取成功";
+            else {
+                msg = "报警统计信息获取成功";
+                code="200";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警统计信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmTjDtoList);
         return resultMap;
     }
 
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
index 28bc811..b6278a9 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
@@ -30,7 +30,6 @@
     @Resource
     private PgAlarmTypeManager pgAlarmTypeManager;
 
-
     /**
      * 获取报警类型
      */
@@ -38,19 +37,24 @@
     @Path("getAlarmType")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getAlarmTypeList()throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
-        List<PgAlarmTypeDto> pgAlarmTypeDtoList=new ArrayList<PgAlarmTypeDto>();
+        String code="";
+
+        List<PgAlarmTypeDto> pgAlarmTypeDtoList=new ArrayList<>();
         try {
             pgAlarmTypeDtoList = pgAlarmTypeManager.getAllAlarmTypeDto();
             if(pgAlarmTypeDtoList.size()==0)
                 msg="没有报警类型信息";
-            else
-                msg="报警类型信息获取成功";
+            else {
+                code="200";
+                msg = "报警类型信息获取成功";
+            }
         }catch(Exception e){
             e.printStackTrace();
             msg="报警类型信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAlarmTypeDtoList);
         return resultMap;
@@ -66,6 +70,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
@@ -83,6 +88,7 @@
                 logger.info("成功保存");
                 result = "true";
                 msg = "保存成功";
+                code="200";
             }
         } catch (Exception e) {
             result = "false";
@@ -90,6 +96,7 @@
             e.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -106,6 +113,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try{
             if(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
@@ -119,6 +127,7 @@
                 pgAlarmTypeManager.save(pgAlarmType);
                 result = "true";
                 msg = "编辑成功";
+                code="200";
             }
         }
         catch(Exception e)
@@ -128,6 +137,7 @@
             e.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("result",result);
         resultMap.put("msg",msg);
 
@@ -146,6 +156,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
         String result="false";
+        String code="0";
 
         try {
             PgAlarmType pgAlarmType=pgAlarmTypeManager.get(Long.valueOf(id));
@@ -157,6 +168,7 @@
             {
                 pgAlarmType.setActive(0);
                 pgAlarmTypeManager.save(pgAlarmType);
+                code="200";
                 msg="报警类型删除成功";
                 result="true";
             }
@@ -165,6 +177,7 @@
             msg="报警类型删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
index 4533e1a..85940bb 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
@@ -33,12 +33,15 @@
                                                  @FormParam("inSpectionPlace") String inSpectionPlace){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
         List<PgAssetPlanDto> pgAssetPlanDtoList=new ArrayList<>();
         try{
             pgAssetPlanDtoList=pgAssetPlanManager.getPgAssetPlanDtoList(startDay,endDay,inSpectionPlace);
-            if(pgAssetPlanDtoList!=null&&pgAssetPlanDtoList.size()!=0)
-                msg="巡检信息获取成功";
+            if(pgAssetPlanDtoList!=null&&pgAssetPlanDtoList.size()!=0) {
+                code="200";
+                msg = "巡检信息获取成功";
+            }
             else
                 msg="不存在巡检信息";
         }
@@ -47,6 +50,7 @@
             msg="巡检信息获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAssetPlanDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
index 47ef9d1..5cbdfcb 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
@@ -30,12 +30,15 @@
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
         String result="";
+        String code="0";
 
         List<PgAssetPlanStatic> pgAssetPlanStaticList = null;
         try{
             pgAssetPlanStaticList=pgAssetPlanManager.getPgAssetPlanStaticLisByTime(startTime,endTime,staticType);
-            if(pgAssetPlanStaticList!=null&&pgAssetPlanStaticList.size()!=0)
-                msg="巡检统计信息获取成功";
+            if(pgAssetPlanStaticList!=null&&pgAssetPlanStaticList.size()!=0) {
+                code = "200";
+                msg = "巡检统计信息获取成功";
+            }
             else
                 msg="统计信息获取失败";
         }
@@ -44,6 +47,7 @@
             msg="统计失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAssetPlanStaticList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
index 26f5d6a..503bfe3 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
@@ -40,6 +40,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="";
 
         try{
             PgAuthority pgAuthority=new PgAuthority();
@@ -50,6 +51,7 @@
 
             pgAuthorityManager.save(pgAuthority);
             msg="用户权限保存成功";
+            code="200";
             result="true";
         }
         catch(Exception e) {
@@ -57,6 +59,7 @@
             msg = "新增权限失败";
             result = "false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -65,22 +68,25 @@
 
     /*
        *编辑角权限信息
-        */
+    */
     @POST
     @Path("editAuthority")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> editAuthority(@FormParam("id") String id,
                                        @FormParam("authority") String authority,
                                        @FormParam("concent") String concent) throws Exception{
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
+
         try {
             PgAuthority pgAuthority=pgAuthorityManager.get(Long.valueOf(id));
             pgAuthority.setAuthority(authority);
             pgAuthority.setConcent(concent);
 
             pgAuthorityManager.save(pgAuthority);
+            code="200";
             msg="权限保存成功";
             result="true";
         }
@@ -90,7 +96,7 @@
             msg="权限编辑失败";
             result="false";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -105,9 +111,10 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> deleteAuthority(@FormParam("id") String id)throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
-        String result="false";
+        String result="";
+        String code="0";
 
         try {
             PgAuthority pgAuthority= pgAuthorityManager.get(Long.valueOf(id));
@@ -119,6 +126,7 @@
             {
                 pgAuthority.setActive(0);
                 pgAuthorityManager.save(pgAuthority);
+                code="200";
                 msg="删除权限成功";
                 result="true";
             }
@@ -127,37 +135,40 @@
             msg="删除权限失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
     }
 
     /*
-* 获取权限信息
- */
+    * 获取权限信息
+    */
     @POST
     @Path("getAuthorityList")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> getAuthorityList() {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgAuthorityDto> pgAuthorityDtoList = new ArrayList<PgAuthorityDto>();
         try {
             pgAuthorityDtoList = pgAuthorityManager.getAuthorityList();
             if (pgAuthorityDtoList == null)
                 msg = "不存在权限信息";
-            else
+            else {
+                code = "200";
                 msg = "权限信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "权限信息获取是失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAuthorityDtoList);
         return resultMap;
     }
 
 
-
-
 }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
index a9ef521..a74ecc7 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
@@ -45,6 +45,7 @@
                                                @FormParam("endDate") String endDate)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgHistoryDataDto> pgHistoryDataDtoList=new ArrayList<>();
 
         try {
@@ -55,13 +56,16 @@
                 pgHistoryDataDtoList=pgCh4Manager.getAllCH4Data(pgDevice,startDate,endDate);
                 if(pgHistoryDataDtoList==null)
                     msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+                else {
+                    code = "200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgHistoryDataDtoList);
         return resultMap;
@@ -75,8 +79,9 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getNewestCh4InfoByDev(@FormParam("assetCode") String assetCode)throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
+        String code="0";
         PgCh4Dto pgCh4Dto=new PgCh4Dto(null);
 
         try {
@@ -87,13 +92,17 @@
                 pgCh4Dto=pgCh4Manager.getNewestCH4Data(pgDevice);
                 if(pgCh4Dto==null)
                     msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgCh4Dto);
         return resultMap;
@@ -111,6 +120,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
@@ -127,6 +137,7 @@
                 pgCh4.setPgDeviceId(pgDevice);
 
                 pgCh4Manager.save(pgCh4);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -135,7 +146,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
index a7eac39..dfc8ca5 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
@@ -43,23 +43,27 @@
                                                       @FormParam("endDate") String endDate)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgHistoryDataDto> pgHistoryDataDtoList=new ArrayList<>();
 
         try {
             PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
                 msg="设备不存在";
-            else{
-                pgHistoryDataDtoList=pgCoManager.getAllCoData(pgDevice, startDate, endDate);
-                if(pgHistoryDataDtoList==null)
-                    msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+            else {
+                pgHistoryDataDtoList = pgCoManager.getAllCoData(pgDevice, startDate, endDate);
+                if (pgHistoryDataDtoList == null)
+                    msg = "没有满足要求的数据";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgHistoryDataDtoList);
         return resultMap;
@@ -75,6 +79,7 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         PgCoDto pgCoDto=new PgCoDto(null);
 
         try {
@@ -85,13 +90,16 @@
                 pgCoDto=pgCoManager.getNewestCoData(pgDevice);
                 if(pgCoDto==null)
                     msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgCoDto);
         return resultMap;
@@ -110,6 +118,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         try {
@@ -126,6 +135,7 @@
 
                 pgCoManager.save(pgCo);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
         } catch (Exception e) {
@@ -133,7 +143,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
index b4b826e..9af98a3 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
@@ -60,6 +60,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         try {
 
@@ -80,8 +81,8 @@
                 pgConstruction.setPgConstructionTypeId(pgConstructionType.getId());
                 pgConstruction.setActive(1);
                 pgConstruction.setParName(parName);
-                logger.info("保存成功");
                 pgConstructionManager.save(pgConstruction);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -90,6 +91,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("success", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -116,6 +118,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
@@ -140,6 +143,7 @@
                 pgConstruction.setParName(parName);
 
                 pgConstructionManager.save(pgConstruction);
+                code="200";
                 result = "true";
                 msg = "编辑成功";
             }
@@ -150,7 +154,7 @@
             e.printStackTrace();
 
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -167,6 +171,8 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
+
         try {
             PgConstruction pgConstruction = pgConstructionManager.get(Long.valueOf(id));
             if (pgConstruction == null)
@@ -177,6 +183,7 @@
             {
                 pgConstruction.setActive(0);
                 pgConstructionManager.save(pgConstruction);
+                code="200";
                 result = "true";
                 msg = "成功删除信息";
             }
@@ -185,6 +192,7 @@
             result = "false";
             msg = "删除失败";
         }
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -204,9 +212,11 @@
                                                   @FormParam("rows") int rows)throws Exception{
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
         List<PgConstructionDto> pgConstructionDtoList=new ArrayList<>();
         try{
             pgConstructionDtoList=pgConstructionManager.getPgContructionDto(cs_name,cs_type,startTime,endTime,page,rows);
+            code="200";
             msg="信息获取成功";
         }
         catch(Exception e)
@@ -214,6 +224,7 @@
             e.printStackTrace();
             msg="查询失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
 
@@ -231,18 +242,22 @@
                                                               @FormParam("statisticType") String statisticType) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgConstructionStiatistic> pgConstructionStiatisticList=new ArrayList<>();
         try {
             pgConstructionStiatisticList = pgConstructionManager.getConstructionByTimeAndStatus(startTime, endTime, statisticType);
             if(pgConstructionStiatisticList==null)
                 msg="施工统计信息获取失败";
-            else
-                msg="施工统计信息获取成功";
+            else {
+                code="200";
+                msg = "施工统计信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "施工统计信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgConstructionStiatisticList);
         return resultMap;
@@ -257,6 +272,7 @@
     public Map<String, Object> getConstructionByType(@FormParam("statisticType") String statisticType){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
         List<PgConstructionStiatistic> pgConstructionStiatisticList=new ArrayList<>();
 
         try{
@@ -268,6 +284,7 @@
                 resultMap.put("result",null);
             }
             else {
+                code="200";
                 msg = "统计信息获取成功";
                 resultMap.put("result", pgConstructionStiatisticList);
             }
@@ -278,6 +295,7 @@
             msg="统计失败";
             resultMap.put("result",null);
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         return resultMap;
     }
@@ -291,9 +309,11 @@
     public Map<String, Object> getConstructionToday() throws Exception{
         Map<String,Object> resultMap=new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgConstructionDto> pgConstructionDtoList=new ArrayList<PgConstructionDto>();
         try {
             pgConstructionDtoList = pgConstructionManager.getConstructionToday();
+            code="200";
             msg = "当天施工信息获取成功";
         }
         catch(Exception e)
@@ -301,7 +321,7 @@
             e.printStackTrace();
             msg="获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
         return resultMap;
@@ -316,6 +336,7 @@
     public Map<String, Object> getConstructionDev(@FormParam("id") String id) throws Exception{
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
         List<PgDeviceDto> pgDeviceDtoList =new ArrayList<>();
         try{
@@ -325,14 +346,17 @@
 
             if(pgDeviceDtoList==null)
                 msg="信息获取失败";
-            else
-                msg="信息获取成功";
+            else {
+                code="200";
+                msg = "信息获取成功";
+            }
         }
         catch(Exception e)
         {
             e.printStackTrace();
-            msg="设备信息获取成功";
+            msg="信息获取是被";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgDeviceDtoList);
 
@@ -346,17 +370,21 @@
     @Path("getConstruction")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getConstruction() throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
-        List<PgConstructionDto> pgConstructionDtoList=new ArrayList<PgConstructionDto>();
+        String code="0";
+
+        List<PgConstructionDto> pgConstructionDtoList=new ArrayList<>();
 
         try{
             pgConstructionDtoList=pgConstructionManager.getPgConstructionList();
             if(pgConstructionDtoList==null||pgConstructionDtoList.size()==0)
                 msg="不存在施工记录";
-            else
-                msg="施工信息获取成功";
+            else {
+                code = "200";
+                msg = "施工信息获取成功";
+            }
         }
         catch(Exception e)
         {
@@ -364,6 +392,7 @@
             msg="施工信息获取失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java
index fd3d53e..2019502 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java
@@ -39,12 +39,12 @@
         try {
             pgConstructionTypeDtoList = pgConstructionTypeManager.getAllConstructionTypeDto();
             if (pgConstructionTypeDtoList.size() == 0)
-                msg = "没有项目类型信息";
+                msg = "获取失败";
             else
-                msg = "项目类型获取成功";
+                msg = "获取成功";
         } catch (Exception e) {
             e.printStackTrace();
-            msg = "项目类型信息获取失败";
+            msg = "获取失败";
         }
         resultMap.put("msg", msg);
         resultMap.put("result", pgConstructionTypeDtoList);
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
index 90d001c..037a399 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
@@ -51,6 +51,7 @@
 
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if (StringUtils.isBlank(construct_doc)||StringUtils.isBlank(doc_name))
@@ -65,6 +66,7 @@
             pgCsDocument.setActive(1);
             pgCsDocumentManager.save(pgCsDocument);
 
+            code="200";
             result = "true";
             msg = "保存成功";
 
@@ -74,6 +76,7 @@
             ex.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("success", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -90,6 +93,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             PgCsDocument pgCsDocument = pgCsDocumentManager.get(Long.valueOf(id));
@@ -103,6 +107,7 @@
 
                 pgCsDocumentManager.save(pgCsDocument);
 
+                code="200";
                 result = "true";
                 msg = "编辑成功";
             }
@@ -112,6 +117,7 @@
             msg = "编辑失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -125,9 +131,9 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
         String result="";
+        String code="0";
 
         try{
-
             PgCsDocument pgCsDocument = pgCsDocumentManager.get(Long.valueOf(id));
             if(pgCsDocument==null)
             {
@@ -137,6 +143,7 @@
             else{
                 pgCsDocument.setActive(0);
                 pgCsDocumentManager.save(pgCsDocument);
+                code="200";
                 result="true";
                 msg="删除成功";
             }
@@ -147,7 +154,7 @@
             msg="预案删除失败";
             result="false";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -168,18 +175,21 @@
 
         String msg="";
         String result="";
+        String code="0";
 
         try {
             pgCsDocumentDtoList = pgCsDocumentManager.getAllDocData(cs_name);
-            if (pgCsDocumentDtoList != null)
+            if (pgCsDocumentDtoList != null) {
+                code="200";
                 msg = "获取数据成功";
+            }
             else
                 msg = "没有满足条件的数据";
         }catch (Exception e){
             e.printStackTrace();
             msg = "获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgCsDocumentDtoList);
         return resultMap;
@@ -192,20 +202,22 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
 
         String msg = "";
+        String code="0";
         ResponseEntity<byte[]> path = null;
         try {
             PgCsDocument pgCsDocument = pgCsDocumentManager.get(Long.valueOf(id));
             path = pgCsDocumentManager.downloadFile(pgCsDocument);
             if (path == null)
                 msg = "不存在该文档";
-            else
+            else {
+                code = "200";
                 msg = "下载成功";
-
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "下载失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", path.getBody());
         resultMap.put("msg", msg);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
index 94c5c84..ffc8b95 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
@@ -41,22 +41,24 @@
     public Map<String, Object> getPgDeviceByDevType(@FormParam("devType") String devType) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
         try {
-            pgDeviceDtoList = pgDeviceManager.getDeviceByDevTypee(devType);
+            pgDeviceDtoList = pgDeviceManager.getDeviceByDevType(devType);
             if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0){
                 msg="不存在满足要求的数据";
-                resultMap.put("result",null);
             }
             else{
-                resultMap.put("result", pgDeviceDtoList);
+                code="200";
                 msg = "获取成功";
             }
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", pgDeviceDtoList);
         return resultMap;
     }
 
@@ -69,25 +71,26 @@
     public Map<String, Object> getPgDeviceByAssetCode(@FormParam("assetCode") String assetCode) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         PgDeviceDto pgDeviceDto=null;
         try {
             PgDevice pgDevice = pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
             {
                 msg="不存在设备信息";
-                resultMap.put("result",null);
             }
             else {
                 pgDeviceDto = new PgDeviceDto(pgDevice);
                 msg = "获取成功";
-                resultMap.put("result", pgDeviceDto);
+                code="200";
             }
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", pgDeviceDto);
         return resultMap;
     }
 
@@ -102,27 +105,61 @@
                                              @FormParam("devType") String devType)throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
         try {
             pgDeviceDtoList = pgDeviceManager.getAllDevice(road,partition,devType);
             if(pgDeviceDtoList.size()==0) {
                 msg = "没有找到设备信息";
-                resultMap.put("result",null);
             }
             else {
                 msg = "设备信息获取成功";
-                resultMap.put("result", pgDeviceDtoList);
+                code="200";
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result", pgDeviceDtoList);
         return resultMap;
     }
 
     /**
+     * 显示设备列表
+     */
+    @POST
+    @Path("getPgDev")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String, Object> getPgDev(@FormParam("road") String road,
+                                             @FormParam("partition") String partition,
+                                             @FormParam("devType") String devType)throws Exception {
+        Map<String, Object> resultMap = new HashMap<>();
+        String msg="";
+        String code="0";
+        List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
+        try {
+            pgDeviceDtoList = pgDeviceManager.getAllDev(road,partition,devType);
+            if(pgDeviceDtoList.size()==0) {
+                msg = "没有找到设备信息";
+            }
+            else {
+                code="200";
+                msg = "设备信息获取成功";
+            }
+        }catch(Exception e){
+            e.printStackTrace();
+            msg="设备信息获取失败";
+        }
+        resultMap.put("code",code);
+        resultMap.put("msg",msg);
+        resultMap.put("result", pgDeviceDtoList);
+        return resultMap;
+    }
+
+
+    /**
      * 新增设备
      */
     @POST
@@ -145,6 +182,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if (pgDeviceManager.getDeviceByAssetCode(assetCode)!=null) {
@@ -169,6 +207,7 @@
 
                 pgDeviceManager.save(pgDevice);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
 
@@ -177,10 +216,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -208,14 +246,9 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
-            /*
-            if (pgDeviceManager.getDeviceByAssetCode(assetCode)!=null) {
-                result = "false";
-                msg = "已存在同名设备";
-            } else {
-            */
             PgDevice pgDevice = pgDeviceManager.get(Long.valueOf(id));
             pgDevice.setPipeGallery(pipeGallery);
             pgDevice.setPartition(partition);
@@ -233,14 +266,14 @@
 
             pgDeviceManager.save(pgDevice);
             result = "true";
+            code="200";
             msg = "编辑成功";
-            //}
         } catch (Exception e) {
             result = "false";
             msg = "编辑失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("result",result);
         resultMap.put("msg",msg);
         return resultMap;
@@ -256,7 +289,8 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
-        String result="false";
+        String result="";
+        String code="0";
 
         try {
             PgDevice pgDevice=pgDeviceManager.get(Long.valueOf(id));
@@ -268,6 +302,7 @@
             {
                 pgDevice.setActive(0);
                 pgDeviceManager.save(pgDevice);
+                code="200";
                 msg="设备删除成功";
                 result="true";
             }
@@ -276,6 +311,7 @@
             msg="设备删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -291,18 +327,18 @@
     {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         PgDeviceDto pgDeviceDto=null;
 
         try{
             PgDevice pgDevice=pgDeviceManager.getDeviceBydevCode(devCode);
             if(pgDevice==null) {
                 msg = "设备信息获取失败";
-                resultMap.put("result",null);
             }
             else{
                 pgDeviceDto = new PgDeviceDto(pgDevice);
                 msg = "设备信息获取成功";
-                resultMap.put("result",pgDeviceDto);
+                code="200";
             }
         }
         catch(Exception ex)
@@ -310,8 +346,9 @@
             ex.printStackTrace();
             msg="设备状态获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgDeviceDto);
         return resultMap;
     }
 
@@ -324,17 +361,17 @@
     public Map<String,Object> getDeviceByPartition(@FormParam("partition") String partition) throws Exception{
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<PgDeviceDto>();
 
         try{
             pgDeviceDtoList=pgDeviceManager.getPgDeviceDtoListByPartition(partition);
             if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0) {
                 msg = "设备信息获取失败";
-                resultMap.put("result",null);
             }
             else {
+                code="200";
                 msg = "设备信息获取成功";
-                resultMap.put("result",pgDeviceDtoList);
             }
         }
         catch(Exception e)
@@ -342,8 +379,9 @@
             e.printStackTrace();
             msg="设备信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgDeviceDtoList);
         return resultMap;
     }
 
@@ -353,17 +391,16 @@
     public Map<String,Object> getDeviceByOldDAssetCodeCode(@FormParam("assetCode") String assetCode) throws Exception{
         Map<String, Object> resultMap = new HashMap<>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
 
         try{
             pgDeviceDtoList=pgDeviceManager.getDeviceByOldDAssetCodeCode(assetCode);
-            if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0) {
-                msg = "设备信息获取失败";;
-                resultMap.put("result",null);
-            }
+            if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0)
+                msg = "设备信息获取失败";
             else {
                 msg = "设备信息获取成功";
-                resultMap.put("result",pgDeviceDtoList);
+                code="200";
             }
         }
         catch(Exception e)
@@ -372,8 +409,9 @@
             msg="设备信息获取失败";
             resultMap.put("result",null);
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgDeviceDtoList);
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java
index 421d249..f6f167d 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java
@@ -38,17 +38,21 @@
     public Map<String, Object> getDeviceTpeyList()throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgDeviceTypeDto> pgDeviceTypeDtoList=new ArrayList<PgDeviceTypeDto>();
         try {
             pgDeviceTypeDtoList = pgDeviceTypeManager.getAllDeviceType();
             if(pgDeviceTypeDtoList.size()==0)
                 msg="没有找到设备类型信息";
-            else
-                msg="设备类型信息获取成功";
+            else {
+                code="200";
+                msg = "设备类型信息获取成功";
+            }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备类型信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgDeviceTypeDtoList);
         return resultMap;
@@ -66,6 +70,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if (pgDeviceTypeManager.getDeviceTypeByDeType(devType)!=null) {
@@ -79,6 +84,7 @@
 
                 pgDeviceTypeManager.save(pgDeviceType);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
 
@@ -87,10 +93,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
index c276fb3..c789960 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
@@ -44,6 +44,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 
         try {
@@ -62,6 +63,7 @@
                 pgEquipment.setActive(1);
 
                 pgEquipmentManager.save(pgEquipment);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -70,9 +72,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -89,9 +91,10 @@
                                             @FormParam("ownerUnit") String ownerUnit,
                                             @FormParam("enterDate") String enterDate,
                                             @FormParam("curUser") String curUser) {
-        HashMap<String, Object> resultMap = new HashMap<String, Object>();
+        HashMap<String, Object> resultMap = new HashMap<>();
         String msg = "";
         String result = "";
+        String code="0";
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 
         try {
@@ -111,6 +114,7 @@
                 pgEquipment.setEnterDate(sdf.parse(enterDate));
 
                 pgEquipmentManager.save(pgEquipment);
+                code="200";
                 msg="编辑成功";
                 result="true";
             }
@@ -119,9 +123,9 @@
             result = "false";
             msg = "编辑失败";
         }
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -134,16 +138,19 @@
     public Map<String, Object> getEquipment(@FormParam("eqName") String eqName,
                                             @FormParam("eqCode") String eqCode,
                                             @FormParam("eqType") String eqType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        List<PgEquipmentDto> pgEquipmentDtoList=new ArrayList<PgEquipmentDto>();
+        String code="0";
+        List<PgEquipmentDto> pgEquipmentDtoList=new ArrayList<>();
 
         try{
             pgEquipmentDtoList=pgEquipmentManager.getEquipmentDtiList(eqName,eqCode,eqType);
             if(pgEquipmentDtoList==null||pgEquipmentDtoList.size()==0)
                 msg="不存在工器具记录";
-            else
-                msg="维获取成功";
+            else {
+                code = "200";
+                msg = "维获取成功";
+            }
         }
         catch(Exception e)
         {
@@ -166,6 +173,7 @@
         HashMap<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
         String result = "";
+        String code="";
 
         try {
             PgEquipment pgEquipment=pgEquipmentManager.get(Long.valueOf(id));
@@ -178,6 +186,7 @@
             {
                 pgEquipment.setActive(0);
                 pgEquipmentManager.save(pgEquipment);
+                code="200";
                 msg="删除成功";
                 result="true";
             }
@@ -186,6 +195,7 @@
             msg="设备信息获取失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -201,16 +211,19 @@
             throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=new ArrayList<PgDeviceTypeStatisticDto>();
 
         try {
             pgDeviceTypeStatisticDtoList=pgEquipmentManager.getDeviceStatisticByDevType(eqType);
 
+            code="200";
             msg = "获取成功";
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceTypeStatisticDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
index 05a9709..a90fd6c 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
@@ -4,9 +4,9 @@
 import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
 import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
 import com.casic.PgInterface.intelPlan.manager.PgPileAcuManager;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import com.casic.PgInterface.test.PlanData;
 import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.ModelAttribute;
 
 import javax.annotation.Resource;
 import javax.ws.rs.FormParam;
@@ -32,23 +32,25 @@
     public Map<String,Object> getPlanResult(@FormParam("planParamStr") String planParamStr){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
-        //List<PgPlanTask> pgPlanTaskList=pgPlanParams.getPgPlanTaskList();
         List<PgPlanTask> pgPlanTaskList=new PgPlanParams().getPgPlanParamsByString(planParamStr);
         List<PgPlanResultRe> pgPlanResultReList=new ArrayList<>();
 
-        try{
-                pgPlanResultReList=pgPileAcuManager.getPgPlanResultList(pgPlanTaskList);
-                if(pgPlanResultReList==null)
-                    msg="管线智能规划出错";
-                else
-                    msg="管线智能规划完成";
+        try {
+            pgPlanResultReList = pgPileAcuManager.getPgPlanResultList(pgPlanTaskList);
+            if (pgPlanResultReList == null)
+                msg = "管线智能规划出错";
+            else {
+                code="200";
+                msg = "管线智能规划完成";
+            }
         }
         catch(Exception ex){
             msg="智能规划出错";
             ex.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgPlanResultReList);
 
@@ -80,4 +82,30 @@
         return resultMap;
     }
 
+    @POST
+    @Path("getPlanTask")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getACUTask(@FormParam("pileAcuList") String pileAcuList){
+
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        String code="0";
+        List<PgAcuTask> pgAcuTaskList=new ArrayList<>();
+
+        try{
+            pgAcuTaskList=pgPileAcuManager.getACUTask(pileAcuList);
+            code="200";
+            msg="任务获取成功";
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            msg="任务获取失败";
+        }
+        resultMap.put("code",code);
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgAcuTaskList);
+
+        return resultMap;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
index ff85c61..66eec76 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
@@ -55,13 +55,13 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         try {
             PgInPgPerson pgInPgPerson = null;//pgInPgPersonManager.getPersonByUserName(userName);
             int iHostName = pgTagMacManager.getCount("select count(1) from PGTagMac where hostname = ?",assetCode);
-//            int iTagMac = pgTagMacManager.getCount("select count(1) from PGTagMac where tagmac = ?",assetCode.toUpperCase());
             if (0==iHostName)
             {
                 result = "false";
@@ -92,9 +92,8 @@
 
                 pgInPgStatusManager.save(pgInPgStatus);
 
-//                String syResult=pgInPgPersonManager.synchorizedInPgInfo(assetCode,userCode,userName,personType);
+                code="200";
                 result = "true";
-//                msg = "人员注册保存成功"+syResult;
                 msg = "人员注册保存成功";
             }
             else {
@@ -106,6 +105,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -120,6 +120,7 @@
     public Map<String, Object> getInPgPerson() throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<>();
         try {
@@ -127,11 +128,15 @@
             if (pgInPgInfoDtoList == null || pgInPgInfoDtoList.size() == 0)
                 msg = "没有找到入廊人员信息";
             else
+            {
+                code="200";
                 msg = "入廊人员信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "入廊人员信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
         return resultMap;
@@ -146,18 +151,22 @@
     public Map<String, Object> getInPgPersonInPg() throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
 
-        List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<PgInPgInfoDto>();
+        List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<>();
         try {
             pgInPgInfoDtoList = pgInPgPersonManager.getPgInPersonList(1);
             if (pgInPgInfoDtoList == null || pgInPgInfoDtoList.size() == 0)
                 msg = "没有找到入廊人员信息";
-            else
+            else {
+                code="200";
                 msg = "入廊人员信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "入廊人员信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
         return resultMap;
@@ -172,6 +181,7 @@
     public Map<String, Object> getInPgPersonByName(@FormParam("userName") String userName) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
 
         PgInPgPerson pgInPgPerson = null;
         PgInPgPersonDto pgInPgPersonDto=null;
@@ -184,12 +194,13 @@
                 pgInPgPersonDto=new PgInPgPersonDto(pgInPgPerson);
                 pgInPgPersonDtoList.add(pgInPgPersonDto);
                 msg = "人员信息获取成功";
+                code="200";
             }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "人员信息获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgPersonDtoList);
         return resultMap;
@@ -206,6 +217,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             PgInPgPerson pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName);
@@ -221,6 +233,7 @@
                     pgInPgPersonManager.save(pgInPgPerson);
                     result = "true";
                     msg = "编辑成功";
+                    code="200";
                 }
             }
         } catch (Exception e) {
@@ -228,9 +241,9 @@
             msg = "编辑失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -244,10 +257,12 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         int inPgNum=0;
         String msg = "";
+        String code="0";
 
         try{
             inPgNum=pgInPgStatusManager.getInPgNum();
 
+            code="200";
             msg="人员入廊次数获取成功";
         }
         catch(Exception e)
@@ -255,6 +270,7 @@
             e.printStackTrace();
             msg="人员入廊次数获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",inPgNum);
 
@@ -272,18 +288,22 @@
                                                    @FormParam("statisticType") String statisticType) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
 
         List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<PgInPgInfoDto>();
         try {
             pgInPgInfoDtoList = pgInPgPersonManager.getPgInPersonListByTime(startTime, endTime, statisticType);
             if(pgInPgInfoDtoList==null)
                 msg="入廊人员统计信息获取失败";
-            else
-                msg="入廊人员统计信息获取成功";
+            else {
+                code="200";
+                msg = "入廊人员统计信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "入廊人员统计信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
         return resultMap;
@@ -296,6 +316,7 @@
 
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
 
         try {
@@ -304,8 +325,10 @@
                 pgDeviceDtoList=pgDeviceManager.getPgCameraListByPosition("",apCodeStr);
                 if(pgDeviceDtoList==null)
                     msg="不存在关联摄像机";
-                else
-                    msg="关联摄像机获取成功";
+                else {
+                    code="200";
+                    msg = "关联摄像机获取成功";
+                }
             } else {
                 msg="请输入Ap编号";
             }
@@ -315,6 +338,7 @@
             msg="关联摄像机获取成功";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgDeviceDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java
index 507b3fe..b43f077 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java
@@ -34,6 +34,7 @@
 
         String result="";
         String msg="";
+        String code="";
         try{
             PgInPgStatus pgInPgStatus=new PgInPgStatus();
 
@@ -44,6 +45,7 @@
             pgInPgStatusManager.save(pgInPgStatus);
             msg="入廊时间提交成功";
             result="true";
+            code="200";
         }
         catch (Exception e){
             e.printStackTrace();
@@ -51,6 +53,7 @@
             result="false";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -66,6 +69,7 @@
 
         String result="";
         String msg="";
+        String code="0";
         try{
             PgInPgPerson pgInPgPerson=pgInPgPersonManager.getPgInPgPersonByAssetCode(assetCode);
 
@@ -79,6 +83,7 @@
             pgInPgStatusManager.save(pgInPgStatus);
 
             msg="出廊时间提交成功";
+            code="200";
             result="true";
         }
         catch (Exception e){
@@ -87,6 +92,7 @@
             result="false";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
index 9def330..9c0ba1f 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
@@ -33,17 +33,20 @@
                                             @FormParam("existNum") String existNum) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         String result="";
 
         try {
             pgIntelPlanManager.savePgIntelPlan(parName,lineName,maxNum,existNum);
             msg="规划数据保存成功";
+            code="200";
             result="true";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "规划数据保存失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
@@ -55,15 +58,18 @@
     public Map<String, Object> getIntelLineType() throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgIntelPlanTypeDto> pgIntelPlanTypeDtoList=new ArrayList<>();
         try {
             pgIntelPlanTypeDtoList=pgIntelPlanManager.getIntelPlanType();
+            code="200";
             msg="获取排线类型成功";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "获取排线类型失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgIntelPlanTypeDtoList);
         return resultMap;
@@ -76,6 +82,7 @@
                                             @FormParam("partitionStr") String partitionStr) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgIntelPlanDto> pgIntelPlanDtoList = new ArrayList<>();
 
@@ -83,8 +90,10 @@
             pgIntelPlanDtoList = pgIntelPlanManager.getPgIntelPlanListByPartion(lineName, partitionStr);
             if(pgIntelPlanDtoList==null||pgIntelPlanDtoList.size()==0)
                 msg="请输入正确的规划参数";
-            else
-                msg="规划数据获取成功";
+            else {
+                code="200";
+                msg = "规划数据获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "规划数据获取失败";
@@ -103,10 +112,12 @@
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
         String result="";
+        String code="0";
 
         try {
             boolean bl=pgIntelPlanManager.addLineUse(lineName,partitionStr,num);
             if(bl){
+                code="200";
                 msg="排线入廊成功";
                 result="true";
             }
@@ -119,6 +130,7 @@
             msg = "排线入廊失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
@@ -132,6 +144,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
         String result="";
+        String code="0";
 
         try {
             PgIntelPlan pgIntelPlan=pgIntelPlanManager.getPgIntelPlanByParNameAndLine(lineName,parName);
@@ -140,11 +153,13 @@
             pgIntelPlanManager.save(pgIntelPlan);
             msg="规划数据删除成功";
             result="true";
+            code="200";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "规划数据删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java b/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java
index 378af00..9c39523 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java
@@ -1,5 +1,6 @@
 package com.casic.PgInterface.rs;
 
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
 import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
 import com.casic.PgInterface.intelPlan.dto.PgLineHoleDTO;
 import com.casic.PgInterface.intelPlan.manager.PgLineHoleManager;
@@ -27,6 +28,9 @@
     @Resource
     private PgPileAcuManager pgPileAcuManager;
 
+    @Resource
+    private PgRoadManager pgRoadManager;
+
     @POST
     @Path("getPgLineAcuHole")
     @Produces(MediaType.APPLICATION_JSON)
@@ -34,23 +38,32 @@
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
         String result="";
+        String code="0";
         List<PgLineHoleDTO> pgLineHoleDTOList=new ArrayList<>();
 
         try {
             PgPileAcu pgPileAcu=pgPileAcuManager.getPgPileAcuByCode(acuCode);
             if(pgPileAcu==null){
                 msg="不存在分区";
-            }else{
-                pgLineHoleDTOList=pgLineHoleManager.getCurrentHoleByAcu(pgPileAcu.getId());
-                if(pgLineHoleDTOList!=null&&pgLineHoleDTOList.size()!=0)
-                    msg="获取成功";
-                else
-                    msg="未找到入廊数据";
+            }else {
+                pgLineHoleDTOList = pgLineHoleManager.getCurrentHoleByAcu(pgPileAcu.getId());
+                if (pgLineHoleDTOList != null && pgLineHoleDTOList.size() != 0)
+                {
+                    code="200";
+                    msg = "获取成功";
+                }
+                else {
+                    PgLineHoleDTO pgLineHoleDTO=new PgLineHoleDTO();
+                    pgLineHoleDTO.setRoad(pgRoadManager.get(pgPileAcu.getRoadId()).getRoadName());
+                    pgLineHoleDTOList.add(pgLineHoleDTO);
+                    msg = "未找到入廊数据";
+                }
             }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgLineHoleDTOList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgLogRs.java b/src/main/java/com/casic/PgInterface/rs/PgLogRs.java
index 39cff52..30db63b 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgLogRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgLogRs.java
@@ -45,6 +45,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         PgLog pgLog=new PgLog();
         try {
             PgUser pgUser = new PgUser();
@@ -60,14 +61,15 @@
             pgLogManager.save(pgLog);
             result = "true";
             msg = "保存成功";
-
+            code="200";
         } catch (Exception e) {
             result = "false";
             msg = "保存失败";
             e.printStackTrace();
         }
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -83,17 +85,21 @@
             throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgLogDto> pgLogDtoList = new ArrayList<PgLogDto>();
         try {
             pgLogDtoList = pgLogManager.getAllLogs(userName, startTime, endTime);
             if (pgLogDtoList == null || pgLogDtoList.size() == 0)
                 msg = "没有找到日志信息";
-            else
+            else {
+                code="200";
                 msg = "日志信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "日志信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgLogDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java
index 9fd0a5f..37b72f6 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java
@@ -36,19 +36,23 @@
         Map<String,Object> resultMap=new HashMap<>();
 
         String msg = "";
+        String code="0";
         List<PgMaintainType> pgMaintainTypeList=new ArrayList<>();
         try{
             pgMaintainTypeList=pgMaintainTypeManager.getMaintainType();
             if(pgMaintainTypeList!=null&&pgMaintainTypeList.size()!=0)
                 msg="不存在运维类别";
-            else
-                msg="运维类别获取成功";
+            else {
+                code="200";
+                msg = "运维类别获取成功";
+            }
         }
         catch(Exception ex)
         {
             ex.printStackTrace();
             msg="运维类别获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgMaintainTypeList);
 
@@ -65,10 +69,11 @@
         Map<String,Object> resultMap=new HashMap<>();
 
         String msg = "";
+        String code="0";
         List<PgMaintainTypeDto> pgMaintainTypeDtoList=new ArrayList<PgMaintainTypeDto>();
         try{
             pgMaintainTypeDtoList=pgMaintainTypeManager.getMaintainTypeModel(type);
-
+            code="200";
             msg="维护类型获取成功";
         }
         catch(Exception ex)
@@ -77,9 +82,9 @@
             msg="维护类型获取失败";
         }
 
-        resultMap.put("result",pgMaintainTypeDtoList);
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgMaintainTypeDtoList);
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java
index d735cc9..82ffca4 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java
@@ -33,12 +33,16 @@
                                                  @FormParam("endTime") String endTime){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
         List<PgMaintanceRecordHeadDto> pgMaintanceRecordHeadDtoList=new ArrayList<>();
         try{
             pgMaintanceRecordHeadDtoList=pgMaintanceRecordHeadManager.getPgMaintanceRecordHeadLsit(repairMan,startTime,endTime);
             if(pgMaintanceRecordHeadDtoList!=null&&pgMaintanceRecordHeadDtoList.size()!=0)
+            {
+                code="200";
                 msg="维护信息获取成功";
+            }
             else
                 msg="不存在维护信息";
         }
@@ -47,6 +51,7 @@
             msg="巡检信息获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgMaintanceRecordHeadDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java
index effc9df..9f46fc8 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java
@@ -32,12 +32,16 @@
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
         String result="";
+        String code="0";
 
         List<PgMaintanceRecordHeadStatic> pgMaintanceRecordHeadStaticList=new ArrayList<>();
         try{
             pgMaintanceRecordHeadStaticList=pgMaintanceRecordHeadManager.getPgMaintanceRecordHeadStaticLisByTime(startTime,endTime,staticType);
             if(pgMaintanceRecordHeadStaticList!=null&&pgMaintanceRecordHeadStaticList.size()!=0)
+            {
+                code="200";
                 msg="维护统计信息获取成功";
+            }
             else
                 msg="维护统计失败";
         }
@@ -46,7 +50,7 @@
             ex.printStackTrace();
             msg="统计失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgMaintanceRecordHeadStaticList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java b/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java
index 3a67bf3..6a5f4dc 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java
@@ -39,27 +39,31 @@
     @Path("getO2InfoByDevAndDate")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getO2InfoByDevAndDate(@FormParam("assetCode") String assetCode,
-                                                      @FormParam("startDate") String startDate,
-                                                      @FormParam("endDate") String endDate)throws Exception {
+                                                     @FormParam("startDate") String startDate,
+                                                     @FormParam("endDate") String endDate)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgHistoryDataDto> pgHistoryDataDtoList=new ArrayList<>();
 
         try {
             PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
                 msg="设备不存在";
-            else{
-                pgHistoryDataDtoList=pgO2Manager.getAllO2Data(pgDevice, startDate, endDate);
-                if(pgHistoryDataDtoList==null)
-                    msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+            else {
+                pgHistoryDataDtoList = pgO2Manager.getAllO2Data(pgDevice, startDate, endDate);
+                if (pgHistoryDataDtoList == null)
+                    msg = "没有满足要求的数据";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgHistoryDataDtoList);
         return resultMap;
@@ -75,23 +79,27 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         PgO2Dto pgO2Dto=new PgO2Dto(null);
 
         try {
             PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
                 msg="设备不存在";
-            else{
-                pgO2Dto=pgO2Manager.getNewestO2Data(pgDevice);
-                if(pgO2Dto==null)
-                    msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+            else {
+                pgO2Dto = pgO2Manager.getNewestO2Data(pgDevice);
+                if (pgO2Dto == null)
+                    msg = "没有满足要求的数据";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgO2Dto);
         return resultMap;
@@ -104,11 +112,12 @@
     @Path("addO2Data")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> addO2Data(@FormParam("devCode") String devCode,
-                                          @FormParam("upTime") String upTime,
-                                          @FormParam("o2") String o2)throws Exception {
+                                         @FormParam("upTime") String upTime,
+                                         @FormParam("o2") String o2)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
@@ -125,6 +134,7 @@
                 pgO2.setPgDeviceId(pgDevice);
 
                 pgO2Manager.save(pgO2);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -133,9 +143,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java b/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java
index 6217cde..70b3b41 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java
@@ -30,8 +30,6 @@
 public class PgOverViewRs {
 
     @Resource
-    private PgInPgPersonManager pgInPgPersonManager;
-    @Resource
     private PgInPgStatusManager pgInPgStatusManager;
     @Resource
     private PgAlarmManager pgAlarmManager;
@@ -46,18 +44,21 @@
     @Path("getPersonNumInPgByMonth")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<Object, String> getMonthInPgPersonNum() throws Exception {
-        Map<Object, String> resultMap = new HashMap<Object, String>();
+        Map<Object, String> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         int inNum = 0;
 
         try {
             inNum = pgInPgStatusManager.getMonthInPgPersonNum();
+            code="200";
             msg = "本月入廊人员次数获取成功";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "本月入廊人员次数获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", String.valueOf(inNum));
 
@@ -73,15 +74,18 @@
     public Map<Object, String> getWeekInPgPersonNum() throws Exception {
         Map<Object, String> resultMap = new HashMap<Object, String>();
         String msg = "";
+        String code="0";
         int inNum = 0;
         try {
             inNum = pgInPgStatusManager.getWeekInPgPersonNum();
+            code="200";
             msg = "本周入廊人员次数获取成功";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "本周入廊人员次数获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", String.valueOf(inNum));
 
@@ -97,19 +101,22 @@
     public Map<String, Object> getDayInPgStatistic() throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<>();
         try {
             pgInPgInfoDtoList = pgInPgStatusManager.getPgInPersonListByDay();
             if (pgInPgInfoDtoList == null)
                 msg = "信息获取失败";
-            else
+            else {
+                code="200";
                 msg = "信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "信息获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
         return resultMap;
@@ -124,18 +131,23 @@
     public Map<String, Object> getTodayInPgInfo() throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
 
         List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<PgInPgInfoDto>();
         try {
             pgInPgInfoDtoList = pgInPgStatusManager.getTodayInPgInfo();
             if(pgInPgInfoDtoList!=null||pgInPgInfoDtoList.size()!=0)
+            {
+                code="200";
                 msg = "信息获取成功";
+            }
             else
                 msg="当天没有入廊人员信息";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
 
@@ -149,18 +161,22 @@
     public Map<String, Object> getAlarmNum(@FormParam("isDevFault") String isDevFault) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         int num = 0;
 
         try {
             if(isDevFault!=null){
                 num = pgAlarmManager.getAlarmNum(isDevFault);
-                msg = "报警数量获取成功";}
+                msg = "报警数量获取成功";
+                code="200";
+            }
             else
                 msg="请输入统计参数";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警数量统计失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", num);
 
@@ -176,16 +192,18 @@
     public Map<Object, String> getMonthAlarmNum(@FormParam("isDevFault") String isDevFault) throws Exception {
         Map<Object, String> resultMap = new HashMap<Object, String>();
         String msg = "";
+        String code="0";
         int inNum = 0;
 
         try {
-                inNum = pgAlarmManager.getMonthAlarmNum(isDevFault);
-                msg = "报警次数获取成功";
+            inNum = pgAlarmManager.getMonthAlarmNum(isDevFault);
+            code="200";
+            msg = "报警次数获取成功";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警次数获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", String.valueOf(inNum));
 
@@ -201,15 +219,17 @@
     public Map<Object, String> getWeekAlarmNum(@FormParam("isDevFault") String isDevFault) throws Exception {
         Map<Object, String> resultMap = new HashMap<Object, String>();
         String msg = "";
+        String code="0";
         int inNum = 0;
         try {
             inNum = pgAlarmManager.getWeekAlarmNum(isDevFault);
+            code="200";
             msg = "报警次数获取成功";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警次数获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", String.valueOf(inNum));
 
@@ -225,14 +245,17 @@
     public Map<String, Object> getDayAlarmStatistic() throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgAlarmTjDto> pgAlarmTjDtoList = new ArrayList<PgAlarmTjDto>();
         try {
             pgAlarmTjDtoList = pgAlarmManager.getDayAlarmStatistic();
             if (pgAlarmTjDtoList == null)
                 msg = "信息获取失败";
-            else
+            else {
+                code="200";
                 msg = "信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "信息获取失败";
@@ -252,9 +275,11 @@
     public Map<String, Object> getAlarmList(@FormParam("isDevFault") String isDevFault) throws Exception{
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         List<PgAlarmDto> pgAlarmDtoList=new ArrayList<>();
         try{
             pgAlarmDtoList=pgAlarmManager.getAlarmList(isDevFault);
+            code="200";
             msg="信息获取成功";
         }
         catch(Exception e)
@@ -262,6 +287,7 @@
             e.printStackTrace();
             msg="信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAlarmDtoList);
 
@@ -278,17 +304,19 @@
     public Map<String,Object> getConstructionNum() throws Exception{
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgConstructionTypeNumStatisticDto> pgConstructionTypeNumDtoList=new ArrayList<PgConstructionTypeNumStatisticDto>();
         try{
             pgConstructionTypeNumDtoList=pgConstructionManager.getConstructionNum();
             msg="施工数量获取成功";
+            code="200";
         }
         catch(Exception e)
         {
             e.printStackTrace();
             msg="施工数量统计";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionTypeNumDtoList);
 
@@ -302,21 +330,25 @@
     @Path("getConstructionToday")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> getConstructionToday() throws Exception{
-        Map<String,Object > resultMap = new HashMap<String,Object>();
+        Map<String,Object > resultMap = new HashMap<>();
         String msg = "";
-        List<PgConstructionDto> pgConstructionDtoList=new ArrayList<PgConstructionDto>();
+        String code="0";
+        List<PgConstructionDto> pgConstructionDtoList=new ArrayList<>();
         try {
             pgConstructionDtoList = pgConstructionManager.getConstructionToday();
-            if (pgConstructionDtoList == null&&pgConstructionDtoList.size()==0)
+            if (pgConstructionDtoList == null && pgConstructionDtoList.size() == 0)
                 msg = "不存在施工信息";
-            else
+            else {
+                code="200";
                 msg = "施工信息获取成功";
+            }
         }
         catch(Exception e)
         {
             e.printStackTrace();
             msg="施工信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java b/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java
index d3c10d4..31ffcfc 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java
@@ -48,6 +48,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 
         try {
@@ -66,9 +67,9 @@
                 pgPartition.setMaterial(material);
                 pgPartition.setActive(1);
 
-                logger.info("成功保存");
                 pgPartitionManager.save(pgPartition);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
         } catch (Exception e) {
@@ -76,9 +77,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
         return resultMap;
     }
     /*
@@ -100,6 +101,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         PgPartition partition = new PgPartition();
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
@@ -122,6 +124,7 @@
 
                 pgPartitionManager.save(pgPartition);
                 result = "true";
+                code="200";
                 msg = "编辑成功";
             }
 
@@ -131,8 +134,10 @@
             e.printStackTrace();
         }
 
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
+
         return resultMap;
     }
 
@@ -147,7 +152,8 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
-        String result="false";
+        String result="";
+        String code="0";
 
         try {
             PgPartition pgPartition=pgPartitionManager.get(Long.valueOf(id));
@@ -161,12 +167,14 @@
                 pgPartitionManager.save(pgPartition);
                 msg="分区删除成功";
                 result="true";
+                code="200";
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="分区删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -181,14 +189,17 @@
     public Map<String, Object> getPartition() throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgPartitionDto> pgPartitionDtoList = new ArrayList<PgPartitionDto>();
         try {
             pgPartitionDtoList = pgPartitionManager.getPgPartitionDtoList();
+            code="200";
             msg = "获取成功";
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgPartitionDtoList);
         return resultMap;
@@ -203,14 +214,17 @@
     public Map<String, Object> getPartitionListByName(@FormParam("parName") String parName) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgPartitionDto> pgPartitionDtoList = new ArrayList<PgPartitionDto>();
         try {
             pgPartitionDtoList = pgPartitionManager.getPartitionByName(parName);
+            code="200";
             msg = "获取成功";
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgPartitionDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java b/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java
index 883adf9..cf81b72 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java
@@ -37,6 +37,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
         PgRoad pgRoad=pgRoadManager.getPgRoadByName(road);
         try {
             PgPileAcu pgPileAcu=new PgPileAcu();
@@ -49,6 +50,7 @@
             pgPileAcu.setActive(true);
 
             pgPileAcuManager.save(pgPileAcu);
+            code="200";
             result="true";
             msg="保存成功";
         } catch (Exception e) {
@@ -56,9 +58,10 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
+
         return resultMap;
     }
 
@@ -73,6 +76,7 @@
 
         String result="";
         String msg="";
+        String code="0";
         try{
             PgPileAcu pgPileAcu=pgPileAcuManager.get(id);
             if(pgPileAcu==null){
@@ -83,7 +87,7 @@
             {
                 pgPileAcu.setActive(false);
                 pgPileAcuManager.save(pgPileAcu);
-
+                code="200";
                 result="true";
                 msg="桩号删除成功";
             }
@@ -94,8 +98,9 @@
             ex.printStackTrace();
         }
 
-        resultMap.put("result",result);
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
+        resultMap.put("result",result);
 
         return resultMap;
     }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPileRs.java b/src/main/java/com/casic/PgInterface/rs/PgPileRs.java
index cf62954..c9999ac 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgPileRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgPileRs.java
@@ -33,6 +33,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             PgPile pgPile=new PgPile();
@@ -40,6 +41,7 @@
             pgPile.setActive(true);
 
             pgPileManager.save(pgPile);
+            code="200";
             result="true";
             msg="保存成功";
         } catch (Exception e) {
@@ -47,9 +49,10 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
+
         return resultMap;
     }
 
@@ -64,9 +67,10 @@
         Map<String,Object> resultMap=new HashMap<>();
         List<PgPileDTO> pgPileDTOList=new ArrayList<>();
         String msg="";
+        String code="0";
         try{
             pgPileDTOList=pgPileManager.getPgPileDTOList();
-
+            code="200";
             msg="获取成功";
         }
         catch(Exception ex){
@@ -74,8 +78,9 @@
             msg="获取成失败";
             ex.printStackTrace();
         }
-        resultMap.put("result",pgPileDTOList);
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
+        resultMap.put("result",pgPileDTOList);
 
         return resultMap;
     }
@@ -91,6 +96,7 @@
 
         String result="";
         String msg="";
+        String code="0";
         try{
             PgPile pgPile=pgPileManager.get(id);
             if(pgPile==null){
@@ -101,7 +107,7 @@
             {
                 pgPile.setActive(false);
                 pgPileManager.save(pgPile);
-
+                code="200";
                 result="true";
                 msg="桩号删除成功";
             }
@@ -111,9 +117,9 @@
             msg="桩号删除失败";
             ex.printStackTrace();
         }
-
-        resultMap.put("result",result);
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
+        resultMap.put("result",result);
 
         return resultMap;
     }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
index 6ee63ff..63b5597 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
@@ -53,10 +53,12 @@
         try {
                resultMap = pgPipeLineManager.addPipeLine(lineCode,lineType,secRow,secColumn,pileAcuList);
                resultMap.put("msg","提交成功");
+               resultMap.put("code","200");
                resultMap.put("result","true");
 
         } catch (Exception e) {
             e.printStackTrace();
+            resultMap.put("code","0");
             resultMap.put("result","false");
             resultMap.put("msg","提交失败");
             return  resultMap;
@@ -74,14 +76,17 @@
     public Map<String, Object> getPipeLineByLineType(@FormParam("lineType") String lineType) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgPipeLineDto> pgPipeLineDtoList=new ArrayList<PgPipeLineDto>();
         try {
             pgPipeLineDtoList = pgPipeLineManager.getPipeLineByLineType(lineType);
+            code="200";
             msg = "获取成功";
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgPipeLineDtoList);
         return resultMap;
@@ -96,6 +101,7 @@
     public Map<String, Object> getPipeLineByName(@FormParam("lineCode") String lineCode) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         PgPipeLineDto pgPipeLineDto=null;
         try {
             PgPipeLine pgPipeLine = pgPipeLineManager.getPipeLineBylineName(lineCode);
@@ -103,12 +109,14 @@
                 msg="不存在："+lineCode;
             else {
                 pgPipeLineDto = new PgPipeLineDto(pgPipeLine);
+                code="200";
                 msg = "获取成功";
             }
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgPipeLineDto);
         return resultMap;
@@ -123,15 +131,18 @@
     public Map<String,Object> getPipeLengthStatic()throws Exception{
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         List<PgPipeLineLengthStatic> pgPipeLineLengthStaticList=new ArrayList<PgPipeLineLengthStatic>();
         try {
             pgPipeLineLengthStaticList = pgPipeLineManager.getPipeLengthByName();
+            code="200";
             msg="管线长度获取成功";
         }catch(Exception e)
         {
             e.printStackTrace();
             msg="管线长度统计失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgPipeLineLengthStaticList);
 
@@ -147,14 +158,17 @@
     public Map<String, Object> getPipeLineType() throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgPipeLineTypeDto> pgPipeLineTypeDtoList=new ArrayList<PgPipeLineTypeDto>();
         try {
             pgPipeLineTypeDtoList = pgPipeLineManager.getPipeType();
+            code="200";
             msg = "获取成功";
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgPipeLineTypeDtoList);
         return resultMap;
@@ -170,20 +184,24 @@
         Map<String,Object> resultMap=new HashMap<String, Object>();
 
         String msg="";
+        String code="0";
         List<PgPipeLineTypeNumDto> pgPipeLineTypeNumDtoList=new ArrayList<PgPipeLineTypeNumDto>();
 
-        try{
-            pgPipeLineTypeNumDtoList=pgPipeLineManager.getPipeTypeNum();
+        try {
+            pgPipeLineTypeNumDtoList = pgPipeLineManager.getPipeTypeNum();
 
-            if(pgPipeLineTypeNumDtoList==null)
-                msg="不存在管线类型占比";
-            else
-                msg="管线占比获取成功";
+            if (pgPipeLineTypeNumDtoList == null)
+                msg = "不存在管线类型占比";
+            else {
+                code="200";
+                msg = "管线占比获取成功";
+            }
         }
         catch (Exception e){
             msg="管线占比数量获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgPipeLineTypeNumDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java
index 672b376..7042994 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java
@@ -43,17 +43,21 @@
     public Map<String,Object> getReservePlan() {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgReservePlanDto> pgReservePlanDtoList = new ArrayList<PgReservePlanDto>();
         try {
             pgReservePlanDtoList = pgReservePlanManager.getPgReservePlanDto();
             if (pgReservePlanDtoList == null)
                 msg = "不存在预案信息";
-            else
+            else {
+                code="200";
                 msg = "预案信息获取成功";
-        } catch (Exception e) {
+            }
+        }catch (Exception e) {
             e.printStackTrace();
             msg = "预案信息获取是失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgReservePlanDtoList);
         return resultMap;
@@ -66,6 +70,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
 
         String msg = "";
+        String code="0";
         ResponseEntity<byte[]> path = null;
         try {
             PgReservePlan pgReservePlan = pgReservePlanManager.get(Long.valueOf(id));
@@ -73,15 +78,17 @@
 
             if (path == null)
                 msg = "不存在该文档";
-            else
+            else {
+                code="200";
                 msg = "下载成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "下载失败";
         }
-
-        resultMap.put("result", path.getBody());
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", path.getBody());
         return resultMap;
     }
     /*
@@ -99,6 +106,7 @@
         Map<String,Object> resultMap=new HashMap<String, Object>();
         String msg="";
         String result="";
+        String code="0";
 
         try {
             PgReservePlan pgReservePlan = new PgReservePlan();
@@ -124,6 +132,7 @@
                 pgReservePlanManager.save(pgReservePlan);
                 msg = "新增成功";
                 result = "true";
+                code="200";
             }
         }
         catch(Exception e)
@@ -133,6 +142,7 @@
             result="false";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -152,6 +162,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             PgReservePlan pgReservePlan=pgReservePlanManager.get(Long.valueOf(id));
@@ -177,6 +188,7 @@
 
                     pgReservePlanManager.save(pgReservePlan);
 
+                    code="200";
                     result = "true";
                     msg = "编辑成功";
                 }
@@ -187,6 +199,7 @@
             msg = "编辑失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -201,6 +214,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
         String result="";
+        String code="0";
 
         try{
 
@@ -214,6 +228,7 @@
                 pgReservePlan.setActive(0);;
                 pgReservePlanManager.save(pgReservePlan);
                 result="true";
+                code="200";
                 msg="删除成功";
             }
         }
@@ -224,6 +239,7 @@
             result="false";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java b/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java
index 8f049c8..3c48a8d 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java
@@ -42,19 +42,22 @@
         Map<String,Object> resultMap=new HashMap<String, Object>();
 
         String msg="";
+        String code="0";
         List<PgRoadDto> pgRoadDtoList=new ArrayList<PgRoadDto>();
-        try{
+        try {
             pgRoadDtoList = pgRoadManager.getAllRoad();
             if (pgRoadDtoList.size() == 0)
                 msg = "没有道路信息";
-            else
+            else {
+                code="200";
                 msg = "道路信息获取成功";
+            }
         }
         catch(Exception e){
             msg="道路信息获取失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgRoadDtoList);
 
@@ -71,6 +74,7 @@
         Map<String,Object> resultMap=new HashMap<String, Object>();
         String msg="";
         String result="";
+        String code="0";
 
         try{
             PgRoad pgRoad=new PgRoad();
@@ -78,7 +82,7 @@
             pgRoad.setActive(1);
 
             pgRoadManager.save(pgRoad);
-
+            code="200";
             msg="新增道路成功";
             result="true";
         }
@@ -87,7 +91,7 @@
             result="true";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -107,6 +111,7 @@
 
         String msg="";
         String result="";
+        String code="0";
 
         try {
             PgRoad pgRoad=pgRoadManager.get(Long.valueOf(id));
@@ -123,6 +128,7 @@
                 pgRoadManager.save(pgRoad);
                 msg="道路信息保存成功";
                 result="true";
+                code="200";
             }
         }
         catch(Exception e){
@@ -130,6 +136,7 @@
             result="false";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -147,6 +154,7 @@
 
         String msg="";
         String result="";
+        String code="0";
         PgRoad pgRoad=null;
 
         try{
@@ -159,6 +167,7 @@
                 pgRoad.setActive(0);
                 pgRoadManager.save(pgRoad);
                 msg="道路删除成功";
+                code="200";
                 result="true";
             }
         }
@@ -168,6 +177,7 @@
             e.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -184,26 +194,29 @@
         Map<String,Object> resultMap=new HashMap<String, Object>();
         String msg="";
         String result="";
+        String code="0";
 
         List<PgPartitionDto> pgPartitionDtoList=null;
         try{
             PgRoad pgRoad=pgRoadManager.getPgRoadByName(roadName);
             if(pgRoad==null)
                 msg="不存在道路信息";
-            else
-            {
-                pgPartitionDtoList=pgPartitionManager.getPgPartitonDtoByRoad(pgRoad);
-                if(pgPartitionDtoList==null||pgPartitionDtoList.size()==0)
-                    msg="该道路没有分区信息";
-                else
-                    msg="分区信息获取成功";
+            else {
+                pgPartitionDtoList = pgPartitionManager.getPgPartitonDtoByRoad(pgRoad);
+                if (pgPartitionDtoList == null || pgPartitionDtoList.size() == 0)
+                    msg = "该道路没有分区信息";
+                else {
+                    code="200";
+                    msg = "分区信息获取成功";
+                }
             }
         }
         catch (Exception e)
         {
+            e.printStackTrace();
             msg="分区信息获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgPartitionDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java b/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java
index 90d709a..7a713bf 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java
@@ -42,17 +42,21 @@
     public Map<String,Object> getRoleList() {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgRoleDto> pgRoleDtoList = new ArrayList<PgRoleDto>();
         try {
             pgRoleDtoList = pgRoleManager.getPgRoleDtoList();
             if (pgRoleDtoList == null)
                 msg = "不存在角色信息";
-            else
+            else {
+                code="200";
                 msg = "角色信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "角色信息获取是失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgRoleDtoList);
         return resultMap;
@@ -69,6 +73,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try{
             PgAuthority pgAuthority=pgAuthorityManager.getAuthorityByAuthority(authority);
@@ -79,6 +84,7 @@
 
             pgRoleManager.save(pgRole);
             msg="用户角色保存成功";
+            code="200";
             result="true";
         }
         catch(Exception e) {
@@ -86,6 +92,7 @@
             msg = "新增角色失败";
             result = "false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -104,6 +111,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         try {
             PgRole pgRole = pgRoleManager.get(Long.valueOf(id));
 
@@ -112,6 +120,7 @@
             pgRole.setPgAuthorityId(pgAuthority);
             pgRoleManager.save(pgRole);
 
+            code="200";
             msg="角色保存成功";
             result="true";
         }
@@ -122,6 +131,7 @@
             result="false";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -138,7 +148,8 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
-        String result="false";
+        String result="";
+        String code="0";
 
         try {
             PgRole pgRole= pgRoleManager.get(Long.valueOf(id));
@@ -152,12 +163,14 @@
                 pgRoleManager.save(pgRole);
                 msg="删除角色成功";
                 result="true";
+                code="200";
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="删除角色失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java b/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java
index 0e413b8..d146811 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java
@@ -38,6 +38,7 @@
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
         String result="";
+        String code="0";
         PgRoad pgRoad=pgRoadManager.getPgRoadByName(road);
 
         try{
@@ -55,13 +56,14 @@
             pgSectionManager.save(pgSection);
             msg="截面信息保存成功";
             result="true";
+            code="200";
         }
         catch(Exception ex){
             msg="界面信息保存失败";
             result="false";
             ex.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -77,6 +79,7 @@
 
         String msg="";
         String result="";
+        String code="0";
 
         try{
             PgSection pgSection=pgSectionManager.get(id);
@@ -84,6 +87,7 @@
             pgSection.setActive(false);
             pgSectionManager.save(pgSection);
 
+            code="200";
             msg="截面删除成功";
             result="true";
         }
@@ -92,7 +96,7 @@
             result="false";
             ex.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -107,16 +111,19 @@
         Map<String,Object> resultMap=new HashMap<>();
         List<PgLineType> pgLineTypeList=new ArrayList<>();
         String msg="";
+        String code="0";
 
         try{
             pgLineTypeList=pgSectionManager.getLineType();
             msg="获取成功";
+            code="200";
         }
         catch(Exception ex){
             ex.printStackTrace();
             msg="获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgLineTypeList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgShRs.java b/src/main/java/com/casic/PgInterface/rs/PgShRs.java
index 1e35f4b..323c82f 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgShRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgShRs.java
@@ -45,23 +45,27 @@
                                                      @FormParam("endDate") String endDate)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgHistoryDataDto> pgHistoryDataDtoList=new ArrayList<>();
 
         try {
             PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
                 msg="设备不存在";
-            else{
-                pgHistoryDataDtoList=pgShManager.getAllShData(pgDevice, startDate, endDate);
-                if(pgHistoryDataDtoList==null)
-                    msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+            else {
+                pgHistoryDataDtoList = pgShManager.getAllShData(pgDevice, startDate, endDate);
+                if (pgHistoryDataDtoList == null)
+                    msg = "没有满足要求的数据";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgHistoryDataDtoList);
         return resultMap;
@@ -77,23 +81,27 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         PgShDto pgShDto=new PgShDto(null);
 
         try {
             PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
                 msg="设备不存在";
-            else{
-                pgShDto=pgShManager.getNewestShData(pgDevice);
-                if(pgShDto==null)
-                    msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+            else {
+                pgShDto = pgShManager.getNewestShData(pgDevice);
+                if (pgShDto == null)
+                    msg = "没有满足要求的数据";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgShDto);
         return resultMap;
@@ -111,6 +119,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
@@ -128,6 +137,7 @@
 
                 pgShManager.save(pgSh);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
         } catch (Exception e) {
@@ -135,9 +145,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java b/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java
index a23b2da..76023a9 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java
@@ -43,23 +43,27 @@
                                                       @FormParam("endDate") String endDate)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgHistoryTempDto> pgHistoryTempDtoList=new ArrayList<>();
 
         try {
             PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
                 msg="设备不存在";
-            else{
-                pgHistoryTempDtoList=pgTempHumManager.getAllTempHumData(pgDevice, startDate, endDate);
-                if(pgHistoryTempDtoList==null)
-                    msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+            else {
+                pgHistoryTempDtoList = pgTempHumManager.getAllTempHumData(pgDevice, startDate, endDate);
+                if (pgHistoryTempDtoList == null)
+                    msg = "没有满足要求的数据";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgHistoryTempDtoList);
         return resultMap;
@@ -75,23 +79,27 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         PgTempHumDto pgTempHumDto=new PgTempHumDto(null);
 
         try {
             PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
                 msg="设备不存在";
-            else{
-                pgTempHumDto=pgTempHumManager.getNewestTempHumData(pgDevice);
-                if(pgTempHumDto==null)
-                    msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+            else {
+                pgTempHumDto = pgTempHumManager.getNewestTempHumData(pgDevice);
+                if (pgTempHumDto == null)
+                    msg = "没有满足要求的数据";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgTempHumDto);
         return resultMap;
@@ -110,6 +118,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         try {
@@ -127,6 +136,7 @@
 
                 pgTempHumManager.save(pgTempHum);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
         } catch (Exception e) {
@@ -135,8 +145,10 @@
             e.printStackTrace();
         }
 
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
+
         return resultMap;
     }
 

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 25ded8a..283d7ab 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,20 +7,56 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" 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/construction/manager/PgCsDocumentManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/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/manager/PgAlarmManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/~$说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/~$说明20191207.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.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$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/接口说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明20191207.docx" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
@@ -51,7 +87,7 @@
         <counts>
           <entry key="class" value="4" />
           <entry key="iml" value="2" />
-          <entry key="java" value="707" />
+          <entry key="java" value="820" />
           <entry key="properties" value="14" />
           <entry key="xml" value="7" />
         </counts>
@@ -60,7 +96,7 @@
         <counts>
           <entry key="CLASS" value="4" />
           <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="707" />
+          <entry key="JAVA" value="820" />
           <entry key="Properties" value="14" />
           <entry key="XML" value="7" />
         </counts>
@@ -68,32 +104,32 @@
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
           <entry key="dummy" value="38" />
-          <entry key="java" value="30161" />
+          <entry key="java" value="40859" />
           <entry key="properties" value="100" />
-          <entry key="txt" value="176" />
+          <entry key="txt" value="186" />
           <entry key="xml" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="30161" />
-          <entry key="PLAIN_TEXT" value="214" />
+          <entry key="JAVA" value="40859" />
+          <entry key="PLAIN_TEXT" value="224" />
           <entry key="Properties" value="100" />
           <entry key="XML" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="48" />
+          <entry key="project.closed" value="51" />
           <entry key="project.open.time.1" value="5" />
           <entry key="project.open.time.12" value="2" />
           <entry key="project.open.time.13" value="1" />
           <entry key="project.open.time.15" value="1" />
           <entry key="project.open.time.16" value="1" />
           <entry key="project.open.time.17" value="1" />
-          <entry key="project.open.time.2" value="1" />
+          <entry key="project.open.time.2" value="2" />
           <entry key="project.open.time.20" value="1" />
-          <entry key="project.open.time.23" value="1" />
+          <entry key="project.open.time.23" value="2" />
           <entry key="project.open.time.24" value="2" />
           <entry key="project.open.time.251" value="1" />
           <entry key="project.open.time.27" value="2" />
@@ -106,8 +142,8 @@
           <entry key="project.open.time.36" value="1" />
           <entry key="project.open.time.37" value="1" />
           <entry key="project.open.time.39" value="2" />
-          <entry key="project.open.time.4" value="2" />
-          <entry key="project.open.time.40" value="1" />
+          <entry key="project.open.time.4" value="3" />
+          <entry key="project.open.time.40" value="2" />
           <entry key="project.open.time.41" value="2" />
           <entry key="project.open.time.42" value="2" />
           <entry key="project.open.time.43" value="2" />
@@ -122,23 +158,25 @@
           <entry key="project.open.time.6" value="3" />
           <entry key="project.open.time.63" value="2" />
           <entry key="project.open.time.64" value="1" />
+          <entry key="project.open.time.66" value="1" />
           <entry key="project.open.time.71" value="2" />
+          <entry key="project.open.time.74" value="1" />
           <entry key="project.open.time.76" value="1" />
           <entry key="project.open.time.8" value="2" />
           <entry key="project.open.time.9" value="1" />
           <entry key="project.open.time.97" value="1" />
-          <entry key="project.opened" value="78" />
+          <entry key="project.opened" value="84" />
         </counts>
       </usages-collector>
     </session>
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+            <state relative-caret-position="396">
+              <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
               <folding>
                 <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
                 <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -147,73 +185,6 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <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="99">
-              <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-              <folding>
-                <element signature="imports" expanded="true" />
-                <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-1170">
-              <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state>
-              <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
-              <folding>
-                <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-                <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="true">
-        <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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-              <folding>
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-                <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>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <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="352">
-              <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -225,18 +196,9 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>inCriteria</find>
-      <find>getPgPlanResulList</find>
-      <find>getPileAcuListByPileAcuStr</find>
-      <find>distinct</find>
-      <find>order</find>
-      <find>canPlanLine</find>
-      <find>isExistLine</find>
-      <find>getPlanResult</find>
       <find>pgPipeLine</find>
       <find>getPipeLineBylineName</find>
       <find>StringU</find>
-      <find>getAllAlarm</find>
       <find>getAlarmList</find>
       <find>getPgInPersonListByDay</find>
       <find>getDayInPgStatistic</find>
@@ -254,7 +216,16 @@
       <find>getPgContructionByNameOrType</find>
       <find>&quot;&quot;,&quot;&quot;,</find>
       <find>getPgContructionDtoByNameOrType</find>
+      <find>addConstruction</find>
+      <find>getPgLineAcuHole</find>
+      <find>getPlanResult</find>
       <find>getConstruction</find>
+      <find>addPipeLine</find>
+      <find>未找到入廊数据</find>
+      <find>getCurrentHoleByAcu</find>
+      <find>getAllAlarm</find>
+      <find>getPgDeviceDtoListByPartition</find>
+      <find>getPgDeviceByDevType</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -263,57 +234,57 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlan.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileHoleManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/planData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/PlanData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
       </list>
     </option>
   </component>
@@ -359,7 +330,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -421,53 +391,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="dto" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="manager" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -479,29 +402,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="rs" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -516,6 +416,7 @@
         </subPane>
       </pane>
       <pane id="Scope" />
+      <pane id="PackagesPane" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -710,7 +611,13 @@
       <workItem from="1574902733573" duration="1829000" />
       <workItem from="1574998240004" duration="7016000" />
       <workItem from="1575247959683" duration="6997000" />
-      <workItem from="1575704345590" duration="40473000" />
+      <workItem from="1575704345590" duration="69381000" />
+      <workItem from="1575869479666" duration="721000" />
+      <workItem from="1575947104878" duration="6101000" />
+      <workItem from="1576128264436" duration="3347000" />
+      <workItem from="1576208571543" duration="22000" />
+      <workItem from="1576227513917" duration="862000" />
+      <workItem from="1576293721220" duration="18246000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -817,11 +724,18 @@
       <option name="project" value="LOCAL" />
       <updated>1575775489149</updated>
     </task>
-    <option name="localTasksCounter" value="16" />
+    <task id="LOCAL-00016" summary="整改施工信息">
+      <created>1575791780774</created>
+      <option name="number" value="00016" />
+      <option name="presentableId" value="LOCAL-00016" />
+      <option name="project" value="LOCAL" />
+      <updated>1575791780774</updated>
+    </task>
+    <option name="localTasksCounter" value="17" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="452131000" />
+    <option name="totallyTimeSpent" value="510338000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -834,9 +748,8 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
-    <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.24205749" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2647504" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -847,7 +760,7 @@
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.3295082" />
       <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.4819672" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.65737706" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.3295082" />
@@ -939,7 +852,8 @@
     <MESSAGE value="重新设计智能规划部分" />
     <MESSAGE value="完成智能规划对接" />
     <MESSAGE value="修改报警统计" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改报警统计" />
+    <MESSAGE value="整改施工信息" />
+    <option name="LAST_COMMIT_MESSAGE" value="整改施工信息" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -951,16 +865,10 @@
           <option name="timeStamp" value="3" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java</url>
-          <line>69</line>
+          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java</url>
+          <line>40</line>
           <properties />
-          <option name="timeStamp" value="21" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java</url>
-          <line>96</line>
-          <properties />
-          <option name="timeStamp" value="38" />
+          <option name="timeStamp" value="122" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
@@ -970,394 +878,452 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <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="2068">
-          <caret line="154" column="35" selection-start-line="154" selection-start-column="35" selection-end-line="154" selection-end-column="35" />
-        </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="3300">
-          <caret line="297" column="22" selection-start-line="297" selection-start-column="22" selection-end-line="297" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/StringUtils.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
-          <caret line="13" column="48" lean-forward="true" selection-start-line="13" selection-start-column="48" selection-end-line="13" selection-end-column="48" />
+          <caret line="11" column="5" selection-start-line="11" selection-start-column="5" selection-end-line="11" selection-end-column="5" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="78" lean-forward="true" selection-start-line="78" selection-end-line="78" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="616">
-          <caret line="41" column="1" selection-start-line="41" selection-start-column="1" selection-end-line="41" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="110">
-          <caret line="12" column="23" selection-start-line="12" selection-start-column="23" selection-end-line="12" selection-end-column="23" />
+        <state relative-caret-position="516">
+          <caret line="114" column="12" selection-start-line="114" selection-start-column="12" selection-end-line="114" selection-end-column="12" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="164">
-          <caret line="56" lean-forward="true" selection-start-line="56" selection-end-line="56" />
+        <state relative-caret-position="418">
+          <caret line="33" column="44" selection-start-line="33" selection-start-column="44" selection-end-line="33" selection-end-column="44" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="258">
-          <caret line="27" column="12" lean-forward="true" selection-start-line="27" selection-start-column="12" selection-end-line="27" selection-end-column="12" />
+        <state relative-caret-position="132">
+          <caret line="11" column="20" lean-forward="true" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="20" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.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="-12">
-          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        <state relative-caret-position="516">
+          <caret line="142" column="54" selection-start-line="142" selection-start-column="54" selection-end-line="142" selection-end-column="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="858">
-          <caret line="55" column="27" lean-forward="true" selection-start-line="55" selection-start-column="27" selection-end-line="55" selection-end-column="27" />
+        <state relative-caret-position="66">
+          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="58">
+          <caret line="18" column="28" selection-start-line="18" selection-start-column="19" selection-end-line="18" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="305">
+          <caret line="24" column="31" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="714">
+          <caret line="58" column="5" lean-forward="true" selection-start-line="58" selection-start-column="5" selection-end-line="58" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="924">
+          <caret line="134" column="92" selection-start-line="134" selection-start-column="92" selection-end-line="134" selection-end-column="92" />
+          <folding>
+            <element signature="method#linkDevice#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkPartitionCamera#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkReservePlan#0;class#PgAlarmLinkRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1066">
+          <caret line="90" lean-forward="true" selection-start-line="90" selection-end-line="90" />
+          <folding>
+            <element signature="method#getTjResultByAlarmType#0;class#PgAlarmTjRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="946">
+          <caret line="148" column="11" lean-forward="true" selection-start-line="148" selection-start-column="11" selection-end-line="148" selection-end-column="11" />
+          <folding>
+            <element signature="method#getAlarmTypeList#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#addAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#editAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#deleteAlarmType#0;class#PgAlarmTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="208">
+          <caret line="46" column="23" lean-forward="true" selection-start-line="46" selection-start-column="23" selection-end-line="46" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="113" column="9" lean-forward="true" selection-start-line="113" selection-start-column="9" selection-end-line="113" selection-end-column="9" />
+          <folding>
+            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
+            <element signature="method#getNewestCh4InfoByDev#0;class#PgCh4Rs#0" />
+            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="145" column="6" lean-forward="true" selection-start-line="145" selection-start-column="6" selection-end-line="145" selection-end-column="6" />
+          <folding>
+            <element signature="method#addAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#editAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#deleteAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#getAuthorityList#0;class#PgAuthorityRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="58" column="1" lean-forward="true" selection-start-line="58" selection-start-column="1" selection-end-line="58" selection-end-column="1" />
+          <folding>
+            <element signature="method#getPgAssetPlanList#0;class#PgAssetPlanRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="370">
+          <caret line="371" column="66" selection-start-line="371" selection-start-column="66" selection-end-line="371" selection-end-column="66" />
+          <folding>
+            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#searchConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionDev#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="139" column="13" lean-forward="true" selection-start-line="139" selection-start-column="13" selection-end-line="139" selection-end-column="13" />
+          <folding>
+            <element signature="method#getCoInfoByDevAndDate#0;class#PgCoRs#0" />
+            <element signature="method#getNewestCoInfoByDev#0;class#PgCoRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="540">
+          <caret line="223" column="5" lean-forward="true" selection-start-line="223" selection-start-column="5" selection-end-line="223" selection-end-column="5" />
+          <folding>
+            <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="682">
+          <caret line="100" lean-forward="true" selection-start-line="100" selection-end-line="100" />
+          <folding>
+            <element signature="method#getDeviceTpeyList#0;class#PgDeviceTypeRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="377">
+          <caret line="225" column="35" selection-start-line="225" selection-start-column="35" selection-end-line="225" selection-end-column="35" />
+          <folding>
+            <element signature="method#addEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#addEquipment#1;class#PgEquipmentRs#0" />
+            <element signature="method#getEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#deleteEquipment#0;class#PgEquipmentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="406">
+          <caret line="109" lean-forward="true" selection-start-line="109" selection-end-line="109" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="154">
+          <caret line="28" column="19" selection-start-line="28" selection-start-column="19" selection-end-line="28" selection-end-column="19" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="748">
-          <caret line="49" column="5" lean-forward="true" selection-start-line="49" selection-start-column="5" selection-end-line="49" selection-end-column="5" />
+        <state relative-caret-position="296">
+          <caret line="161" column="35" selection-start-line="161" selection-start-column="35" selection-end-line="161" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="384">
+          <caret line="99" column="5" lean-forward="true" selection-start-line="99" selection-start-column="5" selection-end-line="99" selection-end-column="5" />
+        </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="362">
+          <caret line="340" column="35" selection-start-line="340" selection-start-column="35" selection-end-line="340" selection-end-column="35" />
+          <folding>
+            <element signature="method#addInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPersonInPg#0;class#PgInPgPersonRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-606">
+          <caret line="76" column="20" lean-forward="true" selection-start-line="76" selection-start-column="20" selection-end-line="76" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="65" column="35" selection-start-line="65" selection-start-column="35" selection-end-line="65" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="101" column="35" selection-start-line="101" selection-start-column="35" selection-end-line="101" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="84" column="35" selection-start-line="84" selection-start-column="35" selection-end-line="84" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="59" lean-forward="true" selection-start-line="59" selection-end-line="59" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="60" column="1" lean-forward="true" selection-start-line="60" selection-start-column="1" selection-end-line="60" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="145" column="35" selection-start-line="145" selection-start-column="35" selection-end-line="145" selection-end-column="35" />
+        </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="274">
+          <caret line="350" column="35" selection-start-line="350" selection-start-column="35" selection-end-line="350" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="121" column="39" selection-start-line="121" selection-start-column="39" selection-end-line="121" selection-end-column="39" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="28" column="8" lean-forward="true" selection-start-line="28" selection-start-column="8" selection-end-line="28" selection-end-column="8" />
+        <state relative-caret-position="340">
+          <caret line="103" selection-start-line="103" selection-end-line="103" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="226" column="35" selection-start-line="226" selection-start-column="35" selection-end-line="226" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="203" column="35" selection-start-line="203" selection-start-column="35" selection-end-line="203" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="241" column="35" selection-start-line="241" selection-start-column="35" selection-end-line="241" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="225" column="1" lean-forward="true" selection-start-line="225" selection-start-column="1" selection-end-line="225" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="176" column="5" lean-forward="true" selection-start-line="176" selection-start-column="5" selection-end-line="176" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="178" column="35" lean-forward="true" selection-start-line="178" selection-start-column="35" selection-end-line="178" selection-end-column="35" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="516">
-          <caret line="94" column="53" selection-start-line="94" selection-start-column="53" selection-end-line="94" selection-end-column="53" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="814">
-          <caret line="52" column="9" lean-forward="true" selection-start-line="52" selection-start-column="9" selection-end-line="52" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="182">
-          <caret line="58" column="12" lean-forward="true" selection-start-line="58" selection-start-column="12" selection-end-line="58" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="34" lean-forward="true" selection-start-line="34" selection-end-line="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="32" lean-forward="true" selection-start-line="32" selection-end-line="32" />
-          <folding>
-            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
-            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="185">
-          <caret line="63" column="13" selection-start-line="63" selection-start-column="13" selection-end-line="63" selection-end-column="13" />
-          <folding>
-            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
-            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
-            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="e#6319#6324#0" />
-            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
-          </folding>
+          <caret line="240" lean-forward="true" selection-start-line="240" selection-end-line="240" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
-          <caret line="58" column="28" lean-forward="true" selection-start-line="58" selection-start-column="28" selection-end-line="58" selection-end-column="28" />
-          <folding>
-            <element signature="method#addTempHumData#0;class#PgTempHumRs#0" />
-          </folding>
+        <state relative-caret-position="340">
+          <caret line="148" column="34" selection-start-line="148" selection-start-column="34" selection-end-line="148" selection-end-column="34" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
+        <state relative-caret-position="458">
+          <caret line="99" column="35" selection-start-line="99" selection-start-column="35" selection-end-line="99" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+        <state relative-caret-position="384">
+          <caret line="145" column="32" lean-forward="true" selection-start-line="145" selection-start-column="32" selection-end-line="145" selection-end-column="32" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="414">
-          <caret line="22" column="46" lean-forward="true" selection-start-line="22" selection-start-column="46" selection-end-line="22" selection-end-column="46" />
-        </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="396">
-          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" column="83" selection-start-line="11" selection-start-column="83" selection-end-line="11" selection-end-column="83" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="26">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
-          <folding>
-            <element signature="method#getPgInPgStatusByPerson#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNumByName#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNum#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPersonListByDay#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPgStatusByPgInPgPerson#0;class#PgInPgStatusManager#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="44">
-          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-12">
-          <caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="87" lean-forward="true" selection-start-line="87" selection-end-line="87" />
-          <folding>
-            <element signature="method#getConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#addConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#deleteConstructionType#0;class#PgConstructionTypeRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
-          <folding>
-            <element signature="method#getConstructionTypeByType#0;class#PgConstructionTypeManager#0" />
-            <element signature="method#getAllConstructionTypeDto#0;class#PgConstructionTypeManager#0" />
-          </folding>
-        </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="145">
-          <caret line="258" column="9" lean-forward="true" selection-start-line="258" selection-start-column="9" selection-end-line="258" selection-end-column="9" />
-          <folding>
-            <element signature="method#getMonthInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayInPgStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgOverViewRs#0" />
-            <element signature="method#getAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getMonthAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayAlarmStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgOverViewRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="103">
-          <caret line="105" column="50" lean-forward="true" selection-start-line="105" selection-start-column="50" selection-end-line="105" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateBasicDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="99">
-          <caret line="125" selection-start-line="125" selection-end-line="125" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="190">
-          <caret line="24" column="35" lean-forward="true" selection-start-line="24" selection-start-column="35" selection-end-line="24" selection-end-column="35" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="436">
-          <caret line="24" lean-forward="true" selection-start-line="24" selection-end-line="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" lean-forward="true" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="300">
-          <caret line="34" column="31" lean-forward="true" selection-start-line="34" selection-start-column="31" selection-end-line="34" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="42" column="13" lean-forward="true" selection-start-line="42" selection-start-column="13" selection-end-line="42" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="120" column="72" lean-forward="true" selection-start-line="120" selection-start-column="72" selection-end-line="120" selection-end-column="72" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="293">
-          <caret line="58" column="73" lean-forward="true" selection-start-line="58" selection-start-column="73" selection-end-line="58" selection-end-column="73" />
-          <folding>
-            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
-            <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
-          </folding>
-        </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="307">
-          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
+        <state relative-caret-position="758">
+          <caret line="130" column="5" lean-forward="true" selection-start-line="130" selection-start-column="5" selection-end-line="130" selection-end-column="5" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1170">
-          <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
+        <state relative-caret-position="494">
+          <caret line="86" column="62" lean-forward="true" selection-start-line="86" selection-start-column="62" selection-end-line="86" selection-end-column="62" />
           <folding>
-            <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-            <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+            <element signature="method#getAllDevice#0;class#PgDeviceManager#0" />
+            <element signature="method#getAllDev#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="195" column="28" lean-forward="true" selection-start-line="195" selection-start-column="28" selection-end-line="195" selection-end-column="28" />
+        <state relative-caret-position="166">
+          <caret line="174" column="13" lean-forward="true" selection-start-line="174" selection-start-column="13" selection-end-line="174" selection-end-column="13" />
           <folding>
-            <element signature="method#getAlarmByTypeAndTime#0;class#PgAlarmManager#0" />
-            <element signature="method#getAlarmNum#0;class#PgAlarmManager#0" />
             <element signature="method#getDayAlarmStatistic#0;class#PgAlarmManager#0" />
+            <element signature="method#getAlarmList#0;class#PgAlarmManager#0" />
             <element signature="method#createDTO#0;class#PgAlarmManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="364">
+          <caret line="46" column="56" lean-forward="true" selection-start-line="46" selection-start-column="56" selection-end-line="46" selection-end-column="56" />
+          <folding>
+            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
+            <element signature="method#getPgDev#0;class#PgDeviceRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
+            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+        <state relative-caret-position="396">
+          <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
           <folding>
             <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
             <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -1365,52 +1331,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="239">
-          <caret line="21" column="33" lean-forward="true" selection-start-line="21" selection-start-column="33" selection-end-line="21" selection-end-column="33" />
-        </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="352">
-          <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-        </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="99">
-          <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-          </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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-          <folding>
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-            <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>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
index c436c93..e913155 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
@@ -132,7 +132,10 @@
             this.setAlarmType("");
         else
             this.setAlarmType(pgAlarm.getAlarmTypeId().getAlarmType());
-        this.setAlarmValue(pgAlarm.getAlarmValue());
+        if(pgAlarm.getAlarmValue()==null)
+            this.setAlarmValue("");
+        else
+            this.setAlarmValue(pgAlarm.getAlarmValue());
         if (pgAlarm.getAlarmDate() != null)
             this.setAlarmDate(sdf.format(pgAlarm.getAlarmDate()));
         else
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
index a43965c..565cb41 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -159,11 +159,21 @@
     }
 
     //获取历史报警消息列表
-    public List<PgAlarmDto> getAllAlarm(String alarmType,String startDay,String endDay,String isNew,int page,int rows) {
-        try {
+    public  Map<String, Object> getAllAlarm(String alarmType,String partition,String startDay,String endDay,String isNew,int page,int rows) {
 
+        Map<String, Object> resultMap = new HashMap<>();
+        String msg="";
+
+        try {
             Criteria criteria = createCriteria(PgAlarm.class);
 
+            if (StringUtils.isNotBlank(partition)) {
+                DetachedCriteria inCriteria = DetachedCriteria.forClass(PgDevice.class);
+                inCriteria.add(Restrictions.eq("partition", partition));
+                inCriteria.setProjection(Property.forName("id"));
+                criteria.add(Property.forName("alarmDevId").in(inCriteria));
+            }
+
             if (StringUtils.isNotBlank(alarmType)&&!alarmType.contains("全部")&&pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
                 criteria.add(Restrictions.eq("alarmTypeId", pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)));
 
@@ -190,8 +200,16 @@
             for (PgAlarm pgAlarm : pgAlarmList) {
                 pgAlarmDtoList.add(new PgAlarmDto(pgAlarm));
             }
-
-            return pgAlarmDtoList;
+            if(pgAlarmDtoList==null||pgAlarmDtoList.size()==0) {
+                resultMap.put("msg", "没有报警信息");
+                resultMap.put("code","0");
+            }else {
+                resultMap.put("code","200");
+                resultMap.put("msg", "报警信息获取成功");
+            }
+            resultMap.put("count",pg.getTotalCount());
+            resultMap.put("result",pgAlarmDtoList);
+            return resultMap;
         }
         catch(Exception ex){
             ex.printStackTrace();
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index 7547560..654f49e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -24,11 +24,11 @@
 
         Criteria criteria = createCriteria(PgDevice.class);
 
-        if(road!=null)
+        if(StringUtils.isNotBlank(road))
             criteria.add(Restrictions.eq("road",road));
-        if(partition!=null)
+        if(StringUtils.isNotBlank(partition))
             criteria.add(Restrictions.eq("partition",partition));
-        if(devType!=null)
+        if(StringUtils.isNotBlank(devType))
             criteria.add(Restrictions.eq("devType",devType));
 
         criteria.add(Restrictions.eq("active", 1));
@@ -43,6 +43,29 @@
         return pgDeviceDtoList;
     }
 
+    public List<PgDeviceDto> getAllDev(String road,String partition,String devType) {
+
+        Criteria criteria = createCriteria(PgDevice.class);
+
+        if(StringUtils.isNotBlank(road))
+            criteria.add(Restrictions.eq("road",road));
+        if(StringUtils.isNotBlank(partition))
+            criteria.add(Restrictions.eq("partition",partition));
+        if(StringUtils.isNotBlank(devType))
+            criteria.add(Restrictions.like("devType","%"+devType+"%"));
+
+        criteria.add(Restrictions.eq("active", 1));
+        criteria.addOrder(Order.desc("id"));
+        List<PgDevice> pgDeviceList = criteria.list();
+
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
+        for (PgDevice pgDevice : pgDeviceList) {
+            pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
+        }
+
+        return pgDeviceDtoList;
+    }
+
     //根据名字获取当前设备
     public PgDevice getDeviceByAssetCode(String assetCode) {
         Criteria criteria=createCriteria(PgDevice.class);
@@ -56,9 +79,9 @@
     }
 
     //根据类型获取设备列表
-    public List<PgDeviceDto> getDeviceByDevTypee(String devType) {
+    public List<PgDeviceDto> getDeviceByDevType(String devType) {
         Criteria criteria=createCriteria(PgDevice.class);
-        criteria.add(Restrictions.eq("devType",devType));
+        criteria.add(Restrictions.like("devType","%"+devType+"%"));
 
         List<PgDevice> pgDeviceList=criteria.list();
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
@@ -106,7 +129,7 @@
         criteria.add(Restrictions.eq("partition",partition));
 
         List<PgDevice> pgDeviceList=criteria.list();
-        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<PgDeviceDto>();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
 
         for (PgDevice pgDevice : pgDeviceList) {
             pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
index 3a3bccd..595730e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
@@ -1,10 +1,13 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.devTable.domain.PgAlarmType;
 import com.casic.PgInterface.devTable.domain.PgPartition;
 import com.casic.PgInterface.devTable.domain.PgRoad;
 import com.casic.PgInterface.devTable.domain.PipeGallery;
 import com.casic.PgInterface.devTable.dto.PgPartitionDto;
+import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
@@ -12,7 +15,9 @@
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Created by yxw on 2017/11/4.
@@ -21,7 +26,8 @@
 public class PgPartitionManager extends HibernateEntityDao<PgPartition> {
 
     @Resource
-    PgRoadManager pgRoadManager;
+    private PgRoadManager pgRoadManager;
+
 
     public PgPartition getPartitionByParName(String parName) {
         Criteria criteria = getSession().createCriteria(PgPartition.class);
@@ -99,4 +105,5 @@
         return pgPartitionDtoList;
     }
 
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
index f216360..a6928f1 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
@@ -5,6 +5,7 @@
 public class PgPlanResultRe {
 
     private String taskKey;
+    private List<String> pileAcuList;
     private List<PgPlanResult> pgPlanResultList;
 
     public String getTaskKey() {
@@ -15,6 +16,14 @@
         this.taskKey = taskKey;
     }
 
+    public List<String> getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(List<String> pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+
     public List<PgPlanResult> getPgPlanResultList() {
         return pgPlanResultList;
     }
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
index 71ea765..47eea07 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
@@ -54,9 +54,7 @@
 
         List<PgLineHole> pgLineHoleList=criteria.list();
         List<PgLineHoleDTO> pgLineHoleDTOList=new ArrayList<>();
-        if(pgLineHoleList==null||pgLineHoleList.size()==0)
-            return null;
-        else
+        if(pgLineHoleList!=null&&pgLineHoleList.size()!=0)
             pgLineHoleDTOList=PgLineHoleDTO.ConvertToDTOList(pgLineHoleList,pgPileAcuManager,pgRoadManager);
         return pgLineHoleDTOList;
     }
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
index 0fd9e1f..841a386 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
@@ -1,12 +1,15 @@
 package com.casic.PgInterface.intelPlan.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.devTable.domain.PgPartition;
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
 import com.casic.PgInterface.intelPlan.domain.PgLineHole;
 import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
 import com.casic.PgInterface.intelPlan.domain.PgSection;
 import com.casic.PgInterface.intelPlan.dto.PgPlanResult;
 import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
 import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -22,6 +25,9 @@
     @Resource
     private PgLineHoleManager pgLineHoleManager;
 
+    @Resource
+    private PgRoadManager pgRoadManager;
+
     public PgPileAcu getPgPileAcuByCode(String acuCode){
         List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
 
@@ -58,7 +64,9 @@
         for(PgPlanTask pgPlanTask:pgPlanTaskList){
             List<PgPlanResult> pgPlanResultList=getPgPlanResultByPlantask(pgPlanTask);
             PgPlanResultRe pgPlanResultRe=new PgPlanResultRe();
+
             pgPlanResultRe.setTaskKey(pgPlanTask.getTaskKey());
+            pgPlanResultRe.setPileAcuList(pgPlanTask.getPileAcuList());
             pgPlanResultRe.setPgPlanResultList(pgPlanResultList);
 
             pgPlanResultReList.add(pgPlanResultRe);
@@ -142,4 +150,57 @@
         return length;
     }
 
+    private PgPileAcu getPgPileAcuByAcuCode(String acuCode){
+        List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
+
+        if(pgPileAcuList==null||pgPileAcuList.size()==0)
+            return null;
+        else
+            return pgPileAcuList.get(0);
+    }
+
+    public List<PgAcuTask> getACUTask(String pileAcuList){
+        String[] acuArray=pileAcuList.split(",");
+        List<PgAcuTask> pgAcuTaskList=new ArrayList<>();
+
+        for(String acu:acuArray){
+            PgPileAcu pgPileAcu=this.getPgPileAcuByCode(acu);
+            String roadName=pgRoadManager.get(pgPileAcu.getRoadId()).getRoadName();
+
+            if(!containRoad(roadName,pgAcuTaskList))
+            {
+                PgAcuTask pgAcuTask=new PgAcuTask();
+                pgAcuTask.setRoadName(roadName);
+                pgAcuTask.setPileAcuList(acu);
+                pgAcuTaskList.add(pgAcuTask);
+            }
+            else{
+                PgAcuTask pgAcuTask=getIndexRoad(roadName,pgAcuTaskList);
+                if(pgAcuTask!=null)
+                    pgAcuTask.setPileAcuList(pgAcuTask.getPileAcuList()+","+acu);
+            }
+        }
+
+        return pgAcuTaskList;
+    }
+
+    private boolean containRoad(String roadName,List<PgAcuTask> pgAcuTaskList){
+        if(pgAcuTaskList==null||pgAcuTaskList.size()==0) return false;
+        for(PgAcuTask pgAcuTask:pgAcuTaskList){
+            if(pgAcuTask.getRoadName().equals(roadName))
+                return true;
+        }
+
+        return false;
+    }
+
+    private PgAcuTask getIndexRoad(String roadName, List<PgAcuTask> pgAcuTaskList){
+        for(PgAcuTask pgAcuTask:pgAcuTaskList){
+            if(pgAcuTask.getRoadName().equals(roadName))
+                return pgAcuTask;
+        }
+
+        return null;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java
new file mode 100644
index 0000000..323f7ef
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java
@@ -0,0 +1,25 @@
+package com.casic.PgInterface.reservePlan.dto;
+
+import java.util.List;
+
+public class PgAcuTask {
+
+    private String roadName;//道路
+    private String pileAcuList;//acu分区
+
+    public String getRoadName() {
+        return roadName;
+    }
+
+    public void setRoadName(String roadName) {
+        this.roadName = roadName;
+    }
+
+    public String getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(String pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
index c25e926..c7d7693 100644
--- a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
@@ -70,9 +70,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(Long.valueOf(inPgPersonId));
         PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("hostName",pgInPgPerson.getAssetCode());
-//        PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode());
-//        long maxId = pgTagPositionManager.getMaxId(pgTagMac.getTagMac());
-//        PGTagPosition pgTagPosition = pgTagPositionManager.get(maxId);
+
         PGTagPosition pgTagPosition = tagmacRun.GetTagStatus(pgTagMac);
         boolean bExist = false;
         bExist = pgTagPositionManager.findTagPosition(pgTagPosition.getPositionUpdatetime(),pgTagPosition.getHostId());
@@ -104,8 +102,7 @@
         PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(Long.valueOf(inPgPersonId));
         PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pgInPgPersonId",pgInPgPerson);
         System.out.println("time:"+pgInPgStatus.getInTime());
-//        PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pgInPgPersonId",inPgPersonId);
-//        PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode());
+
         PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("hostName",pgInPgPerson.getAssetCode());
 
         Map<Object,Object> mapPosition = new HashMap<>();
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
index 082ba5d..3eed00a 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
@@ -48,6 +48,7 @@
     public Map<String, Object> linkDevice(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         PgDeviceDto pgDeviceDto = null;
         try {
@@ -62,6 +63,7 @@
                     else {
                         pgDeviceDto = new PgDeviceDto(pgDevice);
                         msg = "报警关联设备获取成功";
+                        code="200";
                     }
                 }
             }
@@ -71,6 +73,7 @@
             e.printStackTrace();
             msg = "获取关联设备失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceDto);
 
@@ -86,6 +89,7 @@
     public Map<String, Object> linkPartitionCamera(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
         try {
@@ -106,6 +110,7 @@
 
                         pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(partition,position);
                         msg = "关联设备获取成功";
+                        code="200";
                     }
                 }
             }
@@ -115,6 +120,7 @@
             e.printStackTrace();
             msg = "分区设备关联失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceDtoList);
         return resultMap;
@@ -129,6 +135,7 @@
     public Map<String, Object> linkReservePlan(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgReservePlanDto> pgReservePlanDtoList=new ArrayList<>();
         try{
@@ -139,10 +146,12 @@
                 else {
                     pgReservePlanDtoList = pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
 
-                    if(pgReservePlanDtoList==null||pgReservePlanDtoList.size()==0)
-                        msg="不存在关联的报警预案";
-                    else
+                    if (pgReservePlanDtoList == null || pgReservePlanDtoList.size() == 0)
+                        msg = "不存在关联的报警预案";
+                    else {
                         msg = "关联预案获取成功";
+                        code="200";
+                    }
                 }
             }
             else
@@ -153,6 +162,7 @@
             e.printStackTrace();
             msg="预案关联失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgReservePlanDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
index 0ddbc4d..0ce886b 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
@@ -41,25 +41,19 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getAlarmList(@FormParam("alarmType") String alarmType,
                                             @FormParam("startDay") String startDay,
+                                            @FormParam("partition") String partition,
                                             @FormParam("endDay") String endDay,
                                             @FormParam("isNew") String isNew,
                                             @FormParam("page") int page,
                                             @FormParam("rows") int rows) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
         try {
-            pgAlarmDtoList = pgAlarmManager.getAllAlarm(alarmType,startDay,endDay,isNew,page,rows);
-            if (pgAlarmDtoList==null||pgAlarmDtoList.size() == 0)
-                msg = "没有报警信息";
-            else
-                msg = "报警信息获取成功";
+            resultMap = pgAlarmManager.getAllAlarm(alarmType,partition,startDay,endDay,isNew,page,rows);
+
         } catch (Exception e) {
             e.printStackTrace();
-            msg = "报警信息获取失败";
         }
-        resultMap.put("msg", msg);
-        resultMap.put("result", pgAlarmDtoList);
         return resultMap;
     }
 
@@ -71,9 +65,10 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> clearAlarmList(@FormParam("id") String id) throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        String result = "false";
+        String result = "";
+        String code="0";
 
         try {
             PgAlarm pgAlarm = new PgAlarm();
@@ -86,12 +81,14 @@
                 pgAlarmManager.save(pgAlarm);
                 msg = "报警信息清除成功";
                 result = "true";
+                code = "200";
             }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警信息清除失败";
             result = "false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
@@ -106,21 +103,26 @@
     public Map<String, Object> getAlarmByTypeOrTime(@FormParam("alarmType") String alarmType,
                                                     @FormParam("startTime") String startTime,
                                                     @FormParam("endTime") String endTime) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
-        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<PgAlarmDto>();
+        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
         try {
             pgAlarmDtoList = pgAlarmManager.getAlarmByTypeAndTime(alarmType, startTime, endTime);
             if (pgAlarmDtoList == null || pgAlarmDtoList.size() == 0)
                 msg = "报警信息不存在";
             else
+            {
                 msg = "报警信息获取成功";
+                code="200";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警信息获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
index 29ce8a4..ed0bf34 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
@@ -39,8 +39,8 @@
     public Map<String, Object> getAlarmRule(@FormParam("devType") String devType) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
-        System.out.println("devType:"+devType);
         List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<>();
         try {
             pgAlarmRuleDtoList = pgAlarmRuleManager.getAlarmRuleDto(devType);
@@ -52,6 +52,7 @@
             e.printStackTrace();
             msg = "报警阈值信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmRuleDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
index 24ab894..abef1b1 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
@@ -39,16 +39,21 @@
                                                      @FormParam("endDate") String endDate)throws Exception{
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
+
         List<PgAlarmTjDto> pgAlarmTjDtoList=null;
         try{
             pgAlarmTjDtoList=pgAlarmTjManager.getAlarmTjResultByType(startDate,endDate);
             msg="获取成功";
+            code="200";
         }
         catch(Exception ex) {
             msg = "统计失败";
         }
-        resultMap.put("result",pgAlarmTjDtoList);
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
+        resultMap.put("result",pgAlarmTjDtoList);
+
         return resultMap;
     }
 
@@ -61,23 +66,27 @@
     public Map<String, Object> getAlarmByTime(@FormParam("startTime") String startTime,
                                               @FormParam("endTime") String endTime,
                                               @FormParam("statisticType") String statisticType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code = "0";
 
-        List<PgAlarmTjDto> pgAlarmTjDtoList = new ArrayList<PgAlarmTjDto>();
+        List<PgAlarmTjDto> pgAlarmTjDtoList = new ArrayList<>();
         try {
             pgAlarmTjDtoList = pgAlarmTjManager.getAlarmByTime(startTime, endTime, statisticType);
             if(pgAlarmTjDtoList==null)
                 msg="报警统计信息获取失败";
-            else
-                msg="报警统计信息获取成功";
+            else {
+                msg = "报警统计信息获取成功";
+                code="200";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警统计信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmTjDtoList);
         return resultMap;
     }
 
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
index 28bc811..b6278a9 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
@@ -30,7 +30,6 @@
     @Resource
     private PgAlarmTypeManager pgAlarmTypeManager;
 
-
     /**
      * 获取报警类型
      */
@@ -38,19 +37,24 @@
     @Path("getAlarmType")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getAlarmTypeList()throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
-        List<PgAlarmTypeDto> pgAlarmTypeDtoList=new ArrayList<PgAlarmTypeDto>();
+        String code="";
+
+        List<PgAlarmTypeDto> pgAlarmTypeDtoList=new ArrayList<>();
         try {
             pgAlarmTypeDtoList = pgAlarmTypeManager.getAllAlarmTypeDto();
             if(pgAlarmTypeDtoList.size()==0)
                 msg="没有报警类型信息";
-            else
-                msg="报警类型信息获取成功";
+            else {
+                code="200";
+                msg = "报警类型信息获取成功";
+            }
         }catch(Exception e){
             e.printStackTrace();
             msg="报警类型信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAlarmTypeDtoList);
         return resultMap;
@@ -66,6 +70,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
@@ -83,6 +88,7 @@
                 logger.info("成功保存");
                 result = "true";
                 msg = "保存成功";
+                code="200";
             }
         } catch (Exception e) {
             result = "false";
@@ -90,6 +96,7 @@
             e.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -106,6 +113,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try{
             if(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
@@ -119,6 +127,7 @@
                 pgAlarmTypeManager.save(pgAlarmType);
                 result = "true";
                 msg = "编辑成功";
+                code="200";
             }
         }
         catch(Exception e)
@@ -128,6 +137,7 @@
             e.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("result",result);
         resultMap.put("msg",msg);
 
@@ -146,6 +156,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
         String result="false";
+        String code="0";
 
         try {
             PgAlarmType pgAlarmType=pgAlarmTypeManager.get(Long.valueOf(id));
@@ -157,6 +168,7 @@
             {
                 pgAlarmType.setActive(0);
                 pgAlarmTypeManager.save(pgAlarmType);
+                code="200";
                 msg="报警类型删除成功";
                 result="true";
             }
@@ -165,6 +177,7 @@
             msg="报警类型删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
index 4533e1a..85940bb 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
@@ -33,12 +33,15 @@
                                                  @FormParam("inSpectionPlace") String inSpectionPlace){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
         List<PgAssetPlanDto> pgAssetPlanDtoList=new ArrayList<>();
         try{
             pgAssetPlanDtoList=pgAssetPlanManager.getPgAssetPlanDtoList(startDay,endDay,inSpectionPlace);
-            if(pgAssetPlanDtoList!=null&&pgAssetPlanDtoList.size()!=0)
-                msg="巡检信息获取成功";
+            if(pgAssetPlanDtoList!=null&&pgAssetPlanDtoList.size()!=0) {
+                code="200";
+                msg = "巡检信息获取成功";
+            }
             else
                 msg="不存在巡检信息";
         }
@@ -47,6 +50,7 @@
             msg="巡检信息获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAssetPlanDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
index 47ef9d1..5cbdfcb 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
@@ -30,12 +30,15 @@
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
         String result="";
+        String code="0";
 
         List<PgAssetPlanStatic> pgAssetPlanStaticList = null;
         try{
             pgAssetPlanStaticList=pgAssetPlanManager.getPgAssetPlanStaticLisByTime(startTime,endTime,staticType);
-            if(pgAssetPlanStaticList!=null&&pgAssetPlanStaticList.size()!=0)
-                msg="巡检统计信息获取成功";
+            if(pgAssetPlanStaticList!=null&&pgAssetPlanStaticList.size()!=0) {
+                code = "200";
+                msg = "巡检统计信息获取成功";
+            }
             else
                 msg="统计信息获取失败";
         }
@@ -44,6 +47,7 @@
             msg="统计失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAssetPlanStaticList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
index 26f5d6a..503bfe3 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
@@ -40,6 +40,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="";
 
         try{
             PgAuthority pgAuthority=new PgAuthority();
@@ -50,6 +51,7 @@
 
             pgAuthorityManager.save(pgAuthority);
             msg="用户权限保存成功";
+            code="200";
             result="true";
         }
         catch(Exception e) {
@@ -57,6 +59,7 @@
             msg = "新增权限失败";
             result = "false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -65,22 +68,25 @@
 
     /*
        *编辑角权限信息
-        */
+    */
     @POST
     @Path("editAuthority")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> editAuthority(@FormParam("id") String id,
                                        @FormParam("authority") String authority,
                                        @FormParam("concent") String concent) throws Exception{
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
+
         try {
             PgAuthority pgAuthority=pgAuthorityManager.get(Long.valueOf(id));
             pgAuthority.setAuthority(authority);
             pgAuthority.setConcent(concent);
 
             pgAuthorityManager.save(pgAuthority);
+            code="200";
             msg="权限保存成功";
             result="true";
         }
@@ -90,7 +96,7 @@
             msg="权限编辑失败";
             result="false";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -105,9 +111,10 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> deleteAuthority(@FormParam("id") String id)throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
-        String result="false";
+        String result="";
+        String code="0";
 
         try {
             PgAuthority pgAuthority= pgAuthorityManager.get(Long.valueOf(id));
@@ -119,6 +126,7 @@
             {
                 pgAuthority.setActive(0);
                 pgAuthorityManager.save(pgAuthority);
+                code="200";
                 msg="删除权限成功";
                 result="true";
             }
@@ -127,37 +135,40 @@
             msg="删除权限失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
     }
 
     /*
-* 获取权限信息
- */
+    * 获取权限信息
+    */
     @POST
     @Path("getAuthorityList")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> getAuthorityList() {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgAuthorityDto> pgAuthorityDtoList = new ArrayList<PgAuthorityDto>();
         try {
             pgAuthorityDtoList = pgAuthorityManager.getAuthorityList();
             if (pgAuthorityDtoList == null)
                 msg = "不存在权限信息";
-            else
+            else {
+                code = "200";
                 msg = "权限信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "权限信息获取是失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAuthorityDtoList);
         return resultMap;
     }
 
 
-
-
 }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
index a9ef521..a74ecc7 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
@@ -45,6 +45,7 @@
                                                @FormParam("endDate") String endDate)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgHistoryDataDto> pgHistoryDataDtoList=new ArrayList<>();
 
         try {
@@ -55,13 +56,16 @@
                 pgHistoryDataDtoList=pgCh4Manager.getAllCH4Data(pgDevice,startDate,endDate);
                 if(pgHistoryDataDtoList==null)
                     msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+                else {
+                    code = "200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgHistoryDataDtoList);
         return resultMap;
@@ -75,8 +79,9 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getNewestCh4InfoByDev(@FormParam("assetCode") String assetCode)throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
+        String code="0";
         PgCh4Dto pgCh4Dto=new PgCh4Dto(null);
 
         try {
@@ -87,13 +92,17 @@
                 pgCh4Dto=pgCh4Manager.getNewestCH4Data(pgDevice);
                 if(pgCh4Dto==null)
                     msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgCh4Dto);
         return resultMap;
@@ -111,6 +120,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
@@ -127,6 +137,7 @@
                 pgCh4.setPgDeviceId(pgDevice);
 
                 pgCh4Manager.save(pgCh4);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -135,7 +146,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
index a7eac39..dfc8ca5 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
@@ -43,23 +43,27 @@
                                                       @FormParam("endDate") String endDate)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgHistoryDataDto> pgHistoryDataDtoList=new ArrayList<>();
 
         try {
             PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
                 msg="设备不存在";
-            else{
-                pgHistoryDataDtoList=pgCoManager.getAllCoData(pgDevice, startDate, endDate);
-                if(pgHistoryDataDtoList==null)
-                    msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+            else {
+                pgHistoryDataDtoList = pgCoManager.getAllCoData(pgDevice, startDate, endDate);
+                if (pgHistoryDataDtoList == null)
+                    msg = "没有满足要求的数据";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgHistoryDataDtoList);
         return resultMap;
@@ -75,6 +79,7 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         PgCoDto pgCoDto=new PgCoDto(null);
 
         try {
@@ -85,13 +90,16 @@
                 pgCoDto=pgCoManager.getNewestCoData(pgDevice);
                 if(pgCoDto==null)
                     msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgCoDto);
         return resultMap;
@@ -110,6 +118,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         try {
@@ -126,6 +135,7 @@
 
                 pgCoManager.save(pgCo);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
         } catch (Exception e) {
@@ -133,7 +143,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
index b4b826e..9af98a3 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
@@ -60,6 +60,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         try {
 
@@ -80,8 +81,8 @@
                 pgConstruction.setPgConstructionTypeId(pgConstructionType.getId());
                 pgConstruction.setActive(1);
                 pgConstruction.setParName(parName);
-                logger.info("保存成功");
                 pgConstructionManager.save(pgConstruction);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -90,6 +91,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("success", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -116,6 +118,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
@@ -140,6 +143,7 @@
                 pgConstruction.setParName(parName);
 
                 pgConstructionManager.save(pgConstruction);
+                code="200";
                 result = "true";
                 msg = "编辑成功";
             }
@@ -150,7 +154,7 @@
             e.printStackTrace();
 
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -167,6 +171,8 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
+
         try {
             PgConstruction pgConstruction = pgConstructionManager.get(Long.valueOf(id));
             if (pgConstruction == null)
@@ -177,6 +183,7 @@
             {
                 pgConstruction.setActive(0);
                 pgConstructionManager.save(pgConstruction);
+                code="200";
                 result = "true";
                 msg = "成功删除信息";
             }
@@ -185,6 +192,7 @@
             result = "false";
             msg = "删除失败";
         }
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -204,9 +212,11 @@
                                                   @FormParam("rows") int rows)throws Exception{
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
         List<PgConstructionDto> pgConstructionDtoList=new ArrayList<>();
         try{
             pgConstructionDtoList=pgConstructionManager.getPgContructionDto(cs_name,cs_type,startTime,endTime,page,rows);
+            code="200";
             msg="信息获取成功";
         }
         catch(Exception e)
@@ -214,6 +224,7 @@
             e.printStackTrace();
             msg="查询失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
 
@@ -231,18 +242,22 @@
                                                               @FormParam("statisticType") String statisticType) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgConstructionStiatistic> pgConstructionStiatisticList=new ArrayList<>();
         try {
             pgConstructionStiatisticList = pgConstructionManager.getConstructionByTimeAndStatus(startTime, endTime, statisticType);
             if(pgConstructionStiatisticList==null)
                 msg="施工统计信息获取失败";
-            else
-                msg="施工统计信息获取成功";
+            else {
+                code="200";
+                msg = "施工统计信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "施工统计信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgConstructionStiatisticList);
         return resultMap;
@@ -257,6 +272,7 @@
     public Map<String, Object> getConstructionByType(@FormParam("statisticType") String statisticType){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
         List<PgConstructionStiatistic> pgConstructionStiatisticList=new ArrayList<>();
 
         try{
@@ -268,6 +284,7 @@
                 resultMap.put("result",null);
             }
             else {
+                code="200";
                 msg = "统计信息获取成功";
                 resultMap.put("result", pgConstructionStiatisticList);
             }
@@ -278,6 +295,7 @@
             msg="统计失败";
             resultMap.put("result",null);
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         return resultMap;
     }
@@ -291,9 +309,11 @@
     public Map<String, Object> getConstructionToday() throws Exception{
         Map<String,Object> resultMap=new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgConstructionDto> pgConstructionDtoList=new ArrayList<PgConstructionDto>();
         try {
             pgConstructionDtoList = pgConstructionManager.getConstructionToday();
+            code="200";
             msg = "当天施工信息获取成功";
         }
         catch(Exception e)
@@ -301,7 +321,7 @@
             e.printStackTrace();
             msg="获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
         return resultMap;
@@ -316,6 +336,7 @@
     public Map<String, Object> getConstructionDev(@FormParam("id") String id) throws Exception{
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
         List<PgDeviceDto> pgDeviceDtoList =new ArrayList<>();
         try{
@@ -325,14 +346,17 @@
 
             if(pgDeviceDtoList==null)
                 msg="信息获取失败";
-            else
-                msg="信息获取成功";
+            else {
+                code="200";
+                msg = "信息获取成功";
+            }
         }
         catch(Exception e)
         {
             e.printStackTrace();
-            msg="设备信息获取成功";
+            msg="信息获取是被";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgDeviceDtoList);
 
@@ -346,17 +370,21 @@
     @Path("getConstruction")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getConstruction() throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
-        List<PgConstructionDto> pgConstructionDtoList=new ArrayList<PgConstructionDto>();
+        String code="0";
+
+        List<PgConstructionDto> pgConstructionDtoList=new ArrayList<>();
 
         try{
             pgConstructionDtoList=pgConstructionManager.getPgConstructionList();
             if(pgConstructionDtoList==null||pgConstructionDtoList.size()==0)
                 msg="不存在施工记录";
-            else
-                msg="施工信息获取成功";
+            else {
+                code = "200";
+                msg = "施工信息获取成功";
+            }
         }
         catch(Exception e)
         {
@@ -364,6 +392,7 @@
             msg="施工信息获取失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java
index fd3d53e..2019502 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java
@@ -39,12 +39,12 @@
         try {
             pgConstructionTypeDtoList = pgConstructionTypeManager.getAllConstructionTypeDto();
             if (pgConstructionTypeDtoList.size() == 0)
-                msg = "没有项目类型信息";
+                msg = "获取失败";
             else
-                msg = "项目类型获取成功";
+                msg = "获取成功";
         } catch (Exception e) {
             e.printStackTrace();
-            msg = "项目类型信息获取失败";
+            msg = "获取失败";
         }
         resultMap.put("msg", msg);
         resultMap.put("result", pgConstructionTypeDtoList);
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
index 90d001c..037a399 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
@@ -51,6 +51,7 @@
 
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if (StringUtils.isBlank(construct_doc)||StringUtils.isBlank(doc_name))
@@ -65,6 +66,7 @@
             pgCsDocument.setActive(1);
             pgCsDocumentManager.save(pgCsDocument);
 
+            code="200";
             result = "true";
             msg = "保存成功";
 
@@ -74,6 +76,7 @@
             ex.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("success", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -90,6 +93,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             PgCsDocument pgCsDocument = pgCsDocumentManager.get(Long.valueOf(id));
@@ -103,6 +107,7 @@
 
                 pgCsDocumentManager.save(pgCsDocument);
 
+                code="200";
                 result = "true";
                 msg = "编辑成功";
             }
@@ -112,6 +117,7 @@
             msg = "编辑失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -125,9 +131,9 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
         String result="";
+        String code="0";
 
         try{
-
             PgCsDocument pgCsDocument = pgCsDocumentManager.get(Long.valueOf(id));
             if(pgCsDocument==null)
             {
@@ -137,6 +143,7 @@
             else{
                 pgCsDocument.setActive(0);
                 pgCsDocumentManager.save(pgCsDocument);
+                code="200";
                 result="true";
                 msg="删除成功";
             }
@@ -147,7 +154,7 @@
             msg="预案删除失败";
             result="false";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -168,18 +175,21 @@
 
         String msg="";
         String result="";
+        String code="0";
 
         try {
             pgCsDocumentDtoList = pgCsDocumentManager.getAllDocData(cs_name);
-            if (pgCsDocumentDtoList != null)
+            if (pgCsDocumentDtoList != null) {
+                code="200";
                 msg = "获取数据成功";
+            }
             else
                 msg = "没有满足条件的数据";
         }catch (Exception e){
             e.printStackTrace();
             msg = "获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgCsDocumentDtoList);
         return resultMap;
@@ -192,20 +202,22 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
 
         String msg = "";
+        String code="0";
         ResponseEntity<byte[]> path = null;
         try {
             PgCsDocument pgCsDocument = pgCsDocumentManager.get(Long.valueOf(id));
             path = pgCsDocumentManager.downloadFile(pgCsDocument);
             if (path == null)
                 msg = "不存在该文档";
-            else
+            else {
+                code = "200";
                 msg = "下载成功";
-
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "下载失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", path.getBody());
         resultMap.put("msg", msg);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
index 94c5c84..ffc8b95 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
@@ -41,22 +41,24 @@
     public Map<String, Object> getPgDeviceByDevType(@FormParam("devType") String devType) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
         try {
-            pgDeviceDtoList = pgDeviceManager.getDeviceByDevTypee(devType);
+            pgDeviceDtoList = pgDeviceManager.getDeviceByDevType(devType);
             if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0){
                 msg="不存在满足要求的数据";
-                resultMap.put("result",null);
             }
             else{
-                resultMap.put("result", pgDeviceDtoList);
+                code="200";
                 msg = "获取成功";
             }
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", pgDeviceDtoList);
         return resultMap;
     }
 
@@ -69,25 +71,26 @@
     public Map<String, Object> getPgDeviceByAssetCode(@FormParam("assetCode") String assetCode) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         PgDeviceDto pgDeviceDto=null;
         try {
             PgDevice pgDevice = pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
             {
                 msg="不存在设备信息";
-                resultMap.put("result",null);
             }
             else {
                 pgDeviceDto = new PgDeviceDto(pgDevice);
                 msg = "获取成功";
-                resultMap.put("result", pgDeviceDto);
+                code="200";
             }
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", pgDeviceDto);
         return resultMap;
     }
 
@@ -102,27 +105,61 @@
                                              @FormParam("devType") String devType)throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
         try {
             pgDeviceDtoList = pgDeviceManager.getAllDevice(road,partition,devType);
             if(pgDeviceDtoList.size()==0) {
                 msg = "没有找到设备信息";
-                resultMap.put("result",null);
             }
             else {
                 msg = "设备信息获取成功";
-                resultMap.put("result", pgDeviceDtoList);
+                code="200";
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result", pgDeviceDtoList);
         return resultMap;
     }
 
     /**
+     * 显示设备列表
+     */
+    @POST
+    @Path("getPgDev")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String, Object> getPgDev(@FormParam("road") String road,
+                                             @FormParam("partition") String partition,
+                                             @FormParam("devType") String devType)throws Exception {
+        Map<String, Object> resultMap = new HashMap<>();
+        String msg="";
+        String code="0";
+        List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
+        try {
+            pgDeviceDtoList = pgDeviceManager.getAllDev(road,partition,devType);
+            if(pgDeviceDtoList.size()==0) {
+                msg = "没有找到设备信息";
+            }
+            else {
+                code="200";
+                msg = "设备信息获取成功";
+            }
+        }catch(Exception e){
+            e.printStackTrace();
+            msg="设备信息获取失败";
+        }
+        resultMap.put("code",code);
+        resultMap.put("msg",msg);
+        resultMap.put("result", pgDeviceDtoList);
+        return resultMap;
+    }
+
+
+    /**
      * 新增设备
      */
     @POST
@@ -145,6 +182,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if (pgDeviceManager.getDeviceByAssetCode(assetCode)!=null) {
@@ -169,6 +207,7 @@
 
                 pgDeviceManager.save(pgDevice);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
 
@@ -177,10 +216,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -208,14 +246,9 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
-            /*
-            if (pgDeviceManager.getDeviceByAssetCode(assetCode)!=null) {
-                result = "false";
-                msg = "已存在同名设备";
-            } else {
-            */
             PgDevice pgDevice = pgDeviceManager.get(Long.valueOf(id));
             pgDevice.setPipeGallery(pipeGallery);
             pgDevice.setPartition(partition);
@@ -233,14 +266,14 @@
 
             pgDeviceManager.save(pgDevice);
             result = "true";
+            code="200";
             msg = "编辑成功";
-            //}
         } catch (Exception e) {
             result = "false";
             msg = "编辑失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("result",result);
         resultMap.put("msg",msg);
         return resultMap;
@@ -256,7 +289,8 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
-        String result="false";
+        String result="";
+        String code="0";
 
         try {
             PgDevice pgDevice=pgDeviceManager.get(Long.valueOf(id));
@@ -268,6 +302,7 @@
             {
                 pgDevice.setActive(0);
                 pgDeviceManager.save(pgDevice);
+                code="200";
                 msg="设备删除成功";
                 result="true";
             }
@@ -276,6 +311,7 @@
             msg="设备删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -291,18 +327,18 @@
     {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         PgDeviceDto pgDeviceDto=null;
 
         try{
             PgDevice pgDevice=pgDeviceManager.getDeviceBydevCode(devCode);
             if(pgDevice==null) {
                 msg = "设备信息获取失败";
-                resultMap.put("result",null);
             }
             else{
                 pgDeviceDto = new PgDeviceDto(pgDevice);
                 msg = "设备信息获取成功";
-                resultMap.put("result",pgDeviceDto);
+                code="200";
             }
         }
         catch(Exception ex)
@@ -310,8 +346,9 @@
             ex.printStackTrace();
             msg="设备状态获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgDeviceDto);
         return resultMap;
     }
 
@@ -324,17 +361,17 @@
     public Map<String,Object> getDeviceByPartition(@FormParam("partition") String partition) throws Exception{
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<PgDeviceDto>();
 
         try{
             pgDeviceDtoList=pgDeviceManager.getPgDeviceDtoListByPartition(partition);
             if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0) {
                 msg = "设备信息获取失败";
-                resultMap.put("result",null);
             }
             else {
+                code="200";
                 msg = "设备信息获取成功";
-                resultMap.put("result",pgDeviceDtoList);
             }
         }
         catch(Exception e)
@@ -342,8 +379,9 @@
             e.printStackTrace();
             msg="设备信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgDeviceDtoList);
         return resultMap;
     }
 
@@ -353,17 +391,16 @@
     public Map<String,Object> getDeviceByOldDAssetCodeCode(@FormParam("assetCode") String assetCode) throws Exception{
         Map<String, Object> resultMap = new HashMap<>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
 
         try{
             pgDeviceDtoList=pgDeviceManager.getDeviceByOldDAssetCodeCode(assetCode);
-            if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0) {
-                msg = "设备信息获取失败";;
-                resultMap.put("result",null);
-            }
+            if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0)
+                msg = "设备信息获取失败";
             else {
                 msg = "设备信息获取成功";
-                resultMap.put("result",pgDeviceDtoList);
+                code="200";
             }
         }
         catch(Exception e)
@@ -372,8 +409,9 @@
             msg="设备信息获取失败";
             resultMap.put("result",null);
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgDeviceDtoList);
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java
index 421d249..f6f167d 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java
@@ -38,17 +38,21 @@
     public Map<String, Object> getDeviceTpeyList()throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgDeviceTypeDto> pgDeviceTypeDtoList=new ArrayList<PgDeviceTypeDto>();
         try {
             pgDeviceTypeDtoList = pgDeviceTypeManager.getAllDeviceType();
             if(pgDeviceTypeDtoList.size()==0)
                 msg="没有找到设备类型信息";
-            else
-                msg="设备类型信息获取成功";
+            else {
+                code="200";
+                msg = "设备类型信息获取成功";
+            }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备类型信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgDeviceTypeDtoList);
         return resultMap;
@@ -66,6 +70,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if (pgDeviceTypeManager.getDeviceTypeByDeType(devType)!=null) {
@@ -79,6 +84,7 @@
 
                 pgDeviceTypeManager.save(pgDeviceType);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
 
@@ -87,10 +93,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
index c276fb3..c789960 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
@@ -44,6 +44,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 
         try {
@@ -62,6 +63,7 @@
                 pgEquipment.setActive(1);
 
                 pgEquipmentManager.save(pgEquipment);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -70,9 +72,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -89,9 +91,10 @@
                                             @FormParam("ownerUnit") String ownerUnit,
                                             @FormParam("enterDate") String enterDate,
                                             @FormParam("curUser") String curUser) {
-        HashMap<String, Object> resultMap = new HashMap<String, Object>();
+        HashMap<String, Object> resultMap = new HashMap<>();
         String msg = "";
         String result = "";
+        String code="0";
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 
         try {
@@ -111,6 +114,7 @@
                 pgEquipment.setEnterDate(sdf.parse(enterDate));
 
                 pgEquipmentManager.save(pgEquipment);
+                code="200";
                 msg="编辑成功";
                 result="true";
             }
@@ -119,9 +123,9 @@
             result = "false";
             msg = "编辑失败";
         }
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -134,16 +138,19 @@
     public Map<String, Object> getEquipment(@FormParam("eqName") String eqName,
                                             @FormParam("eqCode") String eqCode,
                                             @FormParam("eqType") String eqType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        List<PgEquipmentDto> pgEquipmentDtoList=new ArrayList<PgEquipmentDto>();
+        String code="0";
+        List<PgEquipmentDto> pgEquipmentDtoList=new ArrayList<>();
 
         try{
             pgEquipmentDtoList=pgEquipmentManager.getEquipmentDtiList(eqName,eqCode,eqType);
             if(pgEquipmentDtoList==null||pgEquipmentDtoList.size()==0)
                 msg="不存在工器具记录";
-            else
-                msg="维获取成功";
+            else {
+                code = "200";
+                msg = "维获取成功";
+            }
         }
         catch(Exception e)
         {
@@ -166,6 +173,7 @@
         HashMap<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
         String result = "";
+        String code="";
 
         try {
             PgEquipment pgEquipment=pgEquipmentManager.get(Long.valueOf(id));
@@ -178,6 +186,7 @@
             {
                 pgEquipment.setActive(0);
                 pgEquipmentManager.save(pgEquipment);
+                code="200";
                 msg="删除成功";
                 result="true";
             }
@@ -186,6 +195,7 @@
             msg="设备信息获取失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -201,16 +211,19 @@
             throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=new ArrayList<PgDeviceTypeStatisticDto>();
 
         try {
             pgDeviceTypeStatisticDtoList=pgEquipmentManager.getDeviceStatisticByDevType(eqType);
 
+            code="200";
             msg = "获取成功";
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceTypeStatisticDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
index 05a9709..a90fd6c 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
@@ -4,9 +4,9 @@
 import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
 import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
 import com.casic.PgInterface.intelPlan.manager.PgPileAcuManager;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import com.casic.PgInterface.test.PlanData;
 import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.ModelAttribute;
 
 import javax.annotation.Resource;
 import javax.ws.rs.FormParam;
@@ -32,23 +32,25 @@
     public Map<String,Object> getPlanResult(@FormParam("planParamStr") String planParamStr){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
-        //List<PgPlanTask> pgPlanTaskList=pgPlanParams.getPgPlanTaskList();
         List<PgPlanTask> pgPlanTaskList=new PgPlanParams().getPgPlanParamsByString(planParamStr);
         List<PgPlanResultRe> pgPlanResultReList=new ArrayList<>();
 
-        try{
-                pgPlanResultReList=pgPileAcuManager.getPgPlanResultList(pgPlanTaskList);
-                if(pgPlanResultReList==null)
-                    msg="管线智能规划出错";
-                else
-                    msg="管线智能规划完成";
+        try {
+            pgPlanResultReList = pgPileAcuManager.getPgPlanResultList(pgPlanTaskList);
+            if (pgPlanResultReList == null)
+                msg = "管线智能规划出错";
+            else {
+                code="200";
+                msg = "管线智能规划完成";
+            }
         }
         catch(Exception ex){
             msg="智能规划出错";
             ex.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgPlanResultReList);
 
@@ -80,4 +82,30 @@
         return resultMap;
     }
 
+    @POST
+    @Path("getPlanTask")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getACUTask(@FormParam("pileAcuList") String pileAcuList){
+
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        String code="0";
+        List<PgAcuTask> pgAcuTaskList=new ArrayList<>();
+
+        try{
+            pgAcuTaskList=pgPileAcuManager.getACUTask(pileAcuList);
+            code="200";
+            msg="任务获取成功";
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            msg="任务获取失败";
+        }
+        resultMap.put("code",code);
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgAcuTaskList);
+
+        return resultMap;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
index ff85c61..66eec76 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
@@ -55,13 +55,13 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         try {
             PgInPgPerson pgInPgPerson = null;//pgInPgPersonManager.getPersonByUserName(userName);
             int iHostName = pgTagMacManager.getCount("select count(1) from PGTagMac where hostname = ?",assetCode);
-//            int iTagMac = pgTagMacManager.getCount("select count(1) from PGTagMac where tagmac = ?",assetCode.toUpperCase());
             if (0==iHostName)
             {
                 result = "false";
@@ -92,9 +92,8 @@
 
                 pgInPgStatusManager.save(pgInPgStatus);
 
-//                String syResult=pgInPgPersonManager.synchorizedInPgInfo(assetCode,userCode,userName,personType);
+                code="200";
                 result = "true";
-//                msg = "人员注册保存成功"+syResult;
                 msg = "人员注册保存成功";
             }
             else {
@@ -106,6 +105,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -120,6 +120,7 @@
     public Map<String, Object> getInPgPerson() throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<>();
         try {
@@ -127,11 +128,15 @@
             if (pgInPgInfoDtoList == null || pgInPgInfoDtoList.size() == 0)
                 msg = "没有找到入廊人员信息";
             else
+            {
+                code="200";
                 msg = "入廊人员信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "入廊人员信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
         return resultMap;
@@ -146,18 +151,22 @@
     public Map<String, Object> getInPgPersonInPg() throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
 
-        List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<PgInPgInfoDto>();
+        List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<>();
         try {
             pgInPgInfoDtoList = pgInPgPersonManager.getPgInPersonList(1);
             if (pgInPgInfoDtoList == null || pgInPgInfoDtoList.size() == 0)
                 msg = "没有找到入廊人员信息";
-            else
+            else {
+                code="200";
                 msg = "入廊人员信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "入廊人员信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
         return resultMap;
@@ -172,6 +181,7 @@
     public Map<String, Object> getInPgPersonByName(@FormParam("userName") String userName) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
 
         PgInPgPerson pgInPgPerson = null;
         PgInPgPersonDto pgInPgPersonDto=null;
@@ -184,12 +194,13 @@
                 pgInPgPersonDto=new PgInPgPersonDto(pgInPgPerson);
                 pgInPgPersonDtoList.add(pgInPgPersonDto);
                 msg = "人员信息获取成功";
+                code="200";
             }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "人员信息获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgPersonDtoList);
         return resultMap;
@@ -206,6 +217,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             PgInPgPerson pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName);
@@ -221,6 +233,7 @@
                     pgInPgPersonManager.save(pgInPgPerson);
                     result = "true";
                     msg = "编辑成功";
+                    code="200";
                 }
             }
         } catch (Exception e) {
@@ -228,9 +241,9 @@
             msg = "编辑失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -244,10 +257,12 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         int inPgNum=0;
         String msg = "";
+        String code="0";
 
         try{
             inPgNum=pgInPgStatusManager.getInPgNum();
 
+            code="200";
             msg="人员入廊次数获取成功";
         }
         catch(Exception e)
@@ -255,6 +270,7 @@
             e.printStackTrace();
             msg="人员入廊次数获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",inPgNum);
 
@@ -272,18 +288,22 @@
                                                    @FormParam("statisticType") String statisticType) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
 
         List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<PgInPgInfoDto>();
         try {
             pgInPgInfoDtoList = pgInPgPersonManager.getPgInPersonListByTime(startTime, endTime, statisticType);
             if(pgInPgInfoDtoList==null)
                 msg="入廊人员统计信息获取失败";
-            else
-                msg="入廊人员统计信息获取成功";
+            else {
+                code="200";
+                msg = "入廊人员统计信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "入廊人员统计信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
         return resultMap;
@@ -296,6 +316,7 @@
 
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
 
         try {
@@ -304,8 +325,10 @@
                 pgDeviceDtoList=pgDeviceManager.getPgCameraListByPosition("",apCodeStr);
                 if(pgDeviceDtoList==null)
                     msg="不存在关联摄像机";
-                else
-                    msg="关联摄像机获取成功";
+                else {
+                    code="200";
+                    msg = "关联摄像机获取成功";
+                }
             } else {
                 msg="请输入Ap编号";
             }
@@ -315,6 +338,7 @@
             msg="关联摄像机获取成功";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgDeviceDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java
index 507b3fe..b43f077 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java
@@ -34,6 +34,7 @@
 
         String result="";
         String msg="";
+        String code="";
         try{
             PgInPgStatus pgInPgStatus=new PgInPgStatus();
 
@@ -44,6 +45,7 @@
             pgInPgStatusManager.save(pgInPgStatus);
             msg="入廊时间提交成功";
             result="true";
+            code="200";
         }
         catch (Exception e){
             e.printStackTrace();
@@ -51,6 +53,7 @@
             result="false";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -66,6 +69,7 @@
 
         String result="";
         String msg="";
+        String code="0";
         try{
             PgInPgPerson pgInPgPerson=pgInPgPersonManager.getPgInPgPersonByAssetCode(assetCode);
 
@@ -79,6 +83,7 @@
             pgInPgStatusManager.save(pgInPgStatus);
 
             msg="出廊时间提交成功";
+            code="200";
             result="true";
         }
         catch (Exception e){
@@ -87,6 +92,7 @@
             result="false";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
index 9def330..9c0ba1f 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
@@ -33,17 +33,20 @@
                                             @FormParam("existNum") String existNum) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         String result="";
 
         try {
             pgIntelPlanManager.savePgIntelPlan(parName,lineName,maxNum,existNum);
             msg="规划数据保存成功";
+            code="200";
             result="true";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "规划数据保存失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
@@ -55,15 +58,18 @@
     public Map<String, Object> getIntelLineType() throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgIntelPlanTypeDto> pgIntelPlanTypeDtoList=new ArrayList<>();
         try {
             pgIntelPlanTypeDtoList=pgIntelPlanManager.getIntelPlanType();
+            code="200";
             msg="获取排线类型成功";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "获取排线类型失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgIntelPlanTypeDtoList);
         return resultMap;
@@ -76,6 +82,7 @@
                                             @FormParam("partitionStr") String partitionStr) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgIntelPlanDto> pgIntelPlanDtoList = new ArrayList<>();
 
@@ -83,8 +90,10 @@
             pgIntelPlanDtoList = pgIntelPlanManager.getPgIntelPlanListByPartion(lineName, partitionStr);
             if(pgIntelPlanDtoList==null||pgIntelPlanDtoList.size()==0)
                 msg="请输入正确的规划参数";
-            else
-                msg="规划数据获取成功";
+            else {
+                code="200";
+                msg = "规划数据获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "规划数据获取失败";
@@ -103,10 +112,12 @@
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
         String result="";
+        String code="0";
 
         try {
             boolean bl=pgIntelPlanManager.addLineUse(lineName,partitionStr,num);
             if(bl){
+                code="200";
                 msg="排线入廊成功";
                 result="true";
             }
@@ -119,6 +130,7 @@
             msg = "排线入廊失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
@@ -132,6 +144,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
         String result="";
+        String code="0";
 
         try {
             PgIntelPlan pgIntelPlan=pgIntelPlanManager.getPgIntelPlanByParNameAndLine(lineName,parName);
@@ -140,11 +153,13 @@
             pgIntelPlanManager.save(pgIntelPlan);
             msg="规划数据删除成功";
             result="true";
+            code="200";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "规划数据删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java b/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java
index 378af00..9c39523 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java
@@ -1,5 +1,6 @@
 package com.casic.PgInterface.rs;
 
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
 import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
 import com.casic.PgInterface.intelPlan.dto.PgLineHoleDTO;
 import com.casic.PgInterface.intelPlan.manager.PgLineHoleManager;
@@ -27,6 +28,9 @@
     @Resource
     private PgPileAcuManager pgPileAcuManager;
 
+    @Resource
+    private PgRoadManager pgRoadManager;
+
     @POST
     @Path("getPgLineAcuHole")
     @Produces(MediaType.APPLICATION_JSON)
@@ -34,23 +38,32 @@
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
         String result="";
+        String code="0";
         List<PgLineHoleDTO> pgLineHoleDTOList=new ArrayList<>();
 
         try {
             PgPileAcu pgPileAcu=pgPileAcuManager.getPgPileAcuByCode(acuCode);
             if(pgPileAcu==null){
                 msg="不存在分区";
-            }else{
-                pgLineHoleDTOList=pgLineHoleManager.getCurrentHoleByAcu(pgPileAcu.getId());
-                if(pgLineHoleDTOList!=null&&pgLineHoleDTOList.size()!=0)
-                    msg="获取成功";
-                else
-                    msg="未找到入廊数据";
+            }else {
+                pgLineHoleDTOList = pgLineHoleManager.getCurrentHoleByAcu(pgPileAcu.getId());
+                if (pgLineHoleDTOList != null && pgLineHoleDTOList.size() != 0)
+                {
+                    code="200";
+                    msg = "获取成功";
+                }
+                else {
+                    PgLineHoleDTO pgLineHoleDTO=new PgLineHoleDTO();
+                    pgLineHoleDTO.setRoad(pgRoadManager.get(pgPileAcu.getRoadId()).getRoadName());
+                    pgLineHoleDTOList.add(pgLineHoleDTO);
+                    msg = "未找到入廊数据";
+                }
             }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgLineHoleDTOList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgLogRs.java b/src/main/java/com/casic/PgInterface/rs/PgLogRs.java
index 39cff52..30db63b 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgLogRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgLogRs.java
@@ -45,6 +45,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         PgLog pgLog=new PgLog();
         try {
             PgUser pgUser = new PgUser();
@@ -60,14 +61,15 @@
             pgLogManager.save(pgLog);
             result = "true";
             msg = "保存成功";
-
+            code="200";
         } catch (Exception e) {
             result = "false";
             msg = "保存失败";
             e.printStackTrace();
         }
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -83,17 +85,21 @@
             throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgLogDto> pgLogDtoList = new ArrayList<PgLogDto>();
         try {
             pgLogDtoList = pgLogManager.getAllLogs(userName, startTime, endTime);
             if (pgLogDtoList == null || pgLogDtoList.size() == 0)
                 msg = "没有找到日志信息";
-            else
+            else {
+                code="200";
                 msg = "日志信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "日志信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgLogDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java
index 9fd0a5f..37b72f6 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java
@@ -36,19 +36,23 @@
         Map<String,Object> resultMap=new HashMap<>();
 
         String msg = "";
+        String code="0";
         List<PgMaintainType> pgMaintainTypeList=new ArrayList<>();
         try{
             pgMaintainTypeList=pgMaintainTypeManager.getMaintainType();
             if(pgMaintainTypeList!=null&&pgMaintainTypeList.size()!=0)
                 msg="不存在运维类别";
-            else
-                msg="运维类别获取成功";
+            else {
+                code="200";
+                msg = "运维类别获取成功";
+            }
         }
         catch(Exception ex)
         {
             ex.printStackTrace();
             msg="运维类别获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgMaintainTypeList);
 
@@ -65,10 +69,11 @@
         Map<String,Object> resultMap=new HashMap<>();
 
         String msg = "";
+        String code="0";
         List<PgMaintainTypeDto> pgMaintainTypeDtoList=new ArrayList<PgMaintainTypeDto>();
         try{
             pgMaintainTypeDtoList=pgMaintainTypeManager.getMaintainTypeModel(type);
-
+            code="200";
             msg="维护类型获取成功";
         }
         catch(Exception ex)
@@ -77,9 +82,9 @@
             msg="维护类型获取失败";
         }
 
-        resultMap.put("result",pgMaintainTypeDtoList);
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgMaintainTypeDtoList);
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java
index d735cc9..82ffca4 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java
@@ -33,12 +33,16 @@
                                                  @FormParam("endTime") String endTime){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
         List<PgMaintanceRecordHeadDto> pgMaintanceRecordHeadDtoList=new ArrayList<>();
         try{
             pgMaintanceRecordHeadDtoList=pgMaintanceRecordHeadManager.getPgMaintanceRecordHeadLsit(repairMan,startTime,endTime);
             if(pgMaintanceRecordHeadDtoList!=null&&pgMaintanceRecordHeadDtoList.size()!=0)
+            {
+                code="200";
                 msg="维护信息获取成功";
+            }
             else
                 msg="不存在维护信息";
         }
@@ -47,6 +51,7 @@
             msg="巡检信息获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgMaintanceRecordHeadDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java
index effc9df..9f46fc8 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java
@@ -32,12 +32,16 @@
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
         String result="";
+        String code="0";
 
         List<PgMaintanceRecordHeadStatic> pgMaintanceRecordHeadStaticList=new ArrayList<>();
         try{
             pgMaintanceRecordHeadStaticList=pgMaintanceRecordHeadManager.getPgMaintanceRecordHeadStaticLisByTime(startTime,endTime,staticType);
             if(pgMaintanceRecordHeadStaticList!=null&&pgMaintanceRecordHeadStaticList.size()!=0)
+            {
+                code="200";
                 msg="维护统计信息获取成功";
+            }
             else
                 msg="维护统计失败";
         }
@@ -46,7 +50,7 @@
             ex.printStackTrace();
             msg="统计失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgMaintanceRecordHeadStaticList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java b/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java
index 3a67bf3..6a5f4dc 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java
@@ -39,27 +39,31 @@
     @Path("getO2InfoByDevAndDate")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getO2InfoByDevAndDate(@FormParam("assetCode") String assetCode,
-                                                      @FormParam("startDate") String startDate,
-                                                      @FormParam("endDate") String endDate)throws Exception {
+                                                     @FormParam("startDate") String startDate,
+                                                     @FormParam("endDate") String endDate)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgHistoryDataDto> pgHistoryDataDtoList=new ArrayList<>();
 
         try {
             PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
                 msg="设备不存在";
-            else{
-                pgHistoryDataDtoList=pgO2Manager.getAllO2Data(pgDevice, startDate, endDate);
-                if(pgHistoryDataDtoList==null)
-                    msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+            else {
+                pgHistoryDataDtoList = pgO2Manager.getAllO2Data(pgDevice, startDate, endDate);
+                if (pgHistoryDataDtoList == null)
+                    msg = "没有满足要求的数据";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgHistoryDataDtoList);
         return resultMap;
@@ -75,23 +79,27 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         PgO2Dto pgO2Dto=new PgO2Dto(null);
 
         try {
             PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
                 msg="设备不存在";
-            else{
-                pgO2Dto=pgO2Manager.getNewestO2Data(pgDevice);
-                if(pgO2Dto==null)
-                    msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+            else {
+                pgO2Dto = pgO2Manager.getNewestO2Data(pgDevice);
+                if (pgO2Dto == null)
+                    msg = "没有满足要求的数据";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgO2Dto);
         return resultMap;
@@ -104,11 +112,12 @@
     @Path("addO2Data")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> addO2Data(@FormParam("devCode") String devCode,
-                                          @FormParam("upTime") String upTime,
-                                          @FormParam("o2") String o2)throws Exception {
+                                         @FormParam("upTime") String upTime,
+                                         @FormParam("o2") String o2)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
@@ -125,6 +134,7 @@
                 pgO2.setPgDeviceId(pgDevice);
 
                 pgO2Manager.save(pgO2);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -133,9 +143,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java b/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java
index 6217cde..70b3b41 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java
@@ -30,8 +30,6 @@
 public class PgOverViewRs {
 
     @Resource
-    private PgInPgPersonManager pgInPgPersonManager;
-    @Resource
     private PgInPgStatusManager pgInPgStatusManager;
     @Resource
     private PgAlarmManager pgAlarmManager;
@@ -46,18 +44,21 @@
     @Path("getPersonNumInPgByMonth")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<Object, String> getMonthInPgPersonNum() throws Exception {
-        Map<Object, String> resultMap = new HashMap<Object, String>();
+        Map<Object, String> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         int inNum = 0;
 
         try {
             inNum = pgInPgStatusManager.getMonthInPgPersonNum();
+            code="200";
             msg = "本月入廊人员次数获取成功";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "本月入廊人员次数获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", String.valueOf(inNum));
 
@@ -73,15 +74,18 @@
     public Map<Object, String> getWeekInPgPersonNum() throws Exception {
         Map<Object, String> resultMap = new HashMap<Object, String>();
         String msg = "";
+        String code="0";
         int inNum = 0;
         try {
             inNum = pgInPgStatusManager.getWeekInPgPersonNum();
+            code="200";
             msg = "本周入廊人员次数获取成功";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "本周入廊人员次数获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", String.valueOf(inNum));
 
@@ -97,19 +101,22 @@
     public Map<String, Object> getDayInPgStatistic() throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<>();
         try {
             pgInPgInfoDtoList = pgInPgStatusManager.getPgInPersonListByDay();
             if (pgInPgInfoDtoList == null)
                 msg = "信息获取失败";
-            else
+            else {
+                code="200";
                 msg = "信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "信息获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
         return resultMap;
@@ -124,18 +131,23 @@
     public Map<String, Object> getTodayInPgInfo() throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
 
         List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<PgInPgInfoDto>();
         try {
             pgInPgInfoDtoList = pgInPgStatusManager.getTodayInPgInfo();
             if(pgInPgInfoDtoList!=null||pgInPgInfoDtoList.size()!=0)
+            {
+                code="200";
                 msg = "信息获取成功";
+            }
             else
                 msg="当天没有入廊人员信息";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
 
@@ -149,18 +161,22 @@
     public Map<String, Object> getAlarmNum(@FormParam("isDevFault") String isDevFault) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         int num = 0;
 
         try {
             if(isDevFault!=null){
                 num = pgAlarmManager.getAlarmNum(isDevFault);
-                msg = "报警数量获取成功";}
+                msg = "报警数量获取成功";
+                code="200";
+            }
             else
                 msg="请输入统计参数";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警数量统计失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", num);
 
@@ -176,16 +192,18 @@
     public Map<Object, String> getMonthAlarmNum(@FormParam("isDevFault") String isDevFault) throws Exception {
         Map<Object, String> resultMap = new HashMap<Object, String>();
         String msg = "";
+        String code="0";
         int inNum = 0;
 
         try {
-                inNum = pgAlarmManager.getMonthAlarmNum(isDevFault);
-                msg = "报警次数获取成功";
+            inNum = pgAlarmManager.getMonthAlarmNum(isDevFault);
+            code="200";
+            msg = "报警次数获取成功";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警次数获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", String.valueOf(inNum));
 
@@ -201,15 +219,17 @@
     public Map<Object, String> getWeekAlarmNum(@FormParam("isDevFault") String isDevFault) throws Exception {
         Map<Object, String> resultMap = new HashMap<Object, String>();
         String msg = "";
+        String code="0";
         int inNum = 0;
         try {
             inNum = pgAlarmManager.getWeekAlarmNum(isDevFault);
+            code="200";
             msg = "报警次数获取成功";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警次数获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", String.valueOf(inNum));
 
@@ -225,14 +245,17 @@
     public Map<String, Object> getDayAlarmStatistic() throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgAlarmTjDto> pgAlarmTjDtoList = new ArrayList<PgAlarmTjDto>();
         try {
             pgAlarmTjDtoList = pgAlarmManager.getDayAlarmStatistic();
             if (pgAlarmTjDtoList == null)
                 msg = "信息获取失败";
-            else
+            else {
+                code="200";
                 msg = "信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "信息获取失败";
@@ -252,9 +275,11 @@
     public Map<String, Object> getAlarmList(@FormParam("isDevFault") String isDevFault) throws Exception{
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         List<PgAlarmDto> pgAlarmDtoList=new ArrayList<>();
         try{
             pgAlarmDtoList=pgAlarmManager.getAlarmList(isDevFault);
+            code="200";
             msg="信息获取成功";
         }
         catch(Exception e)
@@ -262,6 +287,7 @@
             e.printStackTrace();
             msg="信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAlarmDtoList);
 
@@ -278,17 +304,19 @@
     public Map<String,Object> getConstructionNum() throws Exception{
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgConstructionTypeNumStatisticDto> pgConstructionTypeNumDtoList=new ArrayList<PgConstructionTypeNumStatisticDto>();
         try{
             pgConstructionTypeNumDtoList=pgConstructionManager.getConstructionNum();
             msg="施工数量获取成功";
+            code="200";
         }
         catch(Exception e)
         {
             e.printStackTrace();
             msg="施工数量统计";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionTypeNumDtoList);
 
@@ -302,21 +330,25 @@
     @Path("getConstructionToday")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> getConstructionToday() throws Exception{
-        Map<String,Object > resultMap = new HashMap<String,Object>();
+        Map<String,Object > resultMap = new HashMap<>();
         String msg = "";
-        List<PgConstructionDto> pgConstructionDtoList=new ArrayList<PgConstructionDto>();
+        String code="0";
+        List<PgConstructionDto> pgConstructionDtoList=new ArrayList<>();
         try {
             pgConstructionDtoList = pgConstructionManager.getConstructionToday();
-            if (pgConstructionDtoList == null&&pgConstructionDtoList.size()==0)
+            if (pgConstructionDtoList == null && pgConstructionDtoList.size() == 0)
                 msg = "不存在施工信息";
-            else
+            else {
+                code="200";
                 msg = "施工信息获取成功";
+            }
         }
         catch(Exception e)
         {
             e.printStackTrace();
             msg="施工信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java b/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java
index d3c10d4..31ffcfc 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java
@@ -48,6 +48,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 
         try {
@@ -66,9 +67,9 @@
                 pgPartition.setMaterial(material);
                 pgPartition.setActive(1);
 
-                logger.info("成功保存");
                 pgPartitionManager.save(pgPartition);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
         } catch (Exception e) {
@@ -76,9 +77,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
         return resultMap;
     }
     /*
@@ -100,6 +101,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         PgPartition partition = new PgPartition();
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
@@ -122,6 +124,7 @@
 
                 pgPartitionManager.save(pgPartition);
                 result = "true";
+                code="200";
                 msg = "编辑成功";
             }
 
@@ -131,8 +134,10 @@
             e.printStackTrace();
         }
 
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
+
         return resultMap;
     }
 
@@ -147,7 +152,8 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
-        String result="false";
+        String result="";
+        String code="0";
 
         try {
             PgPartition pgPartition=pgPartitionManager.get(Long.valueOf(id));
@@ -161,12 +167,14 @@
                 pgPartitionManager.save(pgPartition);
                 msg="分区删除成功";
                 result="true";
+                code="200";
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="分区删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -181,14 +189,17 @@
     public Map<String, Object> getPartition() throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgPartitionDto> pgPartitionDtoList = new ArrayList<PgPartitionDto>();
         try {
             pgPartitionDtoList = pgPartitionManager.getPgPartitionDtoList();
+            code="200";
             msg = "获取成功";
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgPartitionDtoList);
         return resultMap;
@@ -203,14 +214,17 @@
     public Map<String, Object> getPartitionListByName(@FormParam("parName") String parName) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgPartitionDto> pgPartitionDtoList = new ArrayList<PgPartitionDto>();
         try {
             pgPartitionDtoList = pgPartitionManager.getPartitionByName(parName);
+            code="200";
             msg = "获取成功";
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgPartitionDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java b/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java
index 883adf9..cf81b72 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java
@@ -37,6 +37,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
         PgRoad pgRoad=pgRoadManager.getPgRoadByName(road);
         try {
             PgPileAcu pgPileAcu=new PgPileAcu();
@@ -49,6 +50,7 @@
             pgPileAcu.setActive(true);
 
             pgPileAcuManager.save(pgPileAcu);
+            code="200";
             result="true";
             msg="保存成功";
         } catch (Exception e) {
@@ -56,9 +58,10 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
+
         return resultMap;
     }
 
@@ -73,6 +76,7 @@
 
         String result="";
         String msg="";
+        String code="0";
         try{
             PgPileAcu pgPileAcu=pgPileAcuManager.get(id);
             if(pgPileAcu==null){
@@ -83,7 +87,7 @@
             {
                 pgPileAcu.setActive(false);
                 pgPileAcuManager.save(pgPileAcu);
-
+                code="200";
                 result="true";
                 msg="桩号删除成功";
             }
@@ -94,8 +98,9 @@
             ex.printStackTrace();
         }
 
-        resultMap.put("result",result);
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
+        resultMap.put("result",result);
 
         return resultMap;
     }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPileRs.java b/src/main/java/com/casic/PgInterface/rs/PgPileRs.java
index cf62954..c9999ac 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgPileRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgPileRs.java
@@ -33,6 +33,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             PgPile pgPile=new PgPile();
@@ -40,6 +41,7 @@
             pgPile.setActive(true);
 
             pgPileManager.save(pgPile);
+            code="200";
             result="true";
             msg="保存成功";
         } catch (Exception e) {
@@ -47,9 +49,10 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
+
         return resultMap;
     }
 
@@ -64,9 +67,10 @@
         Map<String,Object> resultMap=new HashMap<>();
         List<PgPileDTO> pgPileDTOList=new ArrayList<>();
         String msg="";
+        String code="0";
         try{
             pgPileDTOList=pgPileManager.getPgPileDTOList();
-
+            code="200";
             msg="获取成功";
         }
         catch(Exception ex){
@@ -74,8 +78,9 @@
             msg="获取成失败";
             ex.printStackTrace();
         }
-        resultMap.put("result",pgPileDTOList);
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
+        resultMap.put("result",pgPileDTOList);
 
         return resultMap;
     }
@@ -91,6 +96,7 @@
 
         String result="";
         String msg="";
+        String code="0";
         try{
             PgPile pgPile=pgPileManager.get(id);
             if(pgPile==null){
@@ -101,7 +107,7 @@
             {
                 pgPile.setActive(false);
                 pgPileManager.save(pgPile);
-
+                code="200";
                 result="true";
                 msg="桩号删除成功";
             }
@@ -111,9 +117,9 @@
             msg="桩号删除失败";
             ex.printStackTrace();
         }
-
-        resultMap.put("result",result);
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
+        resultMap.put("result",result);
 
         return resultMap;
     }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
index 6ee63ff..63b5597 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
@@ -53,10 +53,12 @@
         try {
                resultMap = pgPipeLineManager.addPipeLine(lineCode,lineType,secRow,secColumn,pileAcuList);
                resultMap.put("msg","提交成功");
+               resultMap.put("code","200");
                resultMap.put("result","true");
 
         } catch (Exception e) {
             e.printStackTrace();
+            resultMap.put("code","0");
             resultMap.put("result","false");
             resultMap.put("msg","提交失败");
             return  resultMap;
@@ -74,14 +76,17 @@
     public Map<String, Object> getPipeLineByLineType(@FormParam("lineType") String lineType) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgPipeLineDto> pgPipeLineDtoList=new ArrayList<PgPipeLineDto>();
         try {
             pgPipeLineDtoList = pgPipeLineManager.getPipeLineByLineType(lineType);
+            code="200";
             msg = "获取成功";
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgPipeLineDtoList);
         return resultMap;
@@ -96,6 +101,7 @@
     public Map<String, Object> getPipeLineByName(@FormParam("lineCode") String lineCode) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         PgPipeLineDto pgPipeLineDto=null;
         try {
             PgPipeLine pgPipeLine = pgPipeLineManager.getPipeLineBylineName(lineCode);
@@ -103,12 +109,14 @@
                 msg="不存在："+lineCode;
             else {
                 pgPipeLineDto = new PgPipeLineDto(pgPipeLine);
+                code="200";
                 msg = "获取成功";
             }
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgPipeLineDto);
         return resultMap;
@@ -123,15 +131,18 @@
     public Map<String,Object> getPipeLengthStatic()throws Exception{
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         List<PgPipeLineLengthStatic> pgPipeLineLengthStaticList=new ArrayList<PgPipeLineLengthStatic>();
         try {
             pgPipeLineLengthStaticList = pgPipeLineManager.getPipeLengthByName();
+            code="200";
             msg="管线长度获取成功";
         }catch(Exception e)
         {
             e.printStackTrace();
             msg="管线长度统计失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgPipeLineLengthStaticList);
 
@@ -147,14 +158,17 @@
     public Map<String, Object> getPipeLineType() throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgPipeLineTypeDto> pgPipeLineTypeDtoList=new ArrayList<PgPipeLineTypeDto>();
         try {
             pgPipeLineTypeDtoList = pgPipeLineManager.getPipeType();
+            code="200";
             msg = "获取成功";
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgPipeLineTypeDtoList);
         return resultMap;
@@ -170,20 +184,24 @@
         Map<String,Object> resultMap=new HashMap<String, Object>();
 
         String msg="";
+        String code="0";
         List<PgPipeLineTypeNumDto> pgPipeLineTypeNumDtoList=new ArrayList<PgPipeLineTypeNumDto>();
 
-        try{
-            pgPipeLineTypeNumDtoList=pgPipeLineManager.getPipeTypeNum();
+        try {
+            pgPipeLineTypeNumDtoList = pgPipeLineManager.getPipeTypeNum();
 
-            if(pgPipeLineTypeNumDtoList==null)
-                msg="不存在管线类型占比";
-            else
-                msg="管线占比获取成功";
+            if (pgPipeLineTypeNumDtoList == null)
+                msg = "不存在管线类型占比";
+            else {
+                code="200";
+                msg = "管线占比获取成功";
+            }
         }
         catch (Exception e){
             msg="管线占比数量获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgPipeLineTypeNumDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java
index 672b376..7042994 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java
@@ -43,17 +43,21 @@
     public Map<String,Object> getReservePlan() {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgReservePlanDto> pgReservePlanDtoList = new ArrayList<PgReservePlanDto>();
         try {
             pgReservePlanDtoList = pgReservePlanManager.getPgReservePlanDto();
             if (pgReservePlanDtoList == null)
                 msg = "不存在预案信息";
-            else
+            else {
+                code="200";
                 msg = "预案信息获取成功";
-        } catch (Exception e) {
+            }
+        }catch (Exception e) {
             e.printStackTrace();
             msg = "预案信息获取是失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgReservePlanDtoList);
         return resultMap;
@@ -66,6 +70,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
 
         String msg = "";
+        String code="0";
         ResponseEntity<byte[]> path = null;
         try {
             PgReservePlan pgReservePlan = pgReservePlanManager.get(Long.valueOf(id));
@@ -73,15 +78,17 @@
 
             if (path == null)
                 msg = "不存在该文档";
-            else
+            else {
+                code="200";
                 msg = "下载成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "下载失败";
         }
-
-        resultMap.put("result", path.getBody());
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", path.getBody());
         return resultMap;
     }
     /*
@@ -99,6 +106,7 @@
         Map<String,Object> resultMap=new HashMap<String, Object>();
         String msg="";
         String result="";
+        String code="0";
 
         try {
             PgReservePlan pgReservePlan = new PgReservePlan();
@@ -124,6 +132,7 @@
                 pgReservePlanManager.save(pgReservePlan);
                 msg = "新增成功";
                 result = "true";
+                code="200";
             }
         }
         catch(Exception e)
@@ -133,6 +142,7 @@
             result="false";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -152,6 +162,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             PgReservePlan pgReservePlan=pgReservePlanManager.get(Long.valueOf(id));
@@ -177,6 +188,7 @@
 
                     pgReservePlanManager.save(pgReservePlan);
 
+                    code="200";
                     result = "true";
                     msg = "编辑成功";
                 }
@@ -187,6 +199,7 @@
             msg = "编辑失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -201,6 +214,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
         String result="";
+        String code="0";
 
         try{
 
@@ -214,6 +228,7 @@
                 pgReservePlan.setActive(0);;
                 pgReservePlanManager.save(pgReservePlan);
                 result="true";
+                code="200";
                 msg="删除成功";
             }
         }
@@ -224,6 +239,7 @@
             result="false";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java b/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java
index 8f049c8..3c48a8d 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java
@@ -42,19 +42,22 @@
         Map<String,Object> resultMap=new HashMap<String, Object>();
 
         String msg="";
+        String code="0";
         List<PgRoadDto> pgRoadDtoList=new ArrayList<PgRoadDto>();
-        try{
+        try {
             pgRoadDtoList = pgRoadManager.getAllRoad();
             if (pgRoadDtoList.size() == 0)
                 msg = "没有道路信息";
-            else
+            else {
+                code="200";
                 msg = "道路信息获取成功";
+            }
         }
         catch(Exception e){
             msg="道路信息获取失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgRoadDtoList);
 
@@ -71,6 +74,7 @@
         Map<String,Object> resultMap=new HashMap<String, Object>();
         String msg="";
         String result="";
+        String code="0";
 
         try{
             PgRoad pgRoad=new PgRoad();
@@ -78,7 +82,7 @@
             pgRoad.setActive(1);
 
             pgRoadManager.save(pgRoad);
-
+            code="200";
             msg="新增道路成功";
             result="true";
         }
@@ -87,7 +91,7 @@
             result="true";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -107,6 +111,7 @@
 
         String msg="";
         String result="";
+        String code="0";
 
         try {
             PgRoad pgRoad=pgRoadManager.get(Long.valueOf(id));
@@ -123,6 +128,7 @@
                 pgRoadManager.save(pgRoad);
                 msg="道路信息保存成功";
                 result="true";
+                code="200";
             }
         }
         catch(Exception e){
@@ -130,6 +136,7 @@
             result="false";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -147,6 +154,7 @@
 
         String msg="";
         String result="";
+        String code="0";
         PgRoad pgRoad=null;
 
         try{
@@ -159,6 +167,7 @@
                 pgRoad.setActive(0);
                 pgRoadManager.save(pgRoad);
                 msg="道路删除成功";
+                code="200";
                 result="true";
             }
         }
@@ -168,6 +177,7 @@
             e.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -184,26 +194,29 @@
         Map<String,Object> resultMap=new HashMap<String, Object>();
         String msg="";
         String result="";
+        String code="0";
 
         List<PgPartitionDto> pgPartitionDtoList=null;
         try{
             PgRoad pgRoad=pgRoadManager.getPgRoadByName(roadName);
             if(pgRoad==null)
                 msg="不存在道路信息";
-            else
-            {
-                pgPartitionDtoList=pgPartitionManager.getPgPartitonDtoByRoad(pgRoad);
-                if(pgPartitionDtoList==null||pgPartitionDtoList.size()==0)
-                    msg="该道路没有分区信息";
-                else
-                    msg="分区信息获取成功";
+            else {
+                pgPartitionDtoList = pgPartitionManager.getPgPartitonDtoByRoad(pgRoad);
+                if (pgPartitionDtoList == null || pgPartitionDtoList.size() == 0)
+                    msg = "该道路没有分区信息";
+                else {
+                    code="200";
+                    msg = "分区信息获取成功";
+                }
             }
         }
         catch (Exception e)
         {
+            e.printStackTrace();
             msg="分区信息获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgPartitionDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java b/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java
index 90d709a..7a713bf 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java
@@ -42,17 +42,21 @@
     public Map<String,Object> getRoleList() {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgRoleDto> pgRoleDtoList = new ArrayList<PgRoleDto>();
         try {
             pgRoleDtoList = pgRoleManager.getPgRoleDtoList();
             if (pgRoleDtoList == null)
                 msg = "不存在角色信息";
-            else
+            else {
+                code="200";
                 msg = "角色信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "角色信息获取是失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgRoleDtoList);
         return resultMap;
@@ -69,6 +73,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try{
             PgAuthority pgAuthority=pgAuthorityManager.getAuthorityByAuthority(authority);
@@ -79,6 +84,7 @@
 
             pgRoleManager.save(pgRole);
             msg="用户角色保存成功";
+            code="200";
             result="true";
         }
         catch(Exception e) {
@@ -86,6 +92,7 @@
             msg = "新增角色失败";
             result = "false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -104,6 +111,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         try {
             PgRole pgRole = pgRoleManager.get(Long.valueOf(id));
 
@@ -112,6 +120,7 @@
             pgRole.setPgAuthorityId(pgAuthority);
             pgRoleManager.save(pgRole);
 
+            code="200";
             msg="角色保存成功";
             result="true";
         }
@@ -122,6 +131,7 @@
             result="false";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -138,7 +148,8 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
-        String result="false";
+        String result="";
+        String code="0";
 
         try {
             PgRole pgRole= pgRoleManager.get(Long.valueOf(id));
@@ -152,12 +163,14 @@
                 pgRoleManager.save(pgRole);
                 msg="删除角色成功";
                 result="true";
+                code="200";
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="删除角色失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java b/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java
index 0e413b8..d146811 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java
@@ -38,6 +38,7 @@
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
         String result="";
+        String code="0";
         PgRoad pgRoad=pgRoadManager.getPgRoadByName(road);
 
         try{
@@ -55,13 +56,14 @@
             pgSectionManager.save(pgSection);
             msg="截面信息保存成功";
             result="true";
+            code="200";
         }
         catch(Exception ex){
             msg="界面信息保存失败";
             result="false";
             ex.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -77,6 +79,7 @@
 
         String msg="";
         String result="";
+        String code="0";
 
         try{
             PgSection pgSection=pgSectionManager.get(id);
@@ -84,6 +87,7 @@
             pgSection.setActive(false);
             pgSectionManager.save(pgSection);
 
+            code="200";
             msg="截面删除成功";
             result="true";
         }
@@ -92,7 +96,7 @@
             result="false";
             ex.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -107,16 +111,19 @@
         Map<String,Object> resultMap=new HashMap<>();
         List<PgLineType> pgLineTypeList=new ArrayList<>();
         String msg="";
+        String code="0";
 
         try{
             pgLineTypeList=pgSectionManager.getLineType();
             msg="获取成功";
+            code="200";
         }
         catch(Exception ex){
             ex.printStackTrace();
             msg="获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgLineTypeList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgShRs.java b/src/main/java/com/casic/PgInterface/rs/PgShRs.java
index 1e35f4b..323c82f 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgShRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgShRs.java
@@ -45,23 +45,27 @@
                                                      @FormParam("endDate") String endDate)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgHistoryDataDto> pgHistoryDataDtoList=new ArrayList<>();
 
         try {
             PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
                 msg="设备不存在";
-            else{
-                pgHistoryDataDtoList=pgShManager.getAllShData(pgDevice, startDate, endDate);
-                if(pgHistoryDataDtoList==null)
-                    msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+            else {
+                pgHistoryDataDtoList = pgShManager.getAllShData(pgDevice, startDate, endDate);
+                if (pgHistoryDataDtoList == null)
+                    msg = "没有满足要求的数据";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgHistoryDataDtoList);
         return resultMap;
@@ -77,23 +81,27 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         PgShDto pgShDto=new PgShDto(null);
 
         try {
             PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
                 msg="设备不存在";
-            else{
-                pgShDto=pgShManager.getNewestShData(pgDevice);
-                if(pgShDto==null)
-                    msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+            else {
+                pgShDto = pgShManager.getNewestShData(pgDevice);
+                if (pgShDto == null)
+                    msg = "没有满足要求的数据";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgShDto);
         return resultMap;
@@ -111,6 +119,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
@@ -128,6 +137,7 @@
 
                 pgShManager.save(pgSh);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
         } catch (Exception e) {
@@ -135,9 +145,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java b/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java
index a23b2da..76023a9 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java
@@ -43,23 +43,27 @@
                                                       @FormParam("endDate") String endDate)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgHistoryTempDto> pgHistoryTempDtoList=new ArrayList<>();
 
         try {
             PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
                 msg="设备不存在";
-            else{
-                pgHistoryTempDtoList=pgTempHumManager.getAllTempHumData(pgDevice, startDate, endDate);
-                if(pgHistoryTempDtoList==null)
-                    msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+            else {
+                pgHistoryTempDtoList = pgTempHumManager.getAllTempHumData(pgDevice, startDate, endDate);
+                if (pgHistoryTempDtoList == null)
+                    msg = "没有满足要求的数据";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgHistoryTempDtoList);
         return resultMap;
@@ -75,23 +79,27 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         PgTempHumDto pgTempHumDto=new PgTempHumDto(null);
 
         try {
             PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
                 msg="设备不存在";
-            else{
-                pgTempHumDto=pgTempHumManager.getNewestTempHumData(pgDevice);
-                if(pgTempHumDto==null)
-                    msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+            else {
+                pgTempHumDto = pgTempHumManager.getNewestTempHumData(pgDevice);
+                if (pgTempHumDto == null)
+                    msg = "没有满足要求的数据";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgTempHumDto);
         return resultMap;
@@ -110,6 +118,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         try {
@@ -127,6 +136,7 @@
 
                 pgTempHumManager.save(pgTempHum);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
         } catch (Exception e) {
@@ -135,8 +145,10 @@
             e.printStackTrace();
         }
 
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
+
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgUserRs.java b/src/main/java/com/casic/PgInterface/rs/PgUserRs.java
index 73895f5..ff814a1 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgUserRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgUserRs.java
@@ -42,17 +42,21 @@
     public Map<String, Object> getUserList()throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgUserDto> pgUserDtoList=new ArrayList<PgUserDto>();
         try {
             pgUserDtoList = pgUserManager.getAllUser();
             if(pgUserDtoList.size()==0)
                 msg="没有找到人员信息";
-            else
-                msg="获取成功";
+            else {
+                code="200";
+                msg = "获取成功";
+            }
         }catch(Exception e){
             e.printStackTrace();
             msg="获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgUserDtoList);
         return resultMap;
@@ -74,6 +78,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             PgRole pgRole=pgRoleManager.getPgRoleByRole(role);
@@ -94,10 +99,10 @@
                 else
                     pgUser.setRoleId(pgRole.getId());
                 pgUser.setActive(1);
-                logger.info("成功保存");
 
                 pgUserManager.save(pgUser);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
         } catch (Exception e) {
@@ -106,6 +111,7 @@
             e.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -129,6 +135,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
         try {
 
             PgRole pgRole=pgRoleManager.getPgRoleByRole(role);
@@ -145,8 +152,8 @@
                 pgUser.setRoleId(pgRole.getId());
             pgUserManager.save(pgUser);
             result = "true";
+            code="200";
             msg = "编辑成功";
-            //}
         } catch (Exception e) {
             result = "false";
             msg = "编辑失败";
@@ -166,9 +173,10 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> deleteUser(@FormParam("id") String id)throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
-        String result="false";
+        String result="";
+        String code="0";
 
         try {
             PgUser pgUser= pgUserManager.get(Long.valueOf(id));
@@ -180,6 +188,7 @@
             {
                 pgUser.setActive(0);
                 pgUserManager.save(pgUser);
+                code="200";
                 msg="删除人员成功";
                 result="true";
             }
@@ -188,6 +197,7 @@
             msg="删除人员失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -204,13 +214,14 @@
         Map<String,Object> resultMap=new HashMap<String, Object>();
         String msg="";
         String result="";
-
+        String code="0";
         try{
             PgUserDto pgUserDto=pgUserManager.signIn(userName,passWord);
 
             if(pgUserDto==null)
                 msg="false";
             else {
+                code="200";
                 msg="true";
                 result=pgUserDto.getRole();
             }
@@ -220,6 +231,7 @@
             e.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 25ded8a..283d7ab 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,20 +7,56 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" 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/construction/manager/PgCsDocumentManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/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/manager/PgAlarmManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/~$说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/~$说明20191207.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.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$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/接口说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明20191207.docx" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
@@ -51,7 +87,7 @@
         <counts>
           <entry key="class" value="4" />
           <entry key="iml" value="2" />
-          <entry key="java" value="707" />
+          <entry key="java" value="820" />
           <entry key="properties" value="14" />
           <entry key="xml" value="7" />
         </counts>
@@ -60,7 +96,7 @@
         <counts>
           <entry key="CLASS" value="4" />
           <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="707" />
+          <entry key="JAVA" value="820" />
           <entry key="Properties" value="14" />
           <entry key="XML" value="7" />
         </counts>
@@ -68,32 +104,32 @@
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
           <entry key="dummy" value="38" />
-          <entry key="java" value="30161" />
+          <entry key="java" value="40859" />
           <entry key="properties" value="100" />
-          <entry key="txt" value="176" />
+          <entry key="txt" value="186" />
           <entry key="xml" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="30161" />
-          <entry key="PLAIN_TEXT" value="214" />
+          <entry key="JAVA" value="40859" />
+          <entry key="PLAIN_TEXT" value="224" />
           <entry key="Properties" value="100" />
           <entry key="XML" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="48" />
+          <entry key="project.closed" value="51" />
           <entry key="project.open.time.1" value="5" />
           <entry key="project.open.time.12" value="2" />
           <entry key="project.open.time.13" value="1" />
           <entry key="project.open.time.15" value="1" />
           <entry key="project.open.time.16" value="1" />
           <entry key="project.open.time.17" value="1" />
-          <entry key="project.open.time.2" value="1" />
+          <entry key="project.open.time.2" value="2" />
           <entry key="project.open.time.20" value="1" />
-          <entry key="project.open.time.23" value="1" />
+          <entry key="project.open.time.23" value="2" />
           <entry key="project.open.time.24" value="2" />
           <entry key="project.open.time.251" value="1" />
           <entry key="project.open.time.27" value="2" />
@@ -106,8 +142,8 @@
           <entry key="project.open.time.36" value="1" />
           <entry key="project.open.time.37" value="1" />
           <entry key="project.open.time.39" value="2" />
-          <entry key="project.open.time.4" value="2" />
-          <entry key="project.open.time.40" value="1" />
+          <entry key="project.open.time.4" value="3" />
+          <entry key="project.open.time.40" value="2" />
           <entry key="project.open.time.41" value="2" />
           <entry key="project.open.time.42" value="2" />
           <entry key="project.open.time.43" value="2" />
@@ -122,23 +158,25 @@
           <entry key="project.open.time.6" value="3" />
           <entry key="project.open.time.63" value="2" />
           <entry key="project.open.time.64" value="1" />
+          <entry key="project.open.time.66" value="1" />
           <entry key="project.open.time.71" value="2" />
+          <entry key="project.open.time.74" value="1" />
           <entry key="project.open.time.76" value="1" />
           <entry key="project.open.time.8" value="2" />
           <entry key="project.open.time.9" value="1" />
           <entry key="project.open.time.97" value="1" />
-          <entry key="project.opened" value="78" />
+          <entry key="project.opened" value="84" />
         </counts>
       </usages-collector>
     </session>
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+            <state relative-caret-position="396">
+              <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
               <folding>
                 <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
                 <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -147,73 +185,6 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <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="99">
-              <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-              <folding>
-                <element signature="imports" expanded="true" />
-                <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-1170">
-              <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state>
-              <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
-              <folding>
-                <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-                <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="true">
-        <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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-              <folding>
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-                <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>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <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="352">
-              <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -225,18 +196,9 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>inCriteria</find>
-      <find>getPgPlanResulList</find>
-      <find>getPileAcuListByPileAcuStr</find>
-      <find>distinct</find>
-      <find>order</find>
-      <find>canPlanLine</find>
-      <find>isExistLine</find>
-      <find>getPlanResult</find>
       <find>pgPipeLine</find>
       <find>getPipeLineBylineName</find>
       <find>StringU</find>
-      <find>getAllAlarm</find>
       <find>getAlarmList</find>
       <find>getPgInPersonListByDay</find>
       <find>getDayInPgStatistic</find>
@@ -254,7 +216,16 @@
       <find>getPgContructionByNameOrType</find>
       <find>&quot;&quot;,&quot;&quot;,</find>
       <find>getPgContructionDtoByNameOrType</find>
+      <find>addConstruction</find>
+      <find>getPgLineAcuHole</find>
+      <find>getPlanResult</find>
       <find>getConstruction</find>
+      <find>addPipeLine</find>
+      <find>未找到入廊数据</find>
+      <find>getCurrentHoleByAcu</find>
+      <find>getAllAlarm</find>
+      <find>getPgDeviceDtoListByPartition</find>
+      <find>getPgDeviceByDevType</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -263,57 +234,57 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlan.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileHoleManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/planData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/PlanData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
       </list>
     </option>
   </component>
@@ -359,7 +330,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -421,53 +391,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="dto" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="manager" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -479,29 +402,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="rs" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -516,6 +416,7 @@
         </subPane>
       </pane>
       <pane id="Scope" />
+      <pane id="PackagesPane" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -710,7 +611,13 @@
       <workItem from="1574902733573" duration="1829000" />
       <workItem from="1574998240004" duration="7016000" />
       <workItem from="1575247959683" duration="6997000" />
-      <workItem from="1575704345590" duration="40473000" />
+      <workItem from="1575704345590" duration="69381000" />
+      <workItem from="1575869479666" duration="721000" />
+      <workItem from="1575947104878" duration="6101000" />
+      <workItem from="1576128264436" duration="3347000" />
+      <workItem from="1576208571543" duration="22000" />
+      <workItem from="1576227513917" duration="862000" />
+      <workItem from="1576293721220" duration="18246000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -817,11 +724,18 @@
       <option name="project" value="LOCAL" />
       <updated>1575775489149</updated>
     </task>
-    <option name="localTasksCounter" value="16" />
+    <task id="LOCAL-00016" summary="整改施工信息">
+      <created>1575791780774</created>
+      <option name="number" value="00016" />
+      <option name="presentableId" value="LOCAL-00016" />
+      <option name="project" value="LOCAL" />
+      <updated>1575791780774</updated>
+    </task>
+    <option name="localTasksCounter" value="17" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="452131000" />
+    <option name="totallyTimeSpent" value="510338000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -834,9 +748,8 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
-    <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.24205749" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2647504" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -847,7 +760,7 @@
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.3295082" />
       <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.4819672" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.65737706" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.3295082" />
@@ -939,7 +852,8 @@
     <MESSAGE value="重新设计智能规划部分" />
     <MESSAGE value="完成智能规划对接" />
     <MESSAGE value="修改报警统计" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改报警统计" />
+    <MESSAGE value="整改施工信息" />
+    <option name="LAST_COMMIT_MESSAGE" value="整改施工信息" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -951,16 +865,10 @@
           <option name="timeStamp" value="3" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java</url>
-          <line>69</line>
+          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java</url>
+          <line>40</line>
           <properties />
-          <option name="timeStamp" value="21" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java</url>
-          <line>96</line>
-          <properties />
-          <option name="timeStamp" value="38" />
+          <option name="timeStamp" value="122" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
@@ -970,394 +878,452 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <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="2068">
-          <caret line="154" column="35" selection-start-line="154" selection-start-column="35" selection-end-line="154" selection-end-column="35" />
-        </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="3300">
-          <caret line="297" column="22" selection-start-line="297" selection-start-column="22" selection-end-line="297" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/StringUtils.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
-          <caret line="13" column="48" lean-forward="true" selection-start-line="13" selection-start-column="48" selection-end-line="13" selection-end-column="48" />
+          <caret line="11" column="5" selection-start-line="11" selection-start-column="5" selection-end-line="11" selection-end-column="5" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="78" lean-forward="true" selection-start-line="78" selection-end-line="78" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="616">
-          <caret line="41" column="1" selection-start-line="41" selection-start-column="1" selection-end-line="41" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="110">
-          <caret line="12" column="23" selection-start-line="12" selection-start-column="23" selection-end-line="12" selection-end-column="23" />
+        <state relative-caret-position="516">
+          <caret line="114" column="12" selection-start-line="114" selection-start-column="12" selection-end-line="114" selection-end-column="12" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="164">
-          <caret line="56" lean-forward="true" selection-start-line="56" selection-end-line="56" />
+        <state relative-caret-position="418">
+          <caret line="33" column="44" selection-start-line="33" selection-start-column="44" selection-end-line="33" selection-end-column="44" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="258">
-          <caret line="27" column="12" lean-forward="true" selection-start-line="27" selection-start-column="12" selection-end-line="27" selection-end-column="12" />
+        <state relative-caret-position="132">
+          <caret line="11" column="20" lean-forward="true" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="20" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.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="-12">
-          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        <state relative-caret-position="516">
+          <caret line="142" column="54" selection-start-line="142" selection-start-column="54" selection-end-line="142" selection-end-column="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="858">
-          <caret line="55" column="27" lean-forward="true" selection-start-line="55" selection-start-column="27" selection-end-line="55" selection-end-column="27" />
+        <state relative-caret-position="66">
+          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="58">
+          <caret line="18" column="28" selection-start-line="18" selection-start-column="19" selection-end-line="18" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="305">
+          <caret line="24" column="31" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="714">
+          <caret line="58" column="5" lean-forward="true" selection-start-line="58" selection-start-column="5" selection-end-line="58" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="924">
+          <caret line="134" column="92" selection-start-line="134" selection-start-column="92" selection-end-line="134" selection-end-column="92" />
+          <folding>
+            <element signature="method#linkDevice#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkPartitionCamera#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkReservePlan#0;class#PgAlarmLinkRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1066">
+          <caret line="90" lean-forward="true" selection-start-line="90" selection-end-line="90" />
+          <folding>
+            <element signature="method#getTjResultByAlarmType#0;class#PgAlarmTjRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="946">
+          <caret line="148" column="11" lean-forward="true" selection-start-line="148" selection-start-column="11" selection-end-line="148" selection-end-column="11" />
+          <folding>
+            <element signature="method#getAlarmTypeList#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#addAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#editAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#deleteAlarmType#0;class#PgAlarmTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="208">
+          <caret line="46" column="23" lean-forward="true" selection-start-line="46" selection-start-column="23" selection-end-line="46" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="113" column="9" lean-forward="true" selection-start-line="113" selection-start-column="9" selection-end-line="113" selection-end-column="9" />
+          <folding>
+            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
+            <element signature="method#getNewestCh4InfoByDev#0;class#PgCh4Rs#0" />
+            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="145" column="6" lean-forward="true" selection-start-line="145" selection-start-column="6" selection-end-line="145" selection-end-column="6" />
+          <folding>
+            <element signature="method#addAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#editAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#deleteAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#getAuthorityList#0;class#PgAuthorityRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="58" column="1" lean-forward="true" selection-start-line="58" selection-start-column="1" selection-end-line="58" selection-end-column="1" />
+          <folding>
+            <element signature="method#getPgAssetPlanList#0;class#PgAssetPlanRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="370">
+          <caret line="371" column="66" selection-start-line="371" selection-start-column="66" selection-end-line="371" selection-end-column="66" />
+          <folding>
+            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#searchConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionDev#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="139" column="13" lean-forward="true" selection-start-line="139" selection-start-column="13" selection-end-line="139" selection-end-column="13" />
+          <folding>
+            <element signature="method#getCoInfoByDevAndDate#0;class#PgCoRs#0" />
+            <element signature="method#getNewestCoInfoByDev#0;class#PgCoRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="540">
+          <caret line="223" column="5" lean-forward="true" selection-start-line="223" selection-start-column="5" selection-end-line="223" selection-end-column="5" />
+          <folding>
+            <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="682">
+          <caret line="100" lean-forward="true" selection-start-line="100" selection-end-line="100" />
+          <folding>
+            <element signature="method#getDeviceTpeyList#0;class#PgDeviceTypeRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="377">
+          <caret line="225" column="35" selection-start-line="225" selection-start-column="35" selection-end-line="225" selection-end-column="35" />
+          <folding>
+            <element signature="method#addEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#addEquipment#1;class#PgEquipmentRs#0" />
+            <element signature="method#getEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#deleteEquipment#0;class#PgEquipmentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="406">
+          <caret line="109" lean-forward="true" selection-start-line="109" selection-end-line="109" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="154">
+          <caret line="28" column="19" selection-start-line="28" selection-start-column="19" selection-end-line="28" selection-end-column="19" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="748">
-          <caret line="49" column="5" lean-forward="true" selection-start-line="49" selection-start-column="5" selection-end-line="49" selection-end-column="5" />
+        <state relative-caret-position="296">
+          <caret line="161" column="35" selection-start-line="161" selection-start-column="35" selection-end-line="161" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="384">
+          <caret line="99" column="5" lean-forward="true" selection-start-line="99" selection-start-column="5" selection-end-line="99" selection-end-column="5" />
+        </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="362">
+          <caret line="340" column="35" selection-start-line="340" selection-start-column="35" selection-end-line="340" selection-end-column="35" />
+          <folding>
+            <element signature="method#addInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPersonInPg#0;class#PgInPgPersonRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-606">
+          <caret line="76" column="20" lean-forward="true" selection-start-line="76" selection-start-column="20" selection-end-line="76" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="65" column="35" selection-start-line="65" selection-start-column="35" selection-end-line="65" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="101" column="35" selection-start-line="101" selection-start-column="35" selection-end-line="101" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="84" column="35" selection-start-line="84" selection-start-column="35" selection-end-line="84" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="59" lean-forward="true" selection-start-line="59" selection-end-line="59" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="60" column="1" lean-forward="true" selection-start-line="60" selection-start-column="1" selection-end-line="60" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="145" column="35" selection-start-line="145" selection-start-column="35" selection-end-line="145" selection-end-column="35" />
+        </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="274">
+          <caret line="350" column="35" selection-start-line="350" selection-start-column="35" selection-end-line="350" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="121" column="39" selection-start-line="121" selection-start-column="39" selection-end-line="121" selection-end-column="39" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="28" column="8" lean-forward="true" selection-start-line="28" selection-start-column="8" selection-end-line="28" selection-end-column="8" />
+        <state relative-caret-position="340">
+          <caret line="103" selection-start-line="103" selection-end-line="103" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="226" column="35" selection-start-line="226" selection-start-column="35" selection-end-line="226" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="203" column="35" selection-start-line="203" selection-start-column="35" selection-end-line="203" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="241" column="35" selection-start-line="241" selection-start-column="35" selection-end-line="241" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="225" column="1" lean-forward="true" selection-start-line="225" selection-start-column="1" selection-end-line="225" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="176" column="5" lean-forward="true" selection-start-line="176" selection-start-column="5" selection-end-line="176" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="178" column="35" lean-forward="true" selection-start-line="178" selection-start-column="35" selection-end-line="178" selection-end-column="35" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="516">
-          <caret line="94" column="53" selection-start-line="94" selection-start-column="53" selection-end-line="94" selection-end-column="53" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="814">
-          <caret line="52" column="9" lean-forward="true" selection-start-line="52" selection-start-column="9" selection-end-line="52" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="182">
-          <caret line="58" column="12" lean-forward="true" selection-start-line="58" selection-start-column="12" selection-end-line="58" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="34" lean-forward="true" selection-start-line="34" selection-end-line="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="32" lean-forward="true" selection-start-line="32" selection-end-line="32" />
-          <folding>
-            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
-            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="185">
-          <caret line="63" column="13" selection-start-line="63" selection-start-column="13" selection-end-line="63" selection-end-column="13" />
-          <folding>
-            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
-            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
-            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="e#6319#6324#0" />
-            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
-          </folding>
+          <caret line="240" lean-forward="true" selection-start-line="240" selection-end-line="240" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
-          <caret line="58" column="28" lean-forward="true" selection-start-line="58" selection-start-column="28" selection-end-line="58" selection-end-column="28" />
-          <folding>
-            <element signature="method#addTempHumData#0;class#PgTempHumRs#0" />
-          </folding>
+        <state relative-caret-position="340">
+          <caret line="148" column="34" selection-start-line="148" selection-start-column="34" selection-end-line="148" selection-end-column="34" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
+        <state relative-caret-position="458">
+          <caret line="99" column="35" selection-start-line="99" selection-start-column="35" selection-end-line="99" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+        <state relative-caret-position="384">
+          <caret line="145" column="32" lean-forward="true" selection-start-line="145" selection-start-column="32" selection-end-line="145" selection-end-column="32" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="414">
-          <caret line="22" column="46" lean-forward="true" selection-start-line="22" selection-start-column="46" selection-end-line="22" selection-end-column="46" />
-        </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="396">
-          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" column="83" selection-start-line="11" selection-start-column="83" selection-end-line="11" selection-end-column="83" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="26">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
-          <folding>
-            <element signature="method#getPgInPgStatusByPerson#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNumByName#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNum#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPersonListByDay#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPgStatusByPgInPgPerson#0;class#PgInPgStatusManager#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="44">
-          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-12">
-          <caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="87" lean-forward="true" selection-start-line="87" selection-end-line="87" />
-          <folding>
-            <element signature="method#getConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#addConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#deleteConstructionType#0;class#PgConstructionTypeRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
-          <folding>
-            <element signature="method#getConstructionTypeByType#0;class#PgConstructionTypeManager#0" />
-            <element signature="method#getAllConstructionTypeDto#0;class#PgConstructionTypeManager#0" />
-          </folding>
-        </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="145">
-          <caret line="258" column="9" lean-forward="true" selection-start-line="258" selection-start-column="9" selection-end-line="258" selection-end-column="9" />
-          <folding>
-            <element signature="method#getMonthInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayInPgStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgOverViewRs#0" />
-            <element signature="method#getAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getMonthAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayAlarmStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgOverViewRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="103">
-          <caret line="105" column="50" lean-forward="true" selection-start-line="105" selection-start-column="50" selection-end-line="105" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateBasicDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="99">
-          <caret line="125" selection-start-line="125" selection-end-line="125" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="190">
-          <caret line="24" column="35" lean-forward="true" selection-start-line="24" selection-start-column="35" selection-end-line="24" selection-end-column="35" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="436">
-          <caret line="24" lean-forward="true" selection-start-line="24" selection-end-line="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" lean-forward="true" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="300">
-          <caret line="34" column="31" lean-forward="true" selection-start-line="34" selection-start-column="31" selection-end-line="34" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="42" column="13" lean-forward="true" selection-start-line="42" selection-start-column="13" selection-end-line="42" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="120" column="72" lean-forward="true" selection-start-line="120" selection-start-column="72" selection-end-line="120" selection-end-column="72" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="293">
-          <caret line="58" column="73" lean-forward="true" selection-start-line="58" selection-start-column="73" selection-end-line="58" selection-end-column="73" />
-          <folding>
-            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
-            <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
-          </folding>
-        </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="307">
-          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
+        <state relative-caret-position="758">
+          <caret line="130" column="5" lean-forward="true" selection-start-line="130" selection-start-column="5" selection-end-line="130" selection-end-column="5" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1170">
-          <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
+        <state relative-caret-position="494">
+          <caret line="86" column="62" lean-forward="true" selection-start-line="86" selection-start-column="62" selection-end-line="86" selection-end-column="62" />
           <folding>
-            <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-            <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+            <element signature="method#getAllDevice#0;class#PgDeviceManager#0" />
+            <element signature="method#getAllDev#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="195" column="28" lean-forward="true" selection-start-line="195" selection-start-column="28" selection-end-line="195" selection-end-column="28" />
+        <state relative-caret-position="166">
+          <caret line="174" column="13" lean-forward="true" selection-start-line="174" selection-start-column="13" selection-end-line="174" selection-end-column="13" />
           <folding>
-            <element signature="method#getAlarmByTypeAndTime#0;class#PgAlarmManager#0" />
-            <element signature="method#getAlarmNum#0;class#PgAlarmManager#0" />
             <element signature="method#getDayAlarmStatistic#0;class#PgAlarmManager#0" />
+            <element signature="method#getAlarmList#0;class#PgAlarmManager#0" />
             <element signature="method#createDTO#0;class#PgAlarmManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="364">
+          <caret line="46" column="56" lean-forward="true" selection-start-line="46" selection-start-column="56" selection-end-line="46" selection-end-column="56" />
+          <folding>
+            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
+            <element signature="method#getPgDev#0;class#PgDeviceRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
+            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+        <state relative-caret-position="396">
+          <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
           <folding>
             <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
             <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -1365,52 +1331,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="239">
-          <caret line="21" column="33" lean-forward="true" selection-start-line="21" selection-start-column="33" selection-end-line="21" selection-end-column="33" />
-        </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="352">
-          <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-        </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="99">
-          <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-          </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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-          <folding>
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-            <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>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
index c436c93..e913155 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
@@ -132,7 +132,10 @@
             this.setAlarmType("");
         else
             this.setAlarmType(pgAlarm.getAlarmTypeId().getAlarmType());
-        this.setAlarmValue(pgAlarm.getAlarmValue());
+        if(pgAlarm.getAlarmValue()==null)
+            this.setAlarmValue("");
+        else
+            this.setAlarmValue(pgAlarm.getAlarmValue());
         if (pgAlarm.getAlarmDate() != null)
             this.setAlarmDate(sdf.format(pgAlarm.getAlarmDate()));
         else
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
index a43965c..565cb41 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -159,11 +159,21 @@
     }
 
     //获取历史报警消息列表
-    public List<PgAlarmDto> getAllAlarm(String alarmType,String startDay,String endDay,String isNew,int page,int rows) {
-        try {
+    public  Map<String, Object> getAllAlarm(String alarmType,String partition,String startDay,String endDay,String isNew,int page,int rows) {
 
+        Map<String, Object> resultMap = new HashMap<>();
+        String msg="";
+
+        try {
             Criteria criteria = createCriteria(PgAlarm.class);
 
+            if (StringUtils.isNotBlank(partition)) {
+                DetachedCriteria inCriteria = DetachedCriteria.forClass(PgDevice.class);
+                inCriteria.add(Restrictions.eq("partition", partition));
+                inCriteria.setProjection(Property.forName("id"));
+                criteria.add(Property.forName("alarmDevId").in(inCriteria));
+            }
+
             if (StringUtils.isNotBlank(alarmType)&&!alarmType.contains("全部")&&pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
                 criteria.add(Restrictions.eq("alarmTypeId", pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)));
 
@@ -190,8 +200,16 @@
             for (PgAlarm pgAlarm : pgAlarmList) {
                 pgAlarmDtoList.add(new PgAlarmDto(pgAlarm));
             }
-
-            return pgAlarmDtoList;
+            if(pgAlarmDtoList==null||pgAlarmDtoList.size()==0) {
+                resultMap.put("msg", "没有报警信息");
+                resultMap.put("code","0");
+            }else {
+                resultMap.put("code","200");
+                resultMap.put("msg", "报警信息获取成功");
+            }
+            resultMap.put("count",pg.getTotalCount());
+            resultMap.put("result",pgAlarmDtoList);
+            return resultMap;
         }
         catch(Exception ex){
             ex.printStackTrace();
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index 7547560..654f49e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -24,11 +24,11 @@
 
         Criteria criteria = createCriteria(PgDevice.class);
 
-        if(road!=null)
+        if(StringUtils.isNotBlank(road))
             criteria.add(Restrictions.eq("road",road));
-        if(partition!=null)
+        if(StringUtils.isNotBlank(partition))
             criteria.add(Restrictions.eq("partition",partition));
-        if(devType!=null)
+        if(StringUtils.isNotBlank(devType))
             criteria.add(Restrictions.eq("devType",devType));
 
         criteria.add(Restrictions.eq("active", 1));
@@ -43,6 +43,29 @@
         return pgDeviceDtoList;
     }
 
+    public List<PgDeviceDto> getAllDev(String road,String partition,String devType) {
+
+        Criteria criteria = createCriteria(PgDevice.class);
+
+        if(StringUtils.isNotBlank(road))
+            criteria.add(Restrictions.eq("road",road));
+        if(StringUtils.isNotBlank(partition))
+            criteria.add(Restrictions.eq("partition",partition));
+        if(StringUtils.isNotBlank(devType))
+            criteria.add(Restrictions.like("devType","%"+devType+"%"));
+
+        criteria.add(Restrictions.eq("active", 1));
+        criteria.addOrder(Order.desc("id"));
+        List<PgDevice> pgDeviceList = criteria.list();
+
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
+        for (PgDevice pgDevice : pgDeviceList) {
+            pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
+        }
+
+        return pgDeviceDtoList;
+    }
+
     //根据名字获取当前设备
     public PgDevice getDeviceByAssetCode(String assetCode) {
         Criteria criteria=createCriteria(PgDevice.class);
@@ -56,9 +79,9 @@
     }
 
     //根据类型获取设备列表
-    public List<PgDeviceDto> getDeviceByDevTypee(String devType) {
+    public List<PgDeviceDto> getDeviceByDevType(String devType) {
         Criteria criteria=createCriteria(PgDevice.class);
-        criteria.add(Restrictions.eq("devType",devType));
+        criteria.add(Restrictions.like("devType","%"+devType+"%"));
 
         List<PgDevice> pgDeviceList=criteria.list();
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
@@ -106,7 +129,7 @@
         criteria.add(Restrictions.eq("partition",partition));
 
         List<PgDevice> pgDeviceList=criteria.list();
-        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<PgDeviceDto>();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
 
         for (PgDevice pgDevice : pgDeviceList) {
             pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
index 3a3bccd..595730e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
@@ -1,10 +1,13 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.devTable.domain.PgAlarmType;
 import com.casic.PgInterface.devTable.domain.PgPartition;
 import com.casic.PgInterface.devTable.domain.PgRoad;
 import com.casic.PgInterface.devTable.domain.PipeGallery;
 import com.casic.PgInterface.devTable.dto.PgPartitionDto;
+import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
@@ -12,7 +15,9 @@
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Created by yxw on 2017/11/4.
@@ -21,7 +26,8 @@
 public class PgPartitionManager extends HibernateEntityDao<PgPartition> {
 
     @Resource
-    PgRoadManager pgRoadManager;
+    private PgRoadManager pgRoadManager;
+
 
     public PgPartition getPartitionByParName(String parName) {
         Criteria criteria = getSession().createCriteria(PgPartition.class);
@@ -99,4 +105,5 @@
         return pgPartitionDtoList;
     }
 
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
index f216360..a6928f1 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
@@ -5,6 +5,7 @@
 public class PgPlanResultRe {
 
     private String taskKey;
+    private List<String> pileAcuList;
     private List<PgPlanResult> pgPlanResultList;
 
     public String getTaskKey() {
@@ -15,6 +16,14 @@
         this.taskKey = taskKey;
     }
 
+    public List<String> getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(List<String> pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+
     public List<PgPlanResult> getPgPlanResultList() {
         return pgPlanResultList;
     }
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
index 71ea765..47eea07 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
@@ -54,9 +54,7 @@
 
         List<PgLineHole> pgLineHoleList=criteria.list();
         List<PgLineHoleDTO> pgLineHoleDTOList=new ArrayList<>();
-        if(pgLineHoleList==null||pgLineHoleList.size()==0)
-            return null;
-        else
+        if(pgLineHoleList!=null&&pgLineHoleList.size()!=0)
             pgLineHoleDTOList=PgLineHoleDTO.ConvertToDTOList(pgLineHoleList,pgPileAcuManager,pgRoadManager);
         return pgLineHoleDTOList;
     }
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
index 0fd9e1f..841a386 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
@@ -1,12 +1,15 @@
 package com.casic.PgInterface.intelPlan.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.devTable.domain.PgPartition;
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
 import com.casic.PgInterface.intelPlan.domain.PgLineHole;
 import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
 import com.casic.PgInterface.intelPlan.domain.PgSection;
 import com.casic.PgInterface.intelPlan.dto.PgPlanResult;
 import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
 import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -22,6 +25,9 @@
     @Resource
     private PgLineHoleManager pgLineHoleManager;
 
+    @Resource
+    private PgRoadManager pgRoadManager;
+
     public PgPileAcu getPgPileAcuByCode(String acuCode){
         List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
 
@@ -58,7 +64,9 @@
         for(PgPlanTask pgPlanTask:pgPlanTaskList){
             List<PgPlanResult> pgPlanResultList=getPgPlanResultByPlantask(pgPlanTask);
             PgPlanResultRe pgPlanResultRe=new PgPlanResultRe();
+
             pgPlanResultRe.setTaskKey(pgPlanTask.getTaskKey());
+            pgPlanResultRe.setPileAcuList(pgPlanTask.getPileAcuList());
             pgPlanResultRe.setPgPlanResultList(pgPlanResultList);
 
             pgPlanResultReList.add(pgPlanResultRe);
@@ -142,4 +150,57 @@
         return length;
     }
 
+    private PgPileAcu getPgPileAcuByAcuCode(String acuCode){
+        List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
+
+        if(pgPileAcuList==null||pgPileAcuList.size()==0)
+            return null;
+        else
+            return pgPileAcuList.get(0);
+    }
+
+    public List<PgAcuTask> getACUTask(String pileAcuList){
+        String[] acuArray=pileAcuList.split(",");
+        List<PgAcuTask> pgAcuTaskList=new ArrayList<>();
+
+        for(String acu:acuArray){
+            PgPileAcu pgPileAcu=this.getPgPileAcuByCode(acu);
+            String roadName=pgRoadManager.get(pgPileAcu.getRoadId()).getRoadName();
+
+            if(!containRoad(roadName,pgAcuTaskList))
+            {
+                PgAcuTask pgAcuTask=new PgAcuTask();
+                pgAcuTask.setRoadName(roadName);
+                pgAcuTask.setPileAcuList(acu);
+                pgAcuTaskList.add(pgAcuTask);
+            }
+            else{
+                PgAcuTask pgAcuTask=getIndexRoad(roadName,pgAcuTaskList);
+                if(pgAcuTask!=null)
+                    pgAcuTask.setPileAcuList(pgAcuTask.getPileAcuList()+","+acu);
+            }
+        }
+
+        return pgAcuTaskList;
+    }
+
+    private boolean containRoad(String roadName,List<PgAcuTask> pgAcuTaskList){
+        if(pgAcuTaskList==null||pgAcuTaskList.size()==0) return false;
+        for(PgAcuTask pgAcuTask:pgAcuTaskList){
+            if(pgAcuTask.getRoadName().equals(roadName))
+                return true;
+        }
+
+        return false;
+    }
+
+    private PgAcuTask getIndexRoad(String roadName, List<PgAcuTask> pgAcuTaskList){
+        for(PgAcuTask pgAcuTask:pgAcuTaskList){
+            if(pgAcuTask.getRoadName().equals(roadName))
+                return pgAcuTask;
+        }
+
+        return null;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java
new file mode 100644
index 0000000..323f7ef
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java
@@ -0,0 +1,25 @@
+package com.casic.PgInterface.reservePlan.dto;
+
+import java.util.List;
+
+public class PgAcuTask {
+
+    private String roadName;//道路
+    private String pileAcuList;//acu分区
+
+    public String getRoadName() {
+        return roadName;
+    }
+
+    public void setRoadName(String roadName) {
+        this.roadName = roadName;
+    }
+
+    public String getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(String pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
index c25e926..c7d7693 100644
--- a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
@@ -70,9 +70,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(Long.valueOf(inPgPersonId));
         PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("hostName",pgInPgPerson.getAssetCode());
-//        PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode());
-//        long maxId = pgTagPositionManager.getMaxId(pgTagMac.getTagMac());
-//        PGTagPosition pgTagPosition = pgTagPositionManager.get(maxId);
+
         PGTagPosition pgTagPosition = tagmacRun.GetTagStatus(pgTagMac);
         boolean bExist = false;
         bExist = pgTagPositionManager.findTagPosition(pgTagPosition.getPositionUpdatetime(),pgTagPosition.getHostId());
@@ -104,8 +102,7 @@
         PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(Long.valueOf(inPgPersonId));
         PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pgInPgPersonId",pgInPgPerson);
         System.out.println("time:"+pgInPgStatus.getInTime());
-//        PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pgInPgPersonId",inPgPersonId);
-//        PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode());
+
         PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("hostName",pgInPgPerson.getAssetCode());
 
         Map<Object,Object> mapPosition = new HashMap<>();
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
index 082ba5d..3eed00a 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
@@ -48,6 +48,7 @@
     public Map<String, Object> linkDevice(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         PgDeviceDto pgDeviceDto = null;
         try {
@@ -62,6 +63,7 @@
                     else {
                         pgDeviceDto = new PgDeviceDto(pgDevice);
                         msg = "报警关联设备获取成功";
+                        code="200";
                     }
                 }
             }
@@ -71,6 +73,7 @@
             e.printStackTrace();
             msg = "获取关联设备失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceDto);
 
@@ -86,6 +89,7 @@
     public Map<String, Object> linkPartitionCamera(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
         try {
@@ -106,6 +110,7 @@
 
                         pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(partition,position);
                         msg = "关联设备获取成功";
+                        code="200";
                     }
                 }
             }
@@ -115,6 +120,7 @@
             e.printStackTrace();
             msg = "分区设备关联失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceDtoList);
         return resultMap;
@@ -129,6 +135,7 @@
     public Map<String, Object> linkReservePlan(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgReservePlanDto> pgReservePlanDtoList=new ArrayList<>();
         try{
@@ -139,10 +146,12 @@
                 else {
                     pgReservePlanDtoList = pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
 
-                    if(pgReservePlanDtoList==null||pgReservePlanDtoList.size()==0)
-                        msg="不存在关联的报警预案";
-                    else
+                    if (pgReservePlanDtoList == null || pgReservePlanDtoList.size() == 0)
+                        msg = "不存在关联的报警预案";
+                    else {
                         msg = "关联预案获取成功";
+                        code="200";
+                    }
                 }
             }
             else
@@ -153,6 +162,7 @@
             e.printStackTrace();
             msg="预案关联失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgReservePlanDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
index 0ddbc4d..0ce886b 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
@@ -41,25 +41,19 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getAlarmList(@FormParam("alarmType") String alarmType,
                                             @FormParam("startDay") String startDay,
+                                            @FormParam("partition") String partition,
                                             @FormParam("endDay") String endDay,
                                             @FormParam("isNew") String isNew,
                                             @FormParam("page") int page,
                                             @FormParam("rows") int rows) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
         try {
-            pgAlarmDtoList = pgAlarmManager.getAllAlarm(alarmType,startDay,endDay,isNew,page,rows);
-            if (pgAlarmDtoList==null||pgAlarmDtoList.size() == 0)
-                msg = "没有报警信息";
-            else
-                msg = "报警信息获取成功";
+            resultMap = pgAlarmManager.getAllAlarm(alarmType,partition,startDay,endDay,isNew,page,rows);
+
         } catch (Exception e) {
             e.printStackTrace();
-            msg = "报警信息获取失败";
         }
-        resultMap.put("msg", msg);
-        resultMap.put("result", pgAlarmDtoList);
         return resultMap;
     }
 
@@ -71,9 +65,10 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> clearAlarmList(@FormParam("id") String id) throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        String result = "false";
+        String result = "";
+        String code="0";
 
         try {
             PgAlarm pgAlarm = new PgAlarm();
@@ -86,12 +81,14 @@
                 pgAlarmManager.save(pgAlarm);
                 msg = "报警信息清除成功";
                 result = "true";
+                code = "200";
             }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警信息清除失败";
             result = "false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
@@ -106,21 +103,26 @@
     public Map<String, Object> getAlarmByTypeOrTime(@FormParam("alarmType") String alarmType,
                                                     @FormParam("startTime") String startTime,
                                                     @FormParam("endTime") String endTime) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
-        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<PgAlarmDto>();
+        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
         try {
             pgAlarmDtoList = pgAlarmManager.getAlarmByTypeAndTime(alarmType, startTime, endTime);
             if (pgAlarmDtoList == null || pgAlarmDtoList.size() == 0)
                 msg = "报警信息不存在";
             else
+            {
                 msg = "报警信息获取成功";
+                code="200";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警信息获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
index 29ce8a4..ed0bf34 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
@@ -39,8 +39,8 @@
     public Map<String, Object> getAlarmRule(@FormParam("devType") String devType) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
-        System.out.println("devType:"+devType);
         List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<>();
         try {
             pgAlarmRuleDtoList = pgAlarmRuleManager.getAlarmRuleDto(devType);
@@ -52,6 +52,7 @@
             e.printStackTrace();
             msg = "报警阈值信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmRuleDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
index 24ab894..abef1b1 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
@@ -39,16 +39,21 @@
                                                      @FormParam("endDate") String endDate)throws Exception{
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
+
         List<PgAlarmTjDto> pgAlarmTjDtoList=null;
         try{
             pgAlarmTjDtoList=pgAlarmTjManager.getAlarmTjResultByType(startDate,endDate);
             msg="获取成功";
+            code="200";
         }
         catch(Exception ex) {
             msg = "统计失败";
         }
-        resultMap.put("result",pgAlarmTjDtoList);
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
+        resultMap.put("result",pgAlarmTjDtoList);
+
         return resultMap;
     }
 
@@ -61,23 +66,27 @@
     public Map<String, Object> getAlarmByTime(@FormParam("startTime") String startTime,
                                               @FormParam("endTime") String endTime,
                                               @FormParam("statisticType") String statisticType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code = "0";
 
-        List<PgAlarmTjDto> pgAlarmTjDtoList = new ArrayList<PgAlarmTjDto>();
+        List<PgAlarmTjDto> pgAlarmTjDtoList = new ArrayList<>();
         try {
             pgAlarmTjDtoList = pgAlarmTjManager.getAlarmByTime(startTime, endTime, statisticType);
             if(pgAlarmTjDtoList==null)
                 msg="报警统计信息获取失败";
-            else
-                msg="报警统计信息获取成功";
+            else {
+                msg = "报警统计信息获取成功";
+                code="200";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警统计信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmTjDtoList);
         return resultMap;
     }
 
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
index 28bc811..b6278a9 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
@@ -30,7 +30,6 @@
     @Resource
     private PgAlarmTypeManager pgAlarmTypeManager;
 
-
     /**
      * 获取报警类型
      */
@@ -38,19 +37,24 @@
     @Path("getAlarmType")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getAlarmTypeList()throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
-        List<PgAlarmTypeDto> pgAlarmTypeDtoList=new ArrayList<PgAlarmTypeDto>();
+        String code="";
+
+        List<PgAlarmTypeDto> pgAlarmTypeDtoList=new ArrayList<>();
         try {
             pgAlarmTypeDtoList = pgAlarmTypeManager.getAllAlarmTypeDto();
             if(pgAlarmTypeDtoList.size()==0)
                 msg="没有报警类型信息";
-            else
-                msg="报警类型信息获取成功";
+            else {
+                code="200";
+                msg = "报警类型信息获取成功";
+            }
         }catch(Exception e){
             e.printStackTrace();
             msg="报警类型信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAlarmTypeDtoList);
         return resultMap;
@@ -66,6 +70,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
@@ -83,6 +88,7 @@
                 logger.info("成功保存");
                 result = "true";
                 msg = "保存成功";
+                code="200";
             }
         } catch (Exception e) {
             result = "false";
@@ -90,6 +96,7 @@
             e.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -106,6 +113,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try{
             if(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
@@ -119,6 +127,7 @@
                 pgAlarmTypeManager.save(pgAlarmType);
                 result = "true";
                 msg = "编辑成功";
+                code="200";
             }
         }
         catch(Exception e)
@@ -128,6 +137,7 @@
             e.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("result",result);
         resultMap.put("msg",msg);
 
@@ -146,6 +156,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
         String result="false";
+        String code="0";
 
         try {
             PgAlarmType pgAlarmType=pgAlarmTypeManager.get(Long.valueOf(id));
@@ -157,6 +168,7 @@
             {
                 pgAlarmType.setActive(0);
                 pgAlarmTypeManager.save(pgAlarmType);
+                code="200";
                 msg="报警类型删除成功";
                 result="true";
             }
@@ -165,6 +177,7 @@
             msg="报警类型删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
index 4533e1a..85940bb 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
@@ -33,12 +33,15 @@
                                                  @FormParam("inSpectionPlace") String inSpectionPlace){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
         List<PgAssetPlanDto> pgAssetPlanDtoList=new ArrayList<>();
         try{
             pgAssetPlanDtoList=pgAssetPlanManager.getPgAssetPlanDtoList(startDay,endDay,inSpectionPlace);
-            if(pgAssetPlanDtoList!=null&&pgAssetPlanDtoList.size()!=0)
-                msg="巡检信息获取成功";
+            if(pgAssetPlanDtoList!=null&&pgAssetPlanDtoList.size()!=0) {
+                code="200";
+                msg = "巡检信息获取成功";
+            }
             else
                 msg="不存在巡检信息";
         }
@@ -47,6 +50,7 @@
             msg="巡检信息获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAssetPlanDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
index 47ef9d1..5cbdfcb 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
@@ -30,12 +30,15 @@
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
         String result="";
+        String code="0";
 
         List<PgAssetPlanStatic> pgAssetPlanStaticList = null;
         try{
             pgAssetPlanStaticList=pgAssetPlanManager.getPgAssetPlanStaticLisByTime(startTime,endTime,staticType);
-            if(pgAssetPlanStaticList!=null&&pgAssetPlanStaticList.size()!=0)
-                msg="巡检统计信息获取成功";
+            if(pgAssetPlanStaticList!=null&&pgAssetPlanStaticList.size()!=0) {
+                code = "200";
+                msg = "巡检统计信息获取成功";
+            }
             else
                 msg="统计信息获取失败";
         }
@@ -44,6 +47,7 @@
             msg="统计失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAssetPlanStaticList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
index 26f5d6a..503bfe3 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
@@ -40,6 +40,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="";
 
         try{
             PgAuthority pgAuthority=new PgAuthority();
@@ -50,6 +51,7 @@
 
             pgAuthorityManager.save(pgAuthority);
             msg="用户权限保存成功";
+            code="200";
             result="true";
         }
         catch(Exception e) {
@@ -57,6 +59,7 @@
             msg = "新增权限失败";
             result = "false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -65,22 +68,25 @@
 
     /*
        *编辑角权限信息
-        */
+    */
     @POST
     @Path("editAuthority")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> editAuthority(@FormParam("id") String id,
                                        @FormParam("authority") String authority,
                                        @FormParam("concent") String concent) throws Exception{
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
+
         try {
             PgAuthority pgAuthority=pgAuthorityManager.get(Long.valueOf(id));
             pgAuthority.setAuthority(authority);
             pgAuthority.setConcent(concent);
 
             pgAuthorityManager.save(pgAuthority);
+            code="200";
             msg="权限保存成功";
             result="true";
         }
@@ -90,7 +96,7 @@
             msg="权限编辑失败";
             result="false";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -105,9 +111,10 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> deleteAuthority(@FormParam("id") String id)throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
-        String result="false";
+        String result="";
+        String code="0";
 
         try {
             PgAuthority pgAuthority= pgAuthorityManager.get(Long.valueOf(id));
@@ -119,6 +126,7 @@
             {
                 pgAuthority.setActive(0);
                 pgAuthorityManager.save(pgAuthority);
+                code="200";
                 msg="删除权限成功";
                 result="true";
             }
@@ -127,37 +135,40 @@
             msg="删除权限失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
     }
 
     /*
-* 获取权限信息
- */
+    * 获取权限信息
+    */
     @POST
     @Path("getAuthorityList")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> getAuthorityList() {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgAuthorityDto> pgAuthorityDtoList = new ArrayList<PgAuthorityDto>();
         try {
             pgAuthorityDtoList = pgAuthorityManager.getAuthorityList();
             if (pgAuthorityDtoList == null)
                 msg = "不存在权限信息";
-            else
+            else {
+                code = "200";
                 msg = "权限信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "权限信息获取是失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAuthorityDtoList);
         return resultMap;
     }
 
 
-
-
 }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
index a9ef521..a74ecc7 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
@@ -45,6 +45,7 @@
                                                @FormParam("endDate") String endDate)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgHistoryDataDto> pgHistoryDataDtoList=new ArrayList<>();
 
         try {
@@ -55,13 +56,16 @@
                 pgHistoryDataDtoList=pgCh4Manager.getAllCH4Data(pgDevice,startDate,endDate);
                 if(pgHistoryDataDtoList==null)
                     msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+                else {
+                    code = "200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgHistoryDataDtoList);
         return resultMap;
@@ -75,8 +79,9 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getNewestCh4InfoByDev(@FormParam("assetCode") String assetCode)throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
+        String code="0";
         PgCh4Dto pgCh4Dto=new PgCh4Dto(null);
 
         try {
@@ -87,13 +92,17 @@
                 pgCh4Dto=pgCh4Manager.getNewestCH4Data(pgDevice);
                 if(pgCh4Dto==null)
                     msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgCh4Dto);
         return resultMap;
@@ -111,6 +120,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
@@ -127,6 +137,7 @@
                 pgCh4.setPgDeviceId(pgDevice);
 
                 pgCh4Manager.save(pgCh4);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -135,7 +146,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
index a7eac39..dfc8ca5 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
@@ -43,23 +43,27 @@
                                                       @FormParam("endDate") String endDate)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgHistoryDataDto> pgHistoryDataDtoList=new ArrayList<>();
 
         try {
             PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
                 msg="设备不存在";
-            else{
-                pgHistoryDataDtoList=pgCoManager.getAllCoData(pgDevice, startDate, endDate);
-                if(pgHistoryDataDtoList==null)
-                    msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+            else {
+                pgHistoryDataDtoList = pgCoManager.getAllCoData(pgDevice, startDate, endDate);
+                if (pgHistoryDataDtoList == null)
+                    msg = "没有满足要求的数据";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgHistoryDataDtoList);
         return resultMap;
@@ -75,6 +79,7 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         PgCoDto pgCoDto=new PgCoDto(null);
 
         try {
@@ -85,13 +90,16 @@
                 pgCoDto=pgCoManager.getNewestCoData(pgDevice);
                 if(pgCoDto==null)
                     msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgCoDto);
         return resultMap;
@@ -110,6 +118,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         try {
@@ -126,6 +135,7 @@
 
                 pgCoManager.save(pgCo);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
         } catch (Exception e) {
@@ -133,7 +143,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
index b4b826e..9af98a3 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
@@ -60,6 +60,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         try {
 
@@ -80,8 +81,8 @@
                 pgConstruction.setPgConstructionTypeId(pgConstructionType.getId());
                 pgConstruction.setActive(1);
                 pgConstruction.setParName(parName);
-                logger.info("保存成功");
                 pgConstructionManager.save(pgConstruction);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -90,6 +91,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("success", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -116,6 +118,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
@@ -140,6 +143,7 @@
                 pgConstruction.setParName(parName);
 
                 pgConstructionManager.save(pgConstruction);
+                code="200";
                 result = "true";
                 msg = "编辑成功";
             }
@@ -150,7 +154,7 @@
             e.printStackTrace();
 
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -167,6 +171,8 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
+
         try {
             PgConstruction pgConstruction = pgConstructionManager.get(Long.valueOf(id));
             if (pgConstruction == null)
@@ -177,6 +183,7 @@
             {
                 pgConstruction.setActive(0);
                 pgConstructionManager.save(pgConstruction);
+                code="200";
                 result = "true";
                 msg = "成功删除信息";
             }
@@ -185,6 +192,7 @@
             result = "false";
             msg = "删除失败";
         }
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -204,9 +212,11 @@
                                                   @FormParam("rows") int rows)throws Exception{
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
         List<PgConstructionDto> pgConstructionDtoList=new ArrayList<>();
         try{
             pgConstructionDtoList=pgConstructionManager.getPgContructionDto(cs_name,cs_type,startTime,endTime,page,rows);
+            code="200";
             msg="信息获取成功";
         }
         catch(Exception e)
@@ -214,6 +224,7 @@
             e.printStackTrace();
             msg="查询失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
 
@@ -231,18 +242,22 @@
                                                               @FormParam("statisticType") String statisticType) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgConstructionStiatistic> pgConstructionStiatisticList=new ArrayList<>();
         try {
             pgConstructionStiatisticList = pgConstructionManager.getConstructionByTimeAndStatus(startTime, endTime, statisticType);
             if(pgConstructionStiatisticList==null)
                 msg="施工统计信息获取失败";
-            else
-                msg="施工统计信息获取成功";
+            else {
+                code="200";
+                msg = "施工统计信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "施工统计信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgConstructionStiatisticList);
         return resultMap;
@@ -257,6 +272,7 @@
     public Map<String, Object> getConstructionByType(@FormParam("statisticType") String statisticType){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
         List<PgConstructionStiatistic> pgConstructionStiatisticList=new ArrayList<>();
 
         try{
@@ -268,6 +284,7 @@
                 resultMap.put("result",null);
             }
             else {
+                code="200";
                 msg = "统计信息获取成功";
                 resultMap.put("result", pgConstructionStiatisticList);
             }
@@ -278,6 +295,7 @@
             msg="统计失败";
             resultMap.put("result",null);
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         return resultMap;
     }
@@ -291,9 +309,11 @@
     public Map<String, Object> getConstructionToday() throws Exception{
         Map<String,Object> resultMap=new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgConstructionDto> pgConstructionDtoList=new ArrayList<PgConstructionDto>();
         try {
             pgConstructionDtoList = pgConstructionManager.getConstructionToday();
+            code="200";
             msg = "当天施工信息获取成功";
         }
         catch(Exception e)
@@ -301,7 +321,7 @@
             e.printStackTrace();
             msg="获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
         return resultMap;
@@ -316,6 +336,7 @@
     public Map<String, Object> getConstructionDev(@FormParam("id") String id) throws Exception{
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
         List<PgDeviceDto> pgDeviceDtoList =new ArrayList<>();
         try{
@@ -325,14 +346,17 @@
 
             if(pgDeviceDtoList==null)
                 msg="信息获取失败";
-            else
-                msg="信息获取成功";
+            else {
+                code="200";
+                msg = "信息获取成功";
+            }
         }
         catch(Exception e)
         {
             e.printStackTrace();
-            msg="设备信息获取成功";
+            msg="信息获取是被";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgDeviceDtoList);
 
@@ -346,17 +370,21 @@
     @Path("getConstruction")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getConstruction() throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
-        List<PgConstructionDto> pgConstructionDtoList=new ArrayList<PgConstructionDto>();
+        String code="0";
+
+        List<PgConstructionDto> pgConstructionDtoList=new ArrayList<>();
 
         try{
             pgConstructionDtoList=pgConstructionManager.getPgConstructionList();
             if(pgConstructionDtoList==null||pgConstructionDtoList.size()==0)
                 msg="不存在施工记录";
-            else
-                msg="施工信息获取成功";
+            else {
+                code = "200";
+                msg = "施工信息获取成功";
+            }
         }
         catch(Exception e)
         {
@@ -364,6 +392,7 @@
             msg="施工信息获取失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java
index fd3d53e..2019502 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java
@@ -39,12 +39,12 @@
         try {
             pgConstructionTypeDtoList = pgConstructionTypeManager.getAllConstructionTypeDto();
             if (pgConstructionTypeDtoList.size() == 0)
-                msg = "没有项目类型信息";
+                msg = "获取失败";
             else
-                msg = "项目类型获取成功";
+                msg = "获取成功";
         } catch (Exception e) {
             e.printStackTrace();
-            msg = "项目类型信息获取失败";
+            msg = "获取失败";
         }
         resultMap.put("msg", msg);
         resultMap.put("result", pgConstructionTypeDtoList);
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
index 90d001c..037a399 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
@@ -51,6 +51,7 @@
 
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if (StringUtils.isBlank(construct_doc)||StringUtils.isBlank(doc_name))
@@ -65,6 +66,7 @@
             pgCsDocument.setActive(1);
             pgCsDocumentManager.save(pgCsDocument);
 
+            code="200";
             result = "true";
             msg = "保存成功";
 
@@ -74,6 +76,7 @@
             ex.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("success", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -90,6 +93,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             PgCsDocument pgCsDocument = pgCsDocumentManager.get(Long.valueOf(id));
@@ -103,6 +107,7 @@
 
                 pgCsDocumentManager.save(pgCsDocument);
 
+                code="200";
                 result = "true";
                 msg = "编辑成功";
             }
@@ -112,6 +117,7 @@
             msg = "编辑失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -125,9 +131,9 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
         String result="";
+        String code="0";
 
         try{
-
             PgCsDocument pgCsDocument = pgCsDocumentManager.get(Long.valueOf(id));
             if(pgCsDocument==null)
             {
@@ -137,6 +143,7 @@
             else{
                 pgCsDocument.setActive(0);
                 pgCsDocumentManager.save(pgCsDocument);
+                code="200";
                 result="true";
                 msg="删除成功";
             }
@@ -147,7 +154,7 @@
             msg="预案删除失败";
             result="false";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -168,18 +175,21 @@
 
         String msg="";
         String result="";
+        String code="0";
 
         try {
             pgCsDocumentDtoList = pgCsDocumentManager.getAllDocData(cs_name);
-            if (pgCsDocumentDtoList != null)
+            if (pgCsDocumentDtoList != null) {
+                code="200";
                 msg = "获取数据成功";
+            }
             else
                 msg = "没有满足条件的数据";
         }catch (Exception e){
             e.printStackTrace();
             msg = "获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgCsDocumentDtoList);
         return resultMap;
@@ -192,20 +202,22 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
 
         String msg = "";
+        String code="0";
         ResponseEntity<byte[]> path = null;
         try {
             PgCsDocument pgCsDocument = pgCsDocumentManager.get(Long.valueOf(id));
             path = pgCsDocumentManager.downloadFile(pgCsDocument);
             if (path == null)
                 msg = "不存在该文档";
-            else
+            else {
+                code = "200";
                 msg = "下载成功";
-
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "下载失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", path.getBody());
         resultMap.put("msg", msg);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
index 94c5c84..ffc8b95 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
@@ -41,22 +41,24 @@
     public Map<String, Object> getPgDeviceByDevType(@FormParam("devType") String devType) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
         try {
-            pgDeviceDtoList = pgDeviceManager.getDeviceByDevTypee(devType);
+            pgDeviceDtoList = pgDeviceManager.getDeviceByDevType(devType);
             if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0){
                 msg="不存在满足要求的数据";
-                resultMap.put("result",null);
             }
             else{
-                resultMap.put("result", pgDeviceDtoList);
+                code="200";
                 msg = "获取成功";
             }
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", pgDeviceDtoList);
         return resultMap;
     }
 
@@ -69,25 +71,26 @@
     public Map<String, Object> getPgDeviceByAssetCode(@FormParam("assetCode") String assetCode) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         PgDeviceDto pgDeviceDto=null;
         try {
             PgDevice pgDevice = pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
             {
                 msg="不存在设备信息";
-                resultMap.put("result",null);
             }
             else {
                 pgDeviceDto = new PgDeviceDto(pgDevice);
                 msg = "获取成功";
-                resultMap.put("result", pgDeviceDto);
+                code="200";
             }
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", pgDeviceDto);
         return resultMap;
     }
 
@@ -102,27 +105,61 @@
                                              @FormParam("devType") String devType)throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
         try {
             pgDeviceDtoList = pgDeviceManager.getAllDevice(road,partition,devType);
             if(pgDeviceDtoList.size()==0) {
                 msg = "没有找到设备信息";
-                resultMap.put("result",null);
             }
             else {
                 msg = "设备信息获取成功";
-                resultMap.put("result", pgDeviceDtoList);
+                code="200";
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result", pgDeviceDtoList);
         return resultMap;
     }
 
     /**
+     * 显示设备列表
+     */
+    @POST
+    @Path("getPgDev")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String, Object> getPgDev(@FormParam("road") String road,
+                                             @FormParam("partition") String partition,
+                                             @FormParam("devType") String devType)throws Exception {
+        Map<String, Object> resultMap = new HashMap<>();
+        String msg="";
+        String code="0";
+        List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
+        try {
+            pgDeviceDtoList = pgDeviceManager.getAllDev(road,partition,devType);
+            if(pgDeviceDtoList.size()==0) {
+                msg = "没有找到设备信息";
+            }
+            else {
+                code="200";
+                msg = "设备信息获取成功";
+            }
+        }catch(Exception e){
+            e.printStackTrace();
+            msg="设备信息获取失败";
+        }
+        resultMap.put("code",code);
+        resultMap.put("msg",msg);
+        resultMap.put("result", pgDeviceDtoList);
+        return resultMap;
+    }
+
+
+    /**
      * 新增设备
      */
     @POST
@@ -145,6 +182,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if (pgDeviceManager.getDeviceByAssetCode(assetCode)!=null) {
@@ -169,6 +207,7 @@
 
                 pgDeviceManager.save(pgDevice);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
 
@@ -177,10 +216,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -208,14 +246,9 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
-            /*
-            if (pgDeviceManager.getDeviceByAssetCode(assetCode)!=null) {
-                result = "false";
-                msg = "已存在同名设备";
-            } else {
-            */
             PgDevice pgDevice = pgDeviceManager.get(Long.valueOf(id));
             pgDevice.setPipeGallery(pipeGallery);
             pgDevice.setPartition(partition);
@@ -233,14 +266,14 @@
 
             pgDeviceManager.save(pgDevice);
             result = "true";
+            code="200";
             msg = "编辑成功";
-            //}
         } catch (Exception e) {
             result = "false";
             msg = "编辑失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("result",result);
         resultMap.put("msg",msg);
         return resultMap;
@@ -256,7 +289,8 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
-        String result="false";
+        String result="";
+        String code="0";
 
         try {
             PgDevice pgDevice=pgDeviceManager.get(Long.valueOf(id));
@@ -268,6 +302,7 @@
             {
                 pgDevice.setActive(0);
                 pgDeviceManager.save(pgDevice);
+                code="200";
                 msg="设备删除成功";
                 result="true";
             }
@@ -276,6 +311,7 @@
             msg="设备删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -291,18 +327,18 @@
     {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         PgDeviceDto pgDeviceDto=null;
 
         try{
             PgDevice pgDevice=pgDeviceManager.getDeviceBydevCode(devCode);
             if(pgDevice==null) {
                 msg = "设备信息获取失败";
-                resultMap.put("result",null);
             }
             else{
                 pgDeviceDto = new PgDeviceDto(pgDevice);
                 msg = "设备信息获取成功";
-                resultMap.put("result",pgDeviceDto);
+                code="200";
             }
         }
         catch(Exception ex)
@@ -310,8 +346,9 @@
             ex.printStackTrace();
             msg="设备状态获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgDeviceDto);
         return resultMap;
     }
 
@@ -324,17 +361,17 @@
     public Map<String,Object> getDeviceByPartition(@FormParam("partition") String partition) throws Exception{
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<PgDeviceDto>();
 
         try{
             pgDeviceDtoList=pgDeviceManager.getPgDeviceDtoListByPartition(partition);
             if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0) {
                 msg = "设备信息获取失败";
-                resultMap.put("result",null);
             }
             else {
+                code="200";
                 msg = "设备信息获取成功";
-                resultMap.put("result",pgDeviceDtoList);
             }
         }
         catch(Exception e)
@@ -342,8 +379,9 @@
             e.printStackTrace();
             msg="设备信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgDeviceDtoList);
         return resultMap;
     }
 
@@ -353,17 +391,16 @@
     public Map<String,Object> getDeviceByOldDAssetCodeCode(@FormParam("assetCode") String assetCode) throws Exception{
         Map<String, Object> resultMap = new HashMap<>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
 
         try{
             pgDeviceDtoList=pgDeviceManager.getDeviceByOldDAssetCodeCode(assetCode);
-            if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0) {
-                msg = "设备信息获取失败";;
-                resultMap.put("result",null);
-            }
+            if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0)
+                msg = "设备信息获取失败";
             else {
                 msg = "设备信息获取成功";
-                resultMap.put("result",pgDeviceDtoList);
+                code="200";
             }
         }
         catch(Exception e)
@@ -372,8 +409,9 @@
             msg="设备信息获取失败";
             resultMap.put("result",null);
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgDeviceDtoList);
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java
index 421d249..f6f167d 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java
@@ -38,17 +38,21 @@
     public Map<String, Object> getDeviceTpeyList()throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgDeviceTypeDto> pgDeviceTypeDtoList=new ArrayList<PgDeviceTypeDto>();
         try {
             pgDeviceTypeDtoList = pgDeviceTypeManager.getAllDeviceType();
             if(pgDeviceTypeDtoList.size()==0)
                 msg="没有找到设备类型信息";
-            else
-                msg="设备类型信息获取成功";
+            else {
+                code="200";
+                msg = "设备类型信息获取成功";
+            }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备类型信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgDeviceTypeDtoList);
         return resultMap;
@@ -66,6 +70,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if (pgDeviceTypeManager.getDeviceTypeByDeType(devType)!=null) {
@@ -79,6 +84,7 @@
 
                 pgDeviceTypeManager.save(pgDeviceType);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
 
@@ -87,10 +93,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
index c276fb3..c789960 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
@@ -44,6 +44,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 
         try {
@@ -62,6 +63,7 @@
                 pgEquipment.setActive(1);
 
                 pgEquipmentManager.save(pgEquipment);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -70,9 +72,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -89,9 +91,10 @@
                                             @FormParam("ownerUnit") String ownerUnit,
                                             @FormParam("enterDate") String enterDate,
                                             @FormParam("curUser") String curUser) {
-        HashMap<String, Object> resultMap = new HashMap<String, Object>();
+        HashMap<String, Object> resultMap = new HashMap<>();
         String msg = "";
         String result = "";
+        String code="0";
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 
         try {
@@ -111,6 +114,7 @@
                 pgEquipment.setEnterDate(sdf.parse(enterDate));
 
                 pgEquipmentManager.save(pgEquipment);
+                code="200";
                 msg="编辑成功";
                 result="true";
             }
@@ -119,9 +123,9 @@
             result = "false";
             msg = "编辑失败";
         }
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -134,16 +138,19 @@
     public Map<String, Object> getEquipment(@FormParam("eqName") String eqName,
                                             @FormParam("eqCode") String eqCode,
                                             @FormParam("eqType") String eqType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        List<PgEquipmentDto> pgEquipmentDtoList=new ArrayList<PgEquipmentDto>();
+        String code="0";
+        List<PgEquipmentDto> pgEquipmentDtoList=new ArrayList<>();
 
         try{
             pgEquipmentDtoList=pgEquipmentManager.getEquipmentDtiList(eqName,eqCode,eqType);
             if(pgEquipmentDtoList==null||pgEquipmentDtoList.size()==0)
                 msg="不存在工器具记录";
-            else
-                msg="维获取成功";
+            else {
+                code = "200";
+                msg = "维获取成功";
+            }
         }
         catch(Exception e)
         {
@@ -166,6 +173,7 @@
         HashMap<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
         String result = "";
+        String code="";
 
         try {
             PgEquipment pgEquipment=pgEquipmentManager.get(Long.valueOf(id));
@@ -178,6 +186,7 @@
             {
                 pgEquipment.setActive(0);
                 pgEquipmentManager.save(pgEquipment);
+                code="200";
                 msg="删除成功";
                 result="true";
             }
@@ -186,6 +195,7 @@
             msg="设备信息获取失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -201,16 +211,19 @@
             throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=new ArrayList<PgDeviceTypeStatisticDto>();
 
         try {
             pgDeviceTypeStatisticDtoList=pgEquipmentManager.getDeviceStatisticByDevType(eqType);
 
+            code="200";
             msg = "获取成功";
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceTypeStatisticDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
index 05a9709..a90fd6c 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
@@ -4,9 +4,9 @@
 import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
 import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
 import com.casic.PgInterface.intelPlan.manager.PgPileAcuManager;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import com.casic.PgInterface.test.PlanData;
 import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.ModelAttribute;
 
 import javax.annotation.Resource;
 import javax.ws.rs.FormParam;
@@ -32,23 +32,25 @@
     public Map<String,Object> getPlanResult(@FormParam("planParamStr") String planParamStr){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
-        //List<PgPlanTask> pgPlanTaskList=pgPlanParams.getPgPlanTaskList();
         List<PgPlanTask> pgPlanTaskList=new PgPlanParams().getPgPlanParamsByString(planParamStr);
         List<PgPlanResultRe> pgPlanResultReList=new ArrayList<>();
 
-        try{
-                pgPlanResultReList=pgPileAcuManager.getPgPlanResultList(pgPlanTaskList);
-                if(pgPlanResultReList==null)
-                    msg="管线智能规划出错";
-                else
-                    msg="管线智能规划完成";
+        try {
+            pgPlanResultReList = pgPileAcuManager.getPgPlanResultList(pgPlanTaskList);
+            if (pgPlanResultReList == null)
+                msg = "管线智能规划出错";
+            else {
+                code="200";
+                msg = "管线智能规划完成";
+            }
         }
         catch(Exception ex){
             msg="智能规划出错";
             ex.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgPlanResultReList);
 
@@ -80,4 +82,30 @@
         return resultMap;
     }
 
+    @POST
+    @Path("getPlanTask")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getACUTask(@FormParam("pileAcuList") String pileAcuList){
+
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        String code="0";
+        List<PgAcuTask> pgAcuTaskList=new ArrayList<>();
+
+        try{
+            pgAcuTaskList=pgPileAcuManager.getACUTask(pileAcuList);
+            code="200";
+            msg="任务获取成功";
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            msg="任务获取失败";
+        }
+        resultMap.put("code",code);
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgAcuTaskList);
+
+        return resultMap;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
index ff85c61..66eec76 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
@@ -55,13 +55,13 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         try {
             PgInPgPerson pgInPgPerson = null;//pgInPgPersonManager.getPersonByUserName(userName);
             int iHostName = pgTagMacManager.getCount("select count(1) from PGTagMac where hostname = ?",assetCode);
-//            int iTagMac = pgTagMacManager.getCount("select count(1) from PGTagMac where tagmac = ?",assetCode.toUpperCase());
             if (0==iHostName)
             {
                 result = "false";
@@ -92,9 +92,8 @@
 
                 pgInPgStatusManager.save(pgInPgStatus);
 
-//                String syResult=pgInPgPersonManager.synchorizedInPgInfo(assetCode,userCode,userName,personType);
+                code="200";
                 result = "true";
-//                msg = "人员注册保存成功"+syResult;
                 msg = "人员注册保存成功";
             }
             else {
@@ -106,6 +105,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -120,6 +120,7 @@
     public Map<String, Object> getInPgPerson() throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<>();
         try {
@@ -127,11 +128,15 @@
             if (pgInPgInfoDtoList == null || pgInPgInfoDtoList.size() == 0)
                 msg = "没有找到入廊人员信息";
             else
+            {
+                code="200";
                 msg = "入廊人员信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "入廊人员信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
         return resultMap;
@@ -146,18 +151,22 @@
     public Map<String, Object> getInPgPersonInPg() throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
 
-        List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<PgInPgInfoDto>();
+        List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<>();
         try {
             pgInPgInfoDtoList = pgInPgPersonManager.getPgInPersonList(1);
             if (pgInPgInfoDtoList == null || pgInPgInfoDtoList.size() == 0)
                 msg = "没有找到入廊人员信息";
-            else
+            else {
+                code="200";
                 msg = "入廊人员信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "入廊人员信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
         return resultMap;
@@ -172,6 +181,7 @@
     public Map<String, Object> getInPgPersonByName(@FormParam("userName") String userName) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
 
         PgInPgPerson pgInPgPerson = null;
         PgInPgPersonDto pgInPgPersonDto=null;
@@ -184,12 +194,13 @@
                 pgInPgPersonDto=new PgInPgPersonDto(pgInPgPerson);
                 pgInPgPersonDtoList.add(pgInPgPersonDto);
                 msg = "人员信息获取成功";
+                code="200";
             }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "人员信息获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgPersonDtoList);
         return resultMap;
@@ -206,6 +217,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             PgInPgPerson pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName);
@@ -221,6 +233,7 @@
                     pgInPgPersonManager.save(pgInPgPerson);
                     result = "true";
                     msg = "编辑成功";
+                    code="200";
                 }
             }
         } catch (Exception e) {
@@ -228,9 +241,9 @@
             msg = "编辑失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -244,10 +257,12 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         int inPgNum=0;
         String msg = "";
+        String code="0";
 
         try{
             inPgNum=pgInPgStatusManager.getInPgNum();
 
+            code="200";
             msg="人员入廊次数获取成功";
         }
         catch(Exception e)
@@ -255,6 +270,7 @@
             e.printStackTrace();
             msg="人员入廊次数获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",inPgNum);
 
@@ -272,18 +288,22 @@
                                                    @FormParam("statisticType") String statisticType) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
 
         List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<PgInPgInfoDto>();
         try {
             pgInPgInfoDtoList = pgInPgPersonManager.getPgInPersonListByTime(startTime, endTime, statisticType);
             if(pgInPgInfoDtoList==null)
                 msg="入廊人员统计信息获取失败";
-            else
-                msg="入廊人员统计信息获取成功";
+            else {
+                code="200";
+                msg = "入廊人员统计信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "入廊人员统计信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
         return resultMap;
@@ -296,6 +316,7 @@
 
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
 
         try {
@@ -304,8 +325,10 @@
                 pgDeviceDtoList=pgDeviceManager.getPgCameraListByPosition("",apCodeStr);
                 if(pgDeviceDtoList==null)
                     msg="不存在关联摄像机";
-                else
-                    msg="关联摄像机获取成功";
+                else {
+                    code="200";
+                    msg = "关联摄像机获取成功";
+                }
             } else {
                 msg="请输入Ap编号";
             }
@@ -315,6 +338,7 @@
             msg="关联摄像机获取成功";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgDeviceDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java
index 507b3fe..b43f077 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java
@@ -34,6 +34,7 @@
 
         String result="";
         String msg="";
+        String code="";
         try{
             PgInPgStatus pgInPgStatus=new PgInPgStatus();
 
@@ -44,6 +45,7 @@
             pgInPgStatusManager.save(pgInPgStatus);
             msg="入廊时间提交成功";
             result="true";
+            code="200";
         }
         catch (Exception e){
             e.printStackTrace();
@@ -51,6 +53,7 @@
             result="false";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -66,6 +69,7 @@
 
         String result="";
         String msg="";
+        String code="0";
         try{
             PgInPgPerson pgInPgPerson=pgInPgPersonManager.getPgInPgPersonByAssetCode(assetCode);
 
@@ -79,6 +83,7 @@
             pgInPgStatusManager.save(pgInPgStatus);
 
             msg="出廊时间提交成功";
+            code="200";
             result="true";
         }
         catch (Exception e){
@@ -87,6 +92,7 @@
             result="false";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
index 9def330..9c0ba1f 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
@@ -33,17 +33,20 @@
                                             @FormParam("existNum") String existNum) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         String result="";
 
         try {
             pgIntelPlanManager.savePgIntelPlan(parName,lineName,maxNum,existNum);
             msg="规划数据保存成功";
+            code="200";
             result="true";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "规划数据保存失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
@@ -55,15 +58,18 @@
     public Map<String, Object> getIntelLineType() throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgIntelPlanTypeDto> pgIntelPlanTypeDtoList=new ArrayList<>();
         try {
             pgIntelPlanTypeDtoList=pgIntelPlanManager.getIntelPlanType();
+            code="200";
             msg="获取排线类型成功";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "获取排线类型失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgIntelPlanTypeDtoList);
         return resultMap;
@@ -76,6 +82,7 @@
                                             @FormParam("partitionStr") String partitionStr) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgIntelPlanDto> pgIntelPlanDtoList = new ArrayList<>();
 
@@ -83,8 +90,10 @@
             pgIntelPlanDtoList = pgIntelPlanManager.getPgIntelPlanListByPartion(lineName, partitionStr);
             if(pgIntelPlanDtoList==null||pgIntelPlanDtoList.size()==0)
                 msg="请输入正确的规划参数";
-            else
-                msg="规划数据获取成功";
+            else {
+                code="200";
+                msg = "规划数据获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "规划数据获取失败";
@@ -103,10 +112,12 @@
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
         String result="";
+        String code="0";
 
         try {
             boolean bl=pgIntelPlanManager.addLineUse(lineName,partitionStr,num);
             if(bl){
+                code="200";
                 msg="排线入廊成功";
                 result="true";
             }
@@ -119,6 +130,7 @@
             msg = "排线入廊失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
@@ -132,6 +144,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
         String result="";
+        String code="0";
 
         try {
             PgIntelPlan pgIntelPlan=pgIntelPlanManager.getPgIntelPlanByParNameAndLine(lineName,parName);
@@ -140,11 +153,13 @@
             pgIntelPlanManager.save(pgIntelPlan);
             msg="规划数据删除成功";
             result="true";
+            code="200";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "规划数据删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java b/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java
index 378af00..9c39523 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java
@@ -1,5 +1,6 @@
 package com.casic.PgInterface.rs;
 
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
 import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
 import com.casic.PgInterface.intelPlan.dto.PgLineHoleDTO;
 import com.casic.PgInterface.intelPlan.manager.PgLineHoleManager;
@@ -27,6 +28,9 @@
     @Resource
     private PgPileAcuManager pgPileAcuManager;
 
+    @Resource
+    private PgRoadManager pgRoadManager;
+
     @POST
     @Path("getPgLineAcuHole")
     @Produces(MediaType.APPLICATION_JSON)
@@ -34,23 +38,32 @@
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
         String result="";
+        String code="0";
         List<PgLineHoleDTO> pgLineHoleDTOList=new ArrayList<>();
 
         try {
             PgPileAcu pgPileAcu=pgPileAcuManager.getPgPileAcuByCode(acuCode);
             if(pgPileAcu==null){
                 msg="不存在分区";
-            }else{
-                pgLineHoleDTOList=pgLineHoleManager.getCurrentHoleByAcu(pgPileAcu.getId());
-                if(pgLineHoleDTOList!=null&&pgLineHoleDTOList.size()!=0)
-                    msg="获取成功";
-                else
-                    msg="未找到入廊数据";
+            }else {
+                pgLineHoleDTOList = pgLineHoleManager.getCurrentHoleByAcu(pgPileAcu.getId());
+                if (pgLineHoleDTOList != null && pgLineHoleDTOList.size() != 0)
+                {
+                    code="200";
+                    msg = "获取成功";
+                }
+                else {
+                    PgLineHoleDTO pgLineHoleDTO=new PgLineHoleDTO();
+                    pgLineHoleDTO.setRoad(pgRoadManager.get(pgPileAcu.getRoadId()).getRoadName());
+                    pgLineHoleDTOList.add(pgLineHoleDTO);
+                    msg = "未找到入廊数据";
+                }
             }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgLineHoleDTOList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgLogRs.java b/src/main/java/com/casic/PgInterface/rs/PgLogRs.java
index 39cff52..30db63b 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgLogRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgLogRs.java
@@ -45,6 +45,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         PgLog pgLog=new PgLog();
         try {
             PgUser pgUser = new PgUser();
@@ -60,14 +61,15 @@
             pgLogManager.save(pgLog);
             result = "true";
             msg = "保存成功";
-
+            code="200";
         } catch (Exception e) {
             result = "false";
             msg = "保存失败";
             e.printStackTrace();
         }
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -83,17 +85,21 @@
             throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgLogDto> pgLogDtoList = new ArrayList<PgLogDto>();
         try {
             pgLogDtoList = pgLogManager.getAllLogs(userName, startTime, endTime);
             if (pgLogDtoList == null || pgLogDtoList.size() == 0)
                 msg = "没有找到日志信息";
-            else
+            else {
+                code="200";
                 msg = "日志信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "日志信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgLogDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java
index 9fd0a5f..37b72f6 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java
@@ -36,19 +36,23 @@
         Map<String,Object> resultMap=new HashMap<>();
 
         String msg = "";
+        String code="0";
         List<PgMaintainType> pgMaintainTypeList=new ArrayList<>();
         try{
             pgMaintainTypeList=pgMaintainTypeManager.getMaintainType();
             if(pgMaintainTypeList!=null&&pgMaintainTypeList.size()!=0)
                 msg="不存在运维类别";
-            else
-                msg="运维类别获取成功";
+            else {
+                code="200";
+                msg = "运维类别获取成功";
+            }
         }
         catch(Exception ex)
         {
             ex.printStackTrace();
             msg="运维类别获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgMaintainTypeList);
 
@@ -65,10 +69,11 @@
         Map<String,Object> resultMap=new HashMap<>();
 
         String msg = "";
+        String code="0";
         List<PgMaintainTypeDto> pgMaintainTypeDtoList=new ArrayList<PgMaintainTypeDto>();
         try{
             pgMaintainTypeDtoList=pgMaintainTypeManager.getMaintainTypeModel(type);
-
+            code="200";
             msg="维护类型获取成功";
         }
         catch(Exception ex)
@@ -77,9 +82,9 @@
             msg="维护类型获取失败";
         }
 
-        resultMap.put("result",pgMaintainTypeDtoList);
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgMaintainTypeDtoList);
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java
index d735cc9..82ffca4 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java
@@ -33,12 +33,16 @@
                                                  @FormParam("endTime") String endTime){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
         List<PgMaintanceRecordHeadDto> pgMaintanceRecordHeadDtoList=new ArrayList<>();
         try{
             pgMaintanceRecordHeadDtoList=pgMaintanceRecordHeadManager.getPgMaintanceRecordHeadLsit(repairMan,startTime,endTime);
             if(pgMaintanceRecordHeadDtoList!=null&&pgMaintanceRecordHeadDtoList.size()!=0)
+            {
+                code="200";
                 msg="维护信息获取成功";
+            }
             else
                 msg="不存在维护信息";
         }
@@ -47,6 +51,7 @@
             msg="巡检信息获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgMaintanceRecordHeadDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java
index effc9df..9f46fc8 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java
@@ -32,12 +32,16 @@
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
         String result="";
+        String code="0";
 
         List<PgMaintanceRecordHeadStatic> pgMaintanceRecordHeadStaticList=new ArrayList<>();
         try{
             pgMaintanceRecordHeadStaticList=pgMaintanceRecordHeadManager.getPgMaintanceRecordHeadStaticLisByTime(startTime,endTime,staticType);
             if(pgMaintanceRecordHeadStaticList!=null&&pgMaintanceRecordHeadStaticList.size()!=0)
+            {
+                code="200";
                 msg="维护统计信息获取成功";
+            }
             else
                 msg="维护统计失败";
         }
@@ -46,7 +50,7 @@
             ex.printStackTrace();
             msg="统计失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgMaintanceRecordHeadStaticList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java b/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java
index 3a67bf3..6a5f4dc 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java
@@ -39,27 +39,31 @@
     @Path("getO2InfoByDevAndDate")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getO2InfoByDevAndDate(@FormParam("assetCode") String assetCode,
-                                                      @FormParam("startDate") String startDate,
-                                                      @FormParam("endDate") String endDate)throws Exception {
+                                                     @FormParam("startDate") String startDate,
+                                                     @FormParam("endDate") String endDate)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgHistoryDataDto> pgHistoryDataDtoList=new ArrayList<>();
 
         try {
             PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
                 msg="设备不存在";
-            else{
-                pgHistoryDataDtoList=pgO2Manager.getAllO2Data(pgDevice, startDate, endDate);
-                if(pgHistoryDataDtoList==null)
-                    msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+            else {
+                pgHistoryDataDtoList = pgO2Manager.getAllO2Data(pgDevice, startDate, endDate);
+                if (pgHistoryDataDtoList == null)
+                    msg = "没有满足要求的数据";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgHistoryDataDtoList);
         return resultMap;
@@ -75,23 +79,27 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         PgO2Dto pgO2Dto=new PgO2Dto(null);
 
         try {
             PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
                 msg="设备不存在";
-            else{
-                pgO2Dto=pgO2Manager.getNewestO2Data(pgDevice);
-                if(pgO2Dto==null)
-                    msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+            else {
+                pgO2Dto = pgO2Manager.getNewestO2Data(pgDevice);
+                if (pgO2Dto == null)
+                    msg = "没有满足要求的数据";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgO2Dto);
         return resultMap;
@@ -104,11 +112,12 @@
     @Path("addO2Data")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> addO2Data(@FormParam("devCode") String devCode,
-                                          @FormParam("upTime") String upTime,
-                                          @FormParam("o2") String o2)throws Exception {
+                                         @FormParam("upTime") String upTime,
+                                         @FormParam("o2") String o2)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
@@ -125,6 +134,7 @@
                 pgO2.setPgDeviceId(pgDevice);
 
                 pgO2Manager.save(pgO2);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -133,9 +143,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java b/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java
index 6217cde..70b3b41 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java
@@ -30,8 +30,6 @@
 public class PgOverViewRs {
 
     @Resource
-    private PgInPgPersonManager pgInPgPersonManager;
-    @Resource
     private PgInPgStatusManager pgInPgStatusManager;
     @Resource
     private PgAlarmManager pgAlarmManager;
@@ -46,18 +44,21 @@
     @Path("getPersonNumInPgByMonth")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<Object, String> getMonthInPgPersonNum() throws Exception {
-        Map<Object, String> resultMap = new HashMap<Object, String>();
+        Map<Object, String> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         int inNum = 0;
 
         try {
             inNum = pgInPgStatusManager.getMonthInPgPersonNum();
+            code="200";
             msg = "本月入廊人员次数获取成功";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "本月入廊人员次数获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", String.valueOf(inNum));
 
@@ -73,15 +74,18 @@
     public Map<Object, String> getWeekInPgPersonNum() throws Exception {
         Map<Object, String> resultMap = new HashMap<Object, String>();
         String msg = "";
+        String code="0";
         int inNum = 0;
         try {
             inNum = pgInPgStatusManager.getWeekInPgPersonNum();
+            code="200";
             msg = "本周入廊人员次数获取成功";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "本周入廊人员次数获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", String.valueOf(inNum));
 
@@ -97,19 +101,22 @@
     public Map<String, Object> getDayInPgStatistic() throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<>();
         try {
             pgInPgInfoDtoList = pgInPgStatusManager.getPgInPersonListByDay();
             if (pgInPgInfoDtoList == null)
                 msg = "信息获取失败";
-            else
+            else {
+                code="200";
                 msg = "信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "信息获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
         return resultMap;
@@ -124,18 +131,23 @@
     public Map<String, Object> getTodayInPgInfo() throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
 
         List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<PgInPgInfoDto>();
         try {
             pgInPgInfoDtoList = pgInPgStatusManager.getTodayInPgInfo();
             if(pgInPgInfoDtoList!=null||pgInPgInfoDtoList.size()!=0)
+            {
+                code="200";
                 msg = "信息获取成功";
+            }
             else
                 msg="当天没有入廊人员信息";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
 
@@ -149,18 +161,22 @@
     public Map<String, Object> getAlarmNum(@FormParam("isDevFault") String isDevFault) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         int num = 0;
 
         try {
             if(isDevFault!=null){
                 num = pgAlarmManager.getAlarmNum(isDevFault);
-                msg = "报警数量获取成功";}
+                msg = "报警数量获取成功";
+                code="200";
+            }
             else
                 msg="请输入统计参数";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警数量统计失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", num);
 
@@ -176,16 +192,18 @@
     public Map<Object, String> getMonthAlarmNum(@FormParam("isDevFault") String isDevFault) throws Exception {
         Map<Object, String> resultMap = new HashMap<Object, String>();
         String msg = "";
+        String code="0";
         int inNum = 0;
 
         try {
-                inNum = pgAlarmManager.getMonthAlarmNum(isDevFault);
-                msg = "报警次数获取成功";
+            inNum = pgAlarmManager.getMonthAlarmNum(isDevFault);
+            code="200";
+            msg = "报警次数获取成功";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警次数获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", String.valueOf(inNum));
 
@@ -201,15 +219,17 @@
     public Map<Object, String> getWeekAlarmNum(@FormParam("isDevFault") String isDevFault) throws Exception {
         Map<Object, String> resultMap = new HashMap<Object, String>();
         String msg = "";
+        String code="0";
         int inNum = 0;
         try {
             inNum = pgAlarmManager.getWeekAlarmNum(isDevFault);
+            code="200";
             msg = "报警次数获取成功";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警次数获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", String.valueOf(inNum));
 
@@ -225,14 +245,17 @@
     public Map<String, Object> getDayAlarmStatistic() throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgAlarmTjDto> pgAlarmTjDtoList = new ArrayList<PgAlarmTjDto>();
         try {
             pgAlarmTjDtoList = pgAlarmManager.getDayAlarmStatistic();
             if (pgAlarmTjDtoList == null)
                 msg = "信息获取失败";
-            else
+            else {
+                code="200";
                 msg = "信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "信息获取失败";
@@ -252,9 +275,11 @@
     public Map<String, Object> getAlarmList(@FormParam("isDevFault") String isDevFault) throws Exception{
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         List<PgAlarmDto> pgAlarmDtoList=new ArrayList<>();
         try{
             pgAlarmDtoList=pgAlarmManager.getAlarmList(isDevFault);
+            code="200";
             msg="信息获取成功";
         }
         catch(Exception e)
@@ -262,6 +287,7 @@
             e.printStackTrace();
             msg="信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAlarmDtoList);
 
@@ -278,17 +304,19 @@
     public Map<String,Object> getConstructionNum() throws Exception{
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgConstructionTypeNumStatisticDto> pgConstructionTypeNumDtoList=new ArrayList<PgConstructionTypeNumStatisticDto>();
         try{
             pgConstructionTypeNumDtoList=pgConstructionManager.getConstructionNum();
             msg="施工数量获取成功";
+            code="200";
         }
         catch(Exception e)
         {
             e.printStackTrace();
             msg="施工数量统计";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionTypeNumDtoList);
 
@@ -302,21 +330,25 @@
     @Path("getConstructionToday")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> getConstructionToday() throws Exception{
-        Map<String,Object > resultMap = new HashMap<String,Object>();
+        Map<String,Object > resultMap = new HashMap<>();
         String msg = "";
-        List<PgConstructionDto> pgConstructionDtoList=new ArrayList<PgConstructionDto>();
+        String code="0";
+        List<PgConstructionDto> pgConstructionDtoList=new ArrayList<>();
         try {
             pgConstructionDtoList = pgConstructionManager.getConstructionToday();
-            if (pgConstructionDtoList == null&&pgConstructionDtoList.size()==0)
+            if (pgConstructionDtoList == null && pgConstructionDtoList.size() == 0)
                 msg = "不存在施工信息";
-            else
+            else {
+                code="200";
                 msg = "施工信息获取成功";
+            }
         }
         catch(Exception e)
         {
             e.printStackTrace();
             msg="施工信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java b/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java
index d3c10d4..31ffcfc 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java
@@ -48,6 +48,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 
         try {
@@ -66,9 +67,9 @@
                 pgPartition.setMaterial(material);
                 pgPartition.setActive(1);
 
-                logger.info("成功保存");
                 pgPartitionManager.save(pgPartition);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
         } catch (Exception e) {
@@ -76,9 +77,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
         return resultMap;
     }
     /*
@@ -100,6 +101,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         PgPartition partition = new PgPartition();
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
@@ -122,6 +124,7 @@
 
                 pgPartitionManager.save(pgPartition);
                 result = "true";
+                code="200";
                 msg = "编辑成功";
             }
 
@@ -131,8 +134,10 @@
             e.printStackTrace();
         }
 
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
+
         return resultMap;
     }
 
@@ -147,7 +152,8 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
-        String result="false";
+        String result="";
+        String code="0";
 
         try {
             PgPartition pgPartition=pgPartitionManager.get(Long.valueOf(id));
@@ -161,12 +167,14 @@
                 pgPartitionManager.save(pgPartition);
                 msg="分区删除成功";
                 result="true";
+                code="200";
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="分区删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -181,14 +189,17 @@
     public Map<String, Object> getPartition() throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgPartitionDto> pgPartitionDtoList = new ArrayList<PgPartitionDto>();
         try {
             pgPartitionDtoList = pgPartitionManager.getPgPartitionDtoList();
+            code="200";
             msg = "获取成功";
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgPartitionDtoList);
         return resultMap;
@@ -203,14 +214,17 @@
     public Map<String, Object> getPartitionListByName(@FormParam("parName") String parName) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgPartitionDto> pgPartitionDtoList = new ArrayList<PgPartitionDto>();
         try {
             pgPartitionDtoList = pgPartitionManager.getPartitionByName(parName);
+            code="200";
             msg = "获取成功";
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgPartitionDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java b/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java
index 883adf9..cf81b72 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java
@@ -37,6 +37,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
         PgRoad pgRoad=pgRoadManager.getPgRoadByName(road);
         try {
             PgPileAcu pgPileAcu=new PgPileAcu();
@@ -49,6 +50,7 @@
             pgPileAcu.setActive(true);
 
             pgPileAcuManager.save(pgPileAcu);
+            code="200";
             result="true";
             msg="保存成功";
         } catch (Exception e) {
@@ -56,9 +58,10 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
+
         return resultMap;
     }
 
@@ -73,6 +76,7 @@
 
         String result="";
         String msg="";
+        String code="0";
         try{
             PgPileAcu pgPileAcu=pgPileAcuManager.get(id);
             if(pgPileAcu==null){
@@ -83,7 +87,7 @@
             {
                 pgPileAcu.setActive(false);
                 pgPileAcuManager.save(pgPileAcu);
-
+                code="200";
                 result="true";
                 msg="桩号删除成功";
             }
@@ -94,8 +98,9 @@
             ex.printStackTrace();
         }
 
-        resultMap.put("result",result);
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
+        resultMap.put("result",result);
 
         return resultMap;
     }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPileRs.java b/src/main/java/com/casic/PgInterface/rs/PgPileRs.java
index cf62954..c9999ac 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgPileRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgPileRs.java
@@ -33,6 +33,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             PgPile pgPile=new PgPile();
@@ -40,6 +41,7 @@
             pgPile.setActive(true);
 
             pgPileManager.save(pgPile);
+            code="200";
             result="true";
             msg="保存成功";
         } catch (Exception e) {
@@ -47,9 +49,10 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
+
         return resultMap;
     }
 
@@ -64,9 +67,10 @@
         Map<String,Object> resultMap=new HashMap<>();
         List<PgPileDTO> pgPileDTOList=new ArrayList<>();
         String msg="";
+        String code="0";
         try{
             pgPileDTOList=pgPileManager.getPgPileDTOList();
-
+            code="200";
             msg="获取成功";
         }
         catch(Exception ex){
@@ -74,8 +78,9 @@
             msg="获取成失败";
             ex.printStackTrace();
         }
-        resultMap.put("result",pgPileDTOList);
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
+        resultMap.put("result",pgPileDTOList);
 
         return resultMap;
     }
@@ -91,6 +96,7 @@
 
         String result="";
         String msg="";
+        String code="0";
         try{
             PgPile pgPile=pgPileManager.get(id);
             if(pgPile==null){
@@ -101,7 +107,7 @@
             {
                 pgPile.setActive(false);
                 pgPileManager.save(pgPile);
-
+                code="200";
                 result="true";
                 msg="桩号删除成功";
             }
@@ -111,9 +117,9 @@
             msg="桩号删除失败";
             ex.printStackTrace();
         }
-
-        resultMap.put("result",result);
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
+        resultMap.put("result",result);
 
         return resultMap;
     }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
index 6ee63ff..63b5597 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
@@ -53,10 +53,12 @@
         try {
                resultMap = pgPipeLineManager.addPipeLine(lineCode,lineType,secRow,secColumn,pileAcuList);
                resultMap.put("msg","提交成功");
+               resultMap.put("code","200");
                resultMap.put("result","true");
 
         } catch (Exception e) {
             e.printStackTrace();
+            resultMap.put("code","0");
             resultMap.put("result","false");
             resultMap.put("msg","提交失败");
             return  resultMap;
@@ -74,14 +76,17 @@
     public Map<String, Object> getPipeLineByLineType(@FormParam("lineType") String lineType) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgPipeLineDto> pgPipeLineDtoList=new ArrayList<PgPipeLineDto>();
         try {
             pgPipeLineDtoList = pgPipeLineManager.getPipeLineByLineType(lineType);
+            code="200";
             msg = "获取成功";
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgPipeLineDtoList);
         return resultMap;
@@ -96,6 +101,7 @@
     public Map<String, Object> getPipeLineByName(@FormParam("lineCode") String lineCode) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         PgPipeLineDto pgPipeLineDto=null;
         try {
             PgPipeLine pgPipeLine = pgPipeLineManager.getPipeLineBylineName(lineCode);
@@ -103,12 +109,14 @@
                 msg="不存在："+lineCode;
             else {
                 pgPipeLineDto = new PgPipeLineDto(pgPipeLine);
+                code="200";
                 msg = "获取成功";
             }
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgPipeLineDto);
         return resultMap;
@@ -123,15 +131,18 @@
     public Map<String,Object> getPipeLengthStatic()throws Exception{
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         List<PgPipeLineLengthStatic> pgPipeLineLengthStaticList=new ArrayList<PgPipeLineLengthStatic>();
         try {
             pgPipeLineLengthStaticList = pgPipeLineManager.getPipeLengthByName();
+            code="200";
             msg="管线长度获取成功";
         }catch(Exception e)
         {
             e.printStackTrace();
             msg="管线长度统计失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgPipeLineLengthStaticList);
 
@@ -147,14 +158,17 @@
     public Map<String, Object> getPipeLineType() throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgPipeLineTypeDto> pgPipeLineTypeDtoList=new ArrayList<PgPipeLineTypeDto>();
         try {
             pgPipeLineTypeDtoList = pgPipeLineManager.getPipeType();
+            code="200";
             msg = "获取成功";
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgPipeLineTypeDtoList);
         return resultMap;
@@ -170,20 +184,24 @@
         Map<String,Object> resultMap=new HashMap<String, Object>();
 
         String msg="";
+        String code="0";
         List<PgPipeLineTypeNumDto> pgPipeLineTypeNumDtoList=new ArrayList<PgPipeLineTypeNumDto>();
 
-        try{
-            pgPipeLineTypeNumDtoList=pgPipeLineManager.getPipeTypeNum();
+        try {
+            pgPipeLineTypeNumDtoList = pgPipeLineManager.getPipeTypeNum();
 
-            if(pgPipeLineTypeNumDtoList==null)
-                msg="不存在管线类型占比";
-            else
-                msg="管线占比获取成功";
+            if (pgPipeLineTypeNumDtoList == null)
+                msg = "不存在管线类型占比";
+            else {
+                code="200";
+                msg = "管线占比获取成功";
+            }
         }
         catch (Exception e){
             msg="管线占比数量获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgPipeLineTypeNumDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java
index 672b376..7042994 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java
@@ -43,17 +43,21 @@
     public Map<String,Object> getReservePlan() {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgReservePlanDto> pgReservePlanDtoList = new ArrayList<PgReservePlanDto>();
         try {
             pgReservePlanDtoList = pgReservePlanManager.getPgReservePlanDto();
             if (pgReservePlanDtoList == null)
                 msg = "不存在预案信息";
-            else
+            else {
+                code="200";
                 msg = "预案信息获取成功";
-        } catch (Exception e) {
+            }
+        }catch (Exception e) {
             e.printStackTrace();
             msg = "预案信息获取是失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgReservePlanDtoList);
         return resultMap;
@@ -66,6 +70,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
 
         String msg = "";
+        String code="0";
         ResponseEntity<byte[]> path = null;
         try {
             PgReservePlan pgReservePlan = pgReservePlanManager.get(Long.valueOf(id));
@@ -73,15 +78,17 @@
 
             if (path == null)
                 msg = "不存在该文档";
-            else
+            else {
+                code="200";
                 msg = "下载成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "下载失败";
         }
-
-        resultMap.put("result", path.getBody());
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", path.getBody());
         return resultMap;
     }
     /*
@@ -99,6 +106,7 @@
         Map<String,Object> resultMap=new HashMap<String, Object>();
         String msg="";
         String result="";
+        String code="0";
 
         try {
             PgReservePlan pgReservePlan = new PgReservePlan();
@@ -124,6 +132,7 @@
                 pgReservePlanManager.save(pgReservePlan);
                 msg = "新增成功";
                 result = "true";
+                code="200";
             }
         }
         catch(Exception e)
@@ -133,6 +142,7 @@
             result="false";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -152,6 +162,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             PgReservePlan pgReservePlan=pgReservePlanManager.get(Long.valueOf(id));
@@ -177,6 +188,7 @@
 
                     pgReservePlanManager.save(pgReservePlan);
 
+                    code="200";
                     result = "true";
                     msg = "编辑成功";
                 }
@@ -187,6 +199,7 @@
             msg = "编辑失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -201,6 +214,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
         String result="";
+        String code="0";
 
         try{
 
@@ -214,6 +228,7 @@
                 pgReservePlan.setActive(0);;
                 pgReservePlanManager.save(pgReservePlan);
                 result="true";
+                code="200";
                 msg="删除成功";
             }
         }
@@ -224,6 +239,7 @@
             result="false";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java b/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java
index 8f049c8..3c48a8d 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java
@@ -42,19 +42,22 @@
         Map<String,Object> resultMap=new HashMap<String, Object>();
 
         String msg="";
+        String code="0";
         List<PgRoadDto> pgRoadDtoList=new ArrayList<PgRoadDto>();
-        try{
+        try {
             pgRoadDtoList = pgRoadManager.getAllRoad();
             if (pgRoadDtoList.size() == 0)
                 msg = "没有道路信息";
-            else
+            else {
+                code="200";
                 msg = "道路信息获取成功";
+            }
         }
         catch(Exception e){
             msg="道路信息获取失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgRoadDtoList);
 
@@ -71,6 +74,7 @@
         Map<String,Object> resultMap=new HashMap<String, Object>();
         String msg="";
         String result="";
+        String code="0";
 
         try{
             PgRoad pgRoad=new PgRoad();
@@ -78,7 +82,7 @@
             pgRoad.setActive(1);
 
             pgRoadManager.save(pgRoad);
-
+            code="200";
             msg="新增道路成功";
             result="true";
         }
@@ -87,7 +91,7 @@
             result="true";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -107,6 +111,7 @@
 
         String msg="";
         String result="";
+        String code="0";
 
         try {
             PgRoad pgRoad=pgRoadManager.get(Long.valueOf(id));
@@ -123,6 +128,7 @@
                 pgRoadManager.save(pgRoad);
                 msg="道路信息保存成功";
                 result="true";
+                code="200";
             }
         }
         catch(Exception e){
@@ -130,6 +136,7 @@
             result="false";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -147,6 +154,7 @@
 
         String msg="";
         String result="";
+        String code="0";
         PgRoad pgRoad=null;
 
         try{
@@ -159,6 +167,7 @@
                 pgRoad.setActive(0);
                 pgRoadManager.save(pgRoad);
                 msg="道路删除成功";
+                code="200";
                 result="true";
             }
         }
@@ -168,6 +177,7 @@
             e.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -184,26 +194,29 @@
         Map<String,Object> resultMap=new HashMap<String, Object>();
         String msg="";
         String result="";
+        String code="0";
 
         List<PgPartitionDto> pgPartitionDtoList=null;
         try{
             PgRoad pgRoad=pgRoadManager.getPgRoadByName(roadName);
             if(pgRoad==null)
                 msg="不存在道路信息";
-            else
-            {
-                pgPartitionDtoList=pgPartitionManager.getPgPartitonDtoByRoad(pgRoad);
-                if(pgPartitionDtoList==null||pgPartitionDtoList.size()==0)
-                    msg="该道路没有分区信息";
-                else
-                    msg="分区信息获取成功";
+            else {
+                pgPartitionDtoList = pgPartitionManager.getPgPartitonDtoByRoad(pgRoad);
+                if (pgPartitionDtoList == null || pgPartitionDtoList.size() == 0)
+                    msg = "该道路没有分区信息";
+                else {
+                    code="200";
+                    msg = "分区信息获取成功";
+                }
             }
         }
         catch (Exception e)
         {
+            e.printStackTrace();
             msg="分区信息获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgPartitionDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java b/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java
index 90d709a..7a713bf 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java
@@ -42,17 +42,21 @@
     public Map<String,Object> getRoleList() {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgRoleDto> pgRoleDtoList = new ArrayList<PgRoleDto>();
         try {
             pgRoleDtoList = pgRoleManager.getPgRoleDtoList();
             if (pgRoleDtoList == null)
                 msg = "不存在角色信息";
-            else
+            else {
+                code="200";
                 msg = "角色信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "角色信息获取是失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgRoleDtoList);
         return resultMap;
@@ -69,6 +73,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try{
             PgAuthority pgAuthority=pgAuthorityManager.getAuthorityByAuthority(authority);
@@ -79,6 +84,7 @@
 
             pgRoleManager.save(pgRole);
             msg="用户角色保存成功";
+            code="200";
             result="true";
         }
         catch(Exception e) {
@@ -86,6 +92,7 @@
             msg = "新增角色失败";
             result = "false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -104,6 +111,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         try {
             PgRole pgRole = pgRoleManager.get(Long.valueOf(id));
 
@@ -112,6 +120,7 @@
             pgRole.setPgAuthorityId(pgAuthority);
             pgRoleManager.save(pgRole);
 
+            code="200";
             msg="角色保存成功";
             result="true";
         }
@@ -122,6 +131,7 @@
             result="false";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -138,7 +148,8 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
-        String result="false";
+        String result="";
+        String code="0";
 
         try {
             PgRole pgRole= pgRoleManager.get(Long.valueOf(id));
@@ -152,12 +163,14 @@
                 pgRoleManager.save(pgRole);
                 msg="删除角色成功";
                 result="true";
+                code="200";
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="删除角色失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java b/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java
index 0e413b8..d146811 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java
@@ -38,6 +38,7 @@
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
         String result="";
+        String code="0";
         PgRoad pgRoad=pgRoadManager.getPgRoadByName(road);
 
         try{
@@ -55,13 +56,14 @@
             pgSectionManager.save(pgSection);
             msg="截面信息保存成功";
             result="true";
+            code="200";
         }
         catch(Exception ex){
             msg="界面信息保存失败";
             result="false";
             ex.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -77,6 +79,7 @@
 
         String msg="";
         String result="";
+        String code="0";
 
         try{
             PgSection pgSection=pgSectionManager.get(id);
@@ -84,6 +87,7 @@
             pgSection.setActive(false);
             pgSectionManager.save(pgSection);
 
+            code="200";
             msg="截面删除成功";
             result="true";
         }
@@ -92,7 +96,7 @@
             result="false";
             ex.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -107,16 +111,19 @@
         Map<String,Object> resultMap=new HashMap<>();
         List<PgLineType> pgLineTypeList=new ArrayList<>();
         String msg="";
+        String code="0";
 
         try{
             pgLineTypeList=pgSectionManager.getLineType();
             msg="获取成功";
+            code="200";
         }
         catch(Exception ex){
             ex.printStackTrace();
             msg="获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgLineTypeList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgShRs.java b/src/main/java/com/casic/PgInterface/rs/PgShRs.java
index 1e35f4b..323c82f 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgShRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgShRs.java
@@ -45,23 +45,27 @@
                                                      @FormParam("endDate") String endDate)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgHistoryDataDto> pgHistoryDataDtoList=new ArrayList<>();
 
         try {
             PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
                 msg="设备不存在";
-            else{
-                pgHistoryDataDtoList=pgShManager.getAllShData(pgDevice, startDate, endDate);
-                if(pgHistoryDataDtoList==null)
-                    msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+            else {
+                pgHistoryDataDtoList = pgShManager.getAllShData(pgDevice, startDate, endDate);
+                if (pgHistoryDataDtoList == null)
+                    msg = "没有满足要求的数据";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgHistoryDataDtoList);
         return resultMap;
@@ -77,23 +81,27 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         PgShDto pgShDto=new PgShDto(null);
 
         try {
             PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
                 msg="设备不存在";
-            else{
-                pgShDto=pgShManager.getNewestShData(pgDevice);
-                if(pgShDto==null)
-                    msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+            else {
+                pgShDto = pgShManager.getNewestShData(pgDevice);
+                if (pgShDto == null)
+                    msg = "没有满足要求的数据";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgShDto);
         return resultMap;
@@ -111,6 +119,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
@@ -128,6 +137,7 @@
 
                 pgShManager.save(pgSh);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
         } catch (Exception e) {
@@ -135,9 +145,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java b/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java
index a23b2da..76023a9 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java
@@ -43,23 +43,27 @@
                                                       @FormParam("endDate") String endDate)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgHistoryTempDto> pgHistoryTempDtoList=new ArrayList<>();
 
         try {
             PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
                 msg="设备不存在";
-            else{
-                pgHistoryTempDtoList=pgTempHumManager.getAllTempHumData(pgDevice, startDate, endDate);
-                if(pgHistoryTempDtoList==null)
-                    msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+            else {
+                pgHistoryTempDtoList = pgTempHumManager.getAllTempHumData(pgDevice, startDate, endDate);
+                if (pgHistoryTempDtoList == null)
+                    msg = "没有满足要求的数据";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgHistoryTempDtoList);
         return resultMap;
@@ -75,23 +79,27 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         PgTempHumDto pgTempHumDto=new PgTempHumDto(null);
 
         try {
             PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
                 msg="设备不存在";
-            else{
-                pgTempHumDto=pgTempHumManager.getNewestTempHumData(pgDevice);
-                if(pgTempHumDto==null)
-                    msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+            else {
+                pgTempHumDto = pgTempHumManager.getNewestTempHumData(pgDevice);
+                if (pgTempHumDto == null)
+                    msg = "没有满足要求的数据";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgTempHumDto);
         return resultMap;
@@ -110,6 +118,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         try {
@@ -127,6 +136,7 @@
 
                 pgTempHumManager.save(pgTempHum);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
         } catch (Exception e) {
@@ -135,8 +145,10 @@
             e.printStackTrace();
         }
 
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
+
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgUserRs.java b/src/main/java/com/casic/PgInterface/rs/PgUserRs.java
index 73895f5..ff814a1 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgUserRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgUserRs.java
@@ -42,17 +42,21 @@
     public Map<String, Object> getUserList()throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgUserDto> pgUserDtoList=new ArrayList<PgUserDto>();
         try {
             pgUserDtoList = pgUserManager.getAllUser();
             if(pgUserDtoList.size()==0)
                 msg="没有找到人员信息";
-            else
-                msg="获取成功";
+            else {
+                code="200";
+                msg = "获取成功";
+            }
         }catch(Exception e){
             e.printStackTrace();
             msg="获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgUserDtoList);
         return resultMap;
@@ -74,6 +78,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             PgRole pgRole=pgRoleManager.getPgRoleByRole(role);
@@ -94,10 +99,10 @@
                 else
                     pgUser.setRoleId(pgRole.getId());
                 pgUser.setActive(1);
-                logger.info("成功保存");
 
                 pgUserManager.save(pgUser);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
         } catch (Exception e) {
@@ -106,6 +111,7 @@
             e.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -129,6 +135,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
         try {
 
             PgRole pgRole=pgRoleManager.getPgRoleByRole(role);
@@ -145,8 +152,8 @@
                 pgUser.setRoleId(pgRole.getId());
             pgUserManager.save(pgUser);
             result = "true";
+            code="200";
             msg = "编辑成功";
-            //}
         } catch (Exception e) {
             result = "false";
             msg = "编辑失败";
@@ -166,9 +173,10 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> deleteUser(@FormParam("id") String id)throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
-        String result="false";
+        String result="";
+        String code="0";
 
         try {
             PgUser pgUser= pgUserManager.get(Long.valueOf(id));
@@ -180,6 +188,7 @@
             {
                 pgUser.setActive(0);
                 pgUserManager.save(pgUser);
+                code="200";
                 msg="删除人员成功";
                 result="true";
             }
@@ -188,6 +197,7 @@
             msg="删除人员失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -204,13 +214,14 @@
         Map<String,Object> resultMap=new HashMap<String, Object>();
         String msg="";
         String result="";
-
+        String code="0";
         try{
             PgUserDto pgUserDto=pgUserManager.signIn(userName,passWord);
 
             if(pgUserDto==null)
                 msg="false";
             else {
+                code="200";
                 msg="true";
                 result=pgUserDto.getRole();
             }
@@ -220,6 +231,7 @@
             e.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java b/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java
index 71ad0ae..3998c67 100644
--- a/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java
@@ -45,6 +45,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         PipeGallery pipeGallery = new PipeGallery();
         try {
 
@@ -58,6 +59,7 @@
                 logger.info("成功保存");
                 pipeGalleryManager.save(pipeGallery);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
 
@@ -67,6 +69,7 @@
             e.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -85,6 +88,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         PipeGallery pipeGallery=new PipeGallery();
         try {
@@ -97,12 +101,14 @@
 
             pipeGalleryManager.save(pipeGallery);
             result = "true";
+            code="200";
             msg = "编辑成功";
         } catch (Exception e) {
             result = "false";
             msg = "编辑失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("result",result);
         resultMap.put("msg",msg);
         return resultMap;
@@ -118,7 +124,8 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
-        String result="false";
+        String result="";
+        String code="0";
 
         try {
             PipeGallery pipeGallery=pipeGalleryManager.get(Long.valueOf(id));
@@ -132,12 +139,14 @@
                 pipeGalleryManager.save(pipeGallery);
                 msg="管廊删除成功";
                 result="true";
+                code="200";
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="管廊删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -151,13 +160,15 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> getPgLengthStatic()
     {
-        Map<String,Object> resultMap=new HashMap<String, Object>();
+        Map<String,Object> resultMap=new HashMap<>();
         List<PipeGalleryStatic> pipeGalleryStaticList=new ArrayList<PipeGalleryStatic>();
         String msg="";
+        String code="0";
 
         try{
             pipeGalleryStaticList=pipeGalleryManager.getPgLengthByName();
 
+            code="200";
             msg="仓体长度获取成功";
         }
         catch(Exception e)
@@ -165,7 +176,7 @@
             e.printStackTrace();
             msg="仓体长度获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pipeGalleryStaticList);
 

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 25ded8a..283d7ab 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,20 +7,56 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" 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/construction/manager/PgCsDocumentManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/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/manager/PgAlarmManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/~$说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/~$说明20191207.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.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$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/接口说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明20191207.docx" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
@@ -51,7 +87,7 @@
         <counts>
           <entry key="class" value="4" />
           <entry key="iml" value="2" />
-          <entry key="java" value="707" />
+          <entry key="java" value="820" />
           <entry key="properties" value="14" />
           <entry key="xml" value="7" />
         </counts>
@@ -60,7 +96,7 @@
         <counts>
           <entry key="CLASS" value="4" />
           <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="707" />
+          <entry key="JAVA" value="820" />
           <entry key="Properties" value="14" />
           <entry key="XML" value="7" />
         </counts>
@@ -68,32 +104,32 @@
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
           <entry key="dummy" value="38" />
-          <entry key="java" value="30161" />
+          <entry key="java" value="40859" />
           <entry key="properties" value="100" />
-          <entry key="txt" value="176" />
+          <entry key="txt" value="186" />
           <entry key="xml" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="30161" />
-          <entry key="PLAIN_TEXT" value="214" />
+          <entry key="JAVA" value="40859" />
+          <entry key="PLAIN_TEXT" value="224" />
           <entry key="Properties" value="100" />
           <entry key="XML" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="48" />
+          <entry key="project.closed" value="51" />
           <entry key="project.open.time.1" value="5" />
           <entry key="project.open.time.12" value="2" />
           <entry key="project.open.time.13" value="1" />
           <entry key="project.open.time.15" value="1" />
           <entry key="project.open.time.16" value="1" />
           <entry key="project.open.time.17" value="1" />
-          <entry key="project.open.time.2" value="1" />
+          <entry key="project.open.time.2" value="2" />
           <entry key="project.open.time.20" value="1" />
-          <entry key="project.open.time.23" value="1" />
+          <entry key="project.open.time.23" value="2" />
           <entry key="project.open.time.24" value="2" />
           <entry key="project.open.time.251" value="1" />
           <entry key="project.open.time.27" value="2" />
@@ -106,8 +142,8 @@
           <entry key="project.open.time.36" value="1" />
           <entry key="project.open.time.37" value="1" />
           <entry key="project.open.time.39" value="2" />
-          <entry key="project.open.time.4" value="2" />
-          <entry key="project.open.time.40" value="1" />
+          <entry key="project.open.time.4" value="3" />
+          <entry key="project.open.time.40" value="2" />
           <entry key="project.open.time.41" value="2" />
           <entry key="project.open.time.42" value="2" />
           <entry key="project.open.time.43" value="2" />
@@ -122,23 +158,25 @@
           <entry key="project.open.time.6" value="3" />
           <entry key="project.open.time.63" value="2" />
           <entry key="project.open.time.64" value="1" />
+          <entry key="project.open.time.66" value="1" />
           <entry key="project.open.time.71" value="2" />
+          <entry key="project.open.time.74" value="1" />
           <entry key="project.open.time.76" value="1" />
           <entry key="project.open.time.8" value="2" />
           <entry key="project.open.time.9" value="1" />
           <entry key="project.open.time.97" value="1" />
-          <entry key="project.opened" value="78" />
+          <entry key="project.opened" value="84" />
         </counts>
       </usages-collector>
     </session>
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+            <state relative-caret-position="396">
+              <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
               <folding>
                 <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
                 <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -147,73 +185,6 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <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="99">
-              <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-              <folding>
-                <element signature="imports" expanded="true" />
-                <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-1170">
-              <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state>
-              <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
-              <folding>
-                <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-                <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="true">
-        <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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-              <folding>
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-                <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>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <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="352">
-              <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -225,18 +196,9 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>inCriteria</find>
-      <find>getPgPlanResulList</find>
-      <find>getPileAcuListByPileAcuStr</find>
-      <find>distinct</find>
-      <find>order</find>
-      <find>canPlanLine</find>
-      <find>isExistLine</find>
-      <find>getPlanResult</find>
       <find>pgPipeLine</find>
       <find>getPipeLineBylineName</find>
       <find>StringU</find>
-      <find>getAllAlarm</find>
       <find>getAlarmList</find>
       <find>getPgInPersonListByDay</find>
       <find>getDayInPgStatistic</find>
@@ -254,7 +216,16 @@
       <find>getPgContructionByNameOrType</find>
       <find>&quot;&quot;,&quot;&quot;,</find>
       <find>getPgContructionDtoByNameOrType</find>
+      <find>addConstruction</find>
+      <find>getPgLineAcuHole</find>
+      <find>getPlanResult</find>
       <find>getConstruction</find>
+      <find>addPipeLine</find>
+      <find>未找到入廊数据</find>
+      <find>getCurrentHoleByAcu</find>
+      <find>getAllAlarm</find>
+      <find>getPgDeviceDtoListByPartition</find>
+      <find>getPgDeviceByDevType</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -263,57 +234,57 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlan.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileHoleManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/planData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/PlanData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
       </list>
     </option>
   </component>
@@ -359,7 +330,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -421,53 +391,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="dto" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="manager" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -479,29 +402,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="rs" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -516,6 +416,7 @@
         </subPane>
       </pane>
       <pane id="Scope" />
+      <pane id="PackagesPane" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -710,7 +611,13 @@
       <workItem from="1574902733573" duration="1829000" />
       <workItem from="1574998240004" duration="7016000" />
       <workItem from="1575247959683" duration="6997000" />
-      <workItem from="1575704345590" duration="40473000" />
+      <workItem from="1575704345590" duration="69381000" />
+      <workItem from="1575869479666" duration="721000" />
+      <workItem from="1575947104878" duration="6101000" />
+      <workItem from="1576128264436" duration="3347000" />
+      <workItem from="1576208571543" duration="22000" />
+      <workItem from="1576227513917" duration="862000" />
+      <workItem from="1576293721220" duration="18246000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -817,11 +724,18 @@
       <option name="project" value="LOCAL" />
       <updated>1575775489149</updated>
     </task>
-    <option name="localTasksCounter" value="16" />
+    <task id="LOCAL-00016" summary="整改施工信息">
+      <created>1575791780774</created>
+      <option name="number" value="00016" />
+      <option name="presentableId" value="LOCAL-00016" />
+      <option name="project" value="LOCAL" />
+      <updated>1575791780774</updated>
+    </task>
+    <option name="localTasksCounter" value="17" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="452131000" />
+    <option name="totallyTimeSpent" value="510338000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -834,9 +748,8 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
-    <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.24205749" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2647504" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -847,7 +760,7 @@
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.3295082" />
       <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.4819672" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.65737706" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.3295082" />
@@ -939,7 +852,8 @@
     <MESSAGE value="重新设计智能规划部分" />
     <MESSAGE value="完成智能规划对接" />
     <MESSAGE value="修改报警统计" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改报警统计" />
+    <MESSAGE value="整改施工信息" />
+    <option name="LAST_COMMIT_MESSAGE" value="整改施工信息" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -951,16 +865,10 @@
           <option name="timeStamp" value="3" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java</url>
-          <line>69</line>
+          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java</url>
+          <line>40</line>
           <properties />
-          <option name="timeStamp" value="21" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java</url>
-          <line>96</line>
-          <properties />
-          <option name="timeStamp" value="38" />
+          <option name="timeStamp" value="122" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
@@ -970,394 +878,452 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <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="2068">
-          <caret line="154" column="35" selection-start-line="154" selection-start-column="35" selection-end-line="154" selection-end-column="35" />
-        </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="3300">
-          <caret line="297" column="22" selection-start-line="297" selection-start-column="22" selection-end-line="297" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/StringUtils.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
-          <caret line="13" column="48" lean-forward="true" selection-start-line="13" selection-start-column="48" selection-end-line="13" selection-end-column="48" />
+          <caret line="11" column="5" selection-start-line="11" selection-start-column="5" selection-end-line="11" selection-end-column="5" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="78" lean-forward="true" selection-start-line="78" selection-end-line="78" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="616">
-          <caret line="41" column="1" selection-start-line="41" selection-start-column="1" selection-end-line="41" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="110">
-          <caret line="12" column="23" selection-start-line="12" selection-start-column="23" selection-end-line="12" selection-end-column="23" />
+        <state relative-caret-position="516">
+          <caret line="114" column="12" selection-start-line="114" selection-start-column="12" selection-end-line="114" selection-end-column="12" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="164">
-          <caret line="56" lean-forward="true" selection-start-line="56" selection-end-line="56" />
+        <state relative-caret-position="418">
+          <caret line="33" column="44" selection-start-line="33" selection-start-column="44" selection-end-line="33" selection-end-column="44" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="258">
-          <caret line="27" column="12" lean-forward="true" selection-start-line="27" selection-start-column="12" selection-end-line="27" selection-end-column="12" />
+        <state relative-caret-position="132">
+          <caret line="11" column="20" lean-forward="true" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="20" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.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="-12">
-          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        <state relative-caret-position="516">
+          <caret line="142" column="54" selection-start-line="142" selection-start-column="54" selection-end-line="142" selection-end-column="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="858">
-          <caret line="55" column="27" lean-forward="true" selection-start-line="55" selection-start-column="27" selection-end-line="55" selection-end-column="27" />
+        <state relative-caret-position="66">
+          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="58">
+          <caret line="18" column="28" selection-start-line="18" selection-start-column="19" selection-end-line="18" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="305">
+          <caret line="24" column="31" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="714">
+          <caret line="58" column="5" lean-forward="true" selection-start-line="58" selection-start-column="5" selection-end-line="58" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="924">
+          <caret line="134" column="92" selection-start-line="134" selection-start-column="92" selection-end-line="134" selection-end-column="92" />
+          <folding>
+            <element signature="method#linkDevice#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkPartitionCamera#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkReservePlan#0;class#PgAlarmLinkRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1066">
+          <caret line="90" lean-forward="true" selection-start-line="90" selection-end-line="90" />
+          <folding>
+            <element signature="method#getTjResultByAlarmType#0;class#PgAlarmTjRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="946">
+          <caret line="148" column="11" lean-forward="true" selection-start-line="148" selection-start-column="11" selection-end-line="148" selection-end-column="11" />
+          <folding>
+            <element signature="method#getAlarmTypeList#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#addAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#editAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#deleteAlarmType#0;class#PgAlarmTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="208">
+          <caret line="46" column="23" lean-forward="true" selection-start-line="46" selection-start-column="23" selection-end-line="46" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="113" column="9" lean-forward="true" selection-start-line="113" selection-start-column="9" selection-end-line="113" selection-end-column="9" />
+          <folding>
+            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
+            <element signature="method#getNewestCh4InfoByDev#0;class#PgCh4Rs#0" />
+            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="145" column="6" lean-forward="true" selection-start-line="145" selection-start-column="6" selection-end-line="145" selection-end-column="6" />
+          <folding>
+            <element signature="method#addAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#editAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#deleteAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#getAuthorityList#0;class#PgAuthorityRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="58" column="1" lean-forward="true" selection-start-line="58" selection-start-column="1" selection-end-line="58" selection-end-column="1" />
+          <folding>
+            <element signature="method#getPgAssetPlanList#0;class#PgAssetPlanRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="370">
+          <caret line="371" column="66" selection-start-line="371" selection-start-column="66" selection-end-line="371" selection-end-column="66" />
+          <folding>
+            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#searchConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionDev#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="139" column="13" lean-forward="true" selection-start-line="139" selection-start-column="13" selection-end-line="139" selection-end-column="13" />
+          <folding>
+            <element signature="method#getCoInfoByDevAndDate#0;class#PgCoRs#0" />
+            <element signature="method#getNewestCoInfoByDev#0;class#PgCoRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="540">
+          <caret line="223" column="5" lean-forward="true" selection-start-line="223" selection-start-column="5" selection-end-line="223" selection-end-column="5" />
+          <folding>
+            <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="682">
+          <caret line="100" lean-forward="true" selection-start-line="100" selection-end-line="100" />
+          <folding>
+            <element signature="method#getDeviceTpeyList#0;class#PgDeviceTypeRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="377">
+          <caret line="225" column="35" selection-start-line="225" selection-start-column="35" selection-end-line="225" selection-end-column="35" />
+          <folding>
+            <element signature="method#addEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#addEquipment#1;class#PgEquipmentRs#0" />
+            <element signature="method#getEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#deleteEquipment#0;class#PgEquipmentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="406">
+          <caret line="109" lean-forward="true" selection-start-line="109" selection-end-line="109" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="154">
+          <caret line="28" column="19" selection-start-line="28" selection-start-column="19" selection-end-line="28" selection-end-column="19" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="748">
-          <caret line="49" column="5" lean-forward="true" selection-start-line="49" selection-start-column="5" selection-end-line="49" selection-end-column="5" />
+        <state relative-caret-position="296">
+          <caret line="161" column="35" selection-start-line="161" selection-start-column="35" selection-end-line="161" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="384">
+          <caret line="99" column="5" lean-forward="true" selection-start-line="99" selection-start-column="5" selection-end-line="99" selection-end-column="5" />
+        </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="362">
+          <caret line="340" column="35" selection-start-line="340" selection-start-column="35" selection-end-line="340" selection-end-column="35" />
+          <folding>
+            <element signature="method#addInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPersonInPg#0;class#PgInPgPersonRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-606">
+          <caret line="76" column="20" lean-forward="true" selection-start-line="76" selection-start-column="20" selection-end-line="76" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="65" column="35" selection-start-line="65" selection-start-column="35" selection-end-line="65" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="101" column="35" selection-start-line="101" selection-start-column="35" selection-end-line="101" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="84" column="35" selection-start-line="84" selection-start-column="35" selection-end-line="84" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="59" lean-forward="true" selection-start-line="59" selection-end-line="59" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="60" column="1" lean-forward="true" selection-start-line="60" selection-start-column="1" selection-end-line="60" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="145" column="35" selection-start-line="145" selection-start-column="35" selection-end-line="145" selection-end-column="35" />
+        </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="274">
+          <caret line="350" column="35" selection-start-line="350" selection-start-column="35" selection-end-line="350" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="121" column="39" selection-start-line="121" selection-start-column="39" selection-end-line="121" selection-end-column="39" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="28" column="8" lean-forward="true" selection-start-line="28" selection-start-column="8" selection-end-line="28" selection-end-column="8" />
+        <state relative-caret-position="340">
+          <caret line="103" selection-start-line="103" selection-end-line="103" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="226" column="35" selection-start-line="226" selection-start-column="35" selection-end-line="226" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="203" column="35" selection-start-line="203" selection-start-column="35" selection-end-line="203" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="241" column="35" selection-start-line="241" selection-start-column="35" selection-end-line="241" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="225" column="1" lean-forward="true" selection-start-line="225" selection-start-column="1" selection-end-line="225" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="176" column="5" lean-forward="true" selection-start-line="176" selection-start-column="5" selection-end-line="176" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="178" column="35" lean-forward="true" selection-start-line="178" selection-start-column="35" selection-end-line="178" selection-end-column="35" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="516">
-          <caret line="94" column="53" selection-start-line="94" selection-start-column="53" selection-end-line="94" selection-end-column="53" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="814">
-          <caret line="52" column="9" lean-forward="true" selection-start-line="52" selection-start-column="9" selection-end-line="52" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="182">
-          <caret line="58" column="12" lean-forward="true" selection-start-line="58" selection-start-column="12" selection-end-line="58" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="34" lean-forward="true" selection-start-line="34" selection-end-line="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="32" lean-forward="true" selection-start-line="32" selection-end-line="32" />
-          <folding>
-            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
-            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="185">
-          <caret line="63" column="13" selection-start-line="63" selection-start-column="13" selection-end-line="63" selection-end-column="13" />
-          <folding>
-            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
-            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
-            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="e#6319#6324#0" />
-            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
-          </folding>
+          <caret line="240" lean-forward="true" selection-start-line="240" selection-end-line="240" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
-          <caret line="58" column="28" lean-forward="true" selection-start-line="58" selection-start-column="28" selection-end-line="58" selection-end-column="28" />
-          <folding>
-            <element signature="method#addTempHumData#0;class#PgTempHumRs#0" />
-          </folding>
+        <state relative-caret-position="340">
+          <caret line="148" column="34" selection-start-line="148" selection-start-column="34" selection-end-line="148" selection-end-column="34" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
+        <state relative-caret-position="458">
+          <caret line="99" column="35" selection-start-line="99" selection-start-column="35" selection-end-line="99" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+        <state relative-caret-position="384">
+          <caret line="145" column="32" lean-forward="true" selection-start-line="145" selection-start-column="32" selection-end-line="145" selection-end-column="32" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="414">
-          <caret line="22" column="46" lean-forward="true" selection-start-line="22" selection-start-column="46" selection-end-line="22" selection-end-column="46" />
-        </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="396">
-          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" column="83" selection-start-line="11" selection-start-column="83" selection-end-line="11" selection-end-column="83" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="26">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
-          <folding>
-            <element signature="method#getPgInPgStatusByPerson#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNumByName#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNum#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPersonListByDay#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPgStatusByPgInPgPerson#0;class#PgInPgStatusManager#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="44">
-          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-12">
-          <caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="87" lean-forward="true" selection-start-line="87" selection-end-line="87" />
-          <folding>
-            <element signature="method#getConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#addConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#deleteConstructionType#0;class#PgConstructionTypeRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
-          <folding>
-            <element signature="method#getConstructionTypeByType#0;class#PgConstructionTypeManager#0" />
-            <element signature="method#getAllConstructionTypeDto#0;class#PgConstructionTypeManager#0" />
-          </folding>
-        </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="145">
-          <caret line="258" column="9" lean-forward="true" selection-start-line="258" selection-start-column="9" selection-end-line="258" selection-end-column="9" />
-          <folding>
-            <element signature="method#getMonthInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayInPgStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgOverViewRs#0" />
-            <element signature="method#getAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getMonthAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayAlarmStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgOverViewRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="103">
-          <caret line="105" column="50" lean-forward="true" selection-start-line="105" selection-start-column="50" selection-end-line="105" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateBasicDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="99">
-          <caret line="125" selection-start-line="125" selection-end-line="125" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="190">
-          <caret line="24" column="35" lean-forward="true" selection-start-line="24" selection-start-column="35" selection-end-line="24" selection-end-column="35" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="436">
-          <caret line="24" lean-forward="true" selection-start-line="24" selection-end-line="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" lean-forward="true" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="300">
-          <caret line="34" column="31" lean-forward="true" selection-start-line="34" selection-start-column="31" selection-end-line="34" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="42" column="13" lean-forward="true" selection-start-line="42" selection-start-column="13" selection-end-line="42" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="120" column="72" lean-forward="true" selection-start-line="120" selection-start-column="72" selection-end-line="120" selection-end-column="72" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="293">
-          <caret line="58" column="73" lean-forward="true" selection-start-line="58" selection-start-column="73" selection-end-line="58" selection-end-column="73" />
-          <folding>
-            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
-            <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
-          </folding>
-        </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="307">
-          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
+        <state relative-caret-position="758">
+          <caret line="130" column="5" lean-forward="true" selection-start-line="130" selection-start-column="5" selection-end-line="130" selection-end-column="5" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1170">
-          <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
+        <state relative-caret-position="494">
+          <caret line="86" column="62" lean-forward="true" selection-start-line="86" selection-start-column="62" selection-end-line="86" selection-end-column="62" />
           <folding>
-            <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-            <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+            <element signature="method#getAllDevice#0;class#PgDeviceManager#0" />
+            <element signature="method#getAllDev#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="195" column="28" lean-forward="true" selection-start-line="195" selection-start-column="28" selection-end-line="195" selection-end-column="28" />
+        <state relative-caret-position="166">
+          <caret line="174" column="13" lean-forward="true" selection-start-line="174" selection-start-column="13" selection-end-line="174" selection-end-column="13" />
           <folding>
-            <element signature="method#getAlarmByTypeAndTime#0;class#PgAlarmManager#0" />
-            <element signature="method#getAlarmNum#0;class#PgAlarmManager#0" />
             <element signature="method#getDayAlarmStatistic#0;class#PgAlarmManager#0" />
+            <element signature="method#getAlarmList#0;class#PgAlarmManager#0" />
             <element signature="method#createDTO#0;class#PgAlarmManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="364">
+          <caret line="46" column="56" lean-forward="true" selection-start-line="46" selection-start-column="56" selection-end-line="46" selection-end-column="56" />
+          <folding>
+            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
+            <element signature="method#getPgDev#0;class#PgDeviceRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
+            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+        <state relative-caret-position="396">
+          <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
           <folding>
             <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
             <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -1365,52 +1331,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="239">
-          <caret line="21" column="33" lean-forward="true" selection-start-line="21" selection-start-column="33" selection-end-line="21" selection-end-column="33" />
-        </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="352">
-          <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-        </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="99">
-          <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-          </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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-          <folding>
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-            <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>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
index c436c93..e913155 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
@@ -132,7 +132,10 @@
             this.setAlarmType("");
         else
             this.setAlarmType(pgAlarm.getAlarmTypeId().getAlarmType());
-        this.setAlarmValue(pgAlarm.getAlarmValue());
+        if(pgAlarm.getAlarmValue()==null)
+            this.setAlarmValue("");
+        else
+            this.setAlarmValue(pgAlarm.getAlarmValue());
         if (pgAlarm.getAlarmDate() != null)
             this.setAlarmDate(sdf.format(pgAlarm.getAlarmDate()));
         else
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
index a43965c..565cb41 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -159,11 +159,21 @@
     }
 
     //获取历史报警消息列表
-    public List<PgAlarmDto> getAllAlarm(String alarmType,String startDay,String endDay,String isNew,int page,int rows) {
-        try {
+    public  Map<String, Object> getAllAlarm(String alarmType,String partition,String startDay,String endDay,String isNew,int page,int rows) {
 
+        Map<String, Object> resultMap = new HashMap<>();
+        String msg="";
+
+        try {
             Criteria criteria = createCriteria(PgAlarm.class);
 
+            if (StringUtils.isNotBlank(partition)) {
+                DetachedCriteria inCriteria = DetachedCriteria.forClass(PgDevice.class);
+                inCriteria.add(Restrictions.eq("partition", partition));
+                inCriteria.setProjection(Property.forName("id"));
+                criteria.add(Property.forName("alarmDevId").in(inCriteria));
+            }
+
             if (StringUtils.isNotBlank(alarmType)&&!alarmType.contains("全部")&&pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
                 criteria.add(Restrictions.eq("alarmTypeId", pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)));
 
@@ -190,8 +200,16 @@
             for (PgAlarm pgAlarm : pgAlarmList) {
                 pgAlarmDtoList.add(new PgAlarmDto(pgAlarm));
             }
-
-            return pgAlarmDtoList;
+            if(pgAlarmDtoList==null||pgAlarmDtoList.size()==0) {
+                resultMap.put("msg", "没有报警信息");
+                resultMap.put("code","0");
+            }else {
+                resultMap.put("code","200");
+                resultMap.put("msg", "报警信息获取成功");
+            }
+            resultMap.put("count",pg.getTotalCount());
+            resultMap.put("result",pgAlarmDtoList);
+            return resultMap;
         }
         catch(Exception ex){
             ex.printStackTrace();
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index 7547560..654f49e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -24,11 +24,11 @@
 
         Criteria criteria = createCriteria(PgDevice.class);
 
-        if(road!=null)
+        if(StringUtils.isNotBlank(road))
             criteria.add(Restrictions.eq("road",road));
-        if(partition!=null)
+        if(StringUtils.isNotBlank(partition))
             criteria.add(Restrictions.eq("partition",partition));
-        if(devType!=null)
+        if(StringUtils.isNotBlank(devType))
             criteria.add(Restrictions.eq("devType",devType));
 
         criteria.add(Restrictions.eq("active", 1));
@@ -43,6 +43,29 @@
         return pgDeviceDtoList;
     }
 
+    public List<PgDeviceDto> getAllDev(String road,String partition,String devType) {
+
+        Criteria criteria = createCriteria(PgDevice.class);
+
+        if(StringUtils.isNotBlank(road))
+            criteria.add(Restrictions.eq("road",road));
+        if(StringUtils.isNotBlank(partition))
+            criteria.add(Restrictions.eq("partition",partition));
+        if(StringUtils.isNotBlank(devType))
+            criteria.add(Restrictions.like("devType","%"+devType+"%"));
+
+        criteria.add(Restrictions.eq("active", 1));
+        criteria.addOrder(Order.desc("id"));
+        List<PgDevice> pgDeviceList = criteria.list();
+
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
+        for (PgDevice pgDevice : pgDeviceList) {
+            pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
+        }
+
+        return pgDeviceDtoList;
+    }
+
     //根据名字获取当前设备
     public PgDevice getDeviceByAssetCode(String assetCode) {
         Criteria criteria=createCriteria(PgDevice.class);
@@ -56,9 +79,9 @@
     }
 
     //根据类型获取设备列表
-    public List<PgDeviceDto> getDeviceByDevTypee(String devType) {
+    public List<PgDeviceDto> getDeviceByDevType(String devType) {
         Criteria criteria=createCriteria(PgDevice.class);
-        criteria.add(Restrictions.eq("devType",devType));
+        criteria.add(Restrictions.like("devType","%"+devType+"%"));
 
         List<PgDevice> pgDeviceList=criteria.list();
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
@@ -106,7 +129,7 @@
         criteria.add(Restrictions.eq("partition",partition));
 
         List<PgDevice> pgDeviceList=criteria.list();
-        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<PgDeviceDto>();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
 
         for (PgDevice pgDevice : pgDeviceList) {
             pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
index 3a3bccd..595730e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
@@ -1,10 +1,13 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.devTable.domain.PgAlarmType;
 import com.casic.PgInterface.devTable.domain.PgPartition;
 import com.casic.PgInterface.devTable.domain.PgRoad;
 import com.casic.PgInterface.devTable.domain.PipeGallery;
 import com.casic.PgInterface.devTable.dto.PgPartitionDto;
+import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
@@ -12,7 +15,9 @@
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Created by yxw on 2017/11/4.
@@ -21,7 +26,8 @@
 public class PgPartitionManager extends HibernateEntityDao<PgPartition> {
 
     @Resource
-    PgRoadManager pgRoadManager;
+    private PgRoadManager pgRoadManager;
+
 
     public PgPartition getPartitionByParName(String parName) {
         Criteria criteria = getSession().createCriteria(PgPartition.class);
@@ -99,4 +105,5 @@
         return pgPartitionDtoList;
     }
 
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
index f216360..a6928f1 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
@@ -5,6 +5,7 @@
 public class PgPlanResultRe {
 
     private String taskKey;
+    private List<String> pileAcuList;
     private List<PgPlanResult> pgPlanResultList;
 
     public String getTaskKey() {
@@ -15,6 +16,14 @@
         this.taskKey = taskKey;
     }
 
+    public List<String> getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(List<String> pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+
     public List<PgPlanResult> getPgPlanResultList() {
         return pgPlanResultList;
     }
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
index 71ea765..47eea07 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
@@ -54,9 +54,7 @@
 
         List<PgLineHole> pgLineHoleList=criteria.list();
         List<PgLineHoleDTO> pgLineHoleDTOList=new ArrayList<>();
-        if(pgLineHoleList==null||pgLineHoleList.size()==0)
-            return null;
-        else
+        if(pgLineHoleList!=null&&pgLineHoleList.size()!=0)
             pgLineHoleDTOList=PgLineHoleDTO.ConvertToDTOList(pgLineHoleList,pgPileAcuManager,pgRoadManager);
         return pgLineHoleDTOList;
     }
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
index 0fd9e1f..841a386 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
@@ -1,12 +1,15 @@
 package com.casic.PgInterface.intelPlan.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.devTable.domain.PgPartition;
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
 import com.casic.PgInterface.intelPlan.domain.PgLineHole;
 import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
 import com.casic.PgInterface.intelPlan.domain.PgSection;
 import com.casic.PgInterface.intelPlan.dto.PgPlanResult;
 import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
 import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -22,6 +25,9 @@
     @Resource
     private PgLineHoleManager pgLineHoleManager;
 
+    @Resource
+    private PgRoadManager pgRoadManager;
+
     public PgPileAcu getPgPileAcuByCode(String acuCode){
         List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
 
@@ -58,7 +64,9 @@
         for(PgPlanTask pgPlanTask:pgPlanTaskList){
             List<PgPlanResult> pgPlanResultList=getPgPlanResultByPlantask(pgPlanTask);
             PgPlanResultRe pgPlanResultRe=new PgPlanResultRe();
+
             pgPlanResultRe.setTaskKey(pgPlanTask.getTaskKey());
+            pgPlanResultRe.setPileAcuList(pgPlanTask.getPileAcuList());
             pgPlanResultRe.setPgPlanResultList(pgPlanResultList);
 
             pgPlanResultReList.add(pgPlanResultRe);
@@ -142,4 +150,57 @@
         return length;
     }
 
+    private PgPileAcu getPgPileAcuByAcuCode(String acuCode){
+        List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
+
+        if(pgPileAcuList==null||pgPileAcuList.size()==0)
+            return null;
+        else
+            return pgPileAcuList.get(0);
+    }
+
+    public List<PgAcuTask> getACUTask(String pileAcuList){
+        String[] acuArray=pileAcuList.split(",");
+        List<PgAcuTask> pgAcuTaskList=new ArrayList<>();
+
+        for(String acu:acuArray){
+            PgPileAcu pgPileAcu=this.getPgPileAcuByCode(acu);
+            String roadName=pgRoadManager.get(pgPileAcu.getRoadId()).getRoadName();
+
+            if(!containRoad(roadName,pgAcuTaskList))
+            {
+                PgAcuTask pgAcuTask=new PgAcuTask();
+                pgAcuTask.setRoadName(roadName);
+                pgAcuTask.setPileAcuList(acu);
+                pgAcuTaskList.add(pgAcuTask);
+            }
+            else{
+                PgAcuTask pgAcuTask=getIndexRoad(roadName,pgAcuTaskList);
+                if(pgAcuTask!=null)
+                    pgAcuTask.setPileAcuList(pgAcuTask.getPileAcuList()+","+acu);
+            }
+        }
+
+        return pgAcuTaskList;
+    }
+
+    private boolean containRoad(String roadName,List<PgAcuTask> pgAcuTaskList){
+        if(pgAcuTaskList==null||pgAcuTaskList.size()==0) return false;
+        for(PgAcuTask pgAcuTask:pgAcuTaskList){
+            if(pgAcuTask.getRoadName().equals(roadName))
+                return true;
+        }
+
+        return false;
+    }
+
+    private PgAcuTask getIndexRoad(String roadName, List<PgAcuTask> pgAcuTaskList){
+        for(PgAcuTask pgAcuTask:pgAcuTaskList){
+            if(pgAcuTask.getRoadName().equals(roadName))
+                return pgAcuTask;
+        }
+
+        return null;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java
new file mode 100644
index 0000000..323f7ef
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java
@@ -0,0 +1,25 @@
+package com.casic.PgInterface.reservePlan.dto;
+
+import java.util.List;
+
+public class PgAcuTask {
+
+    private String roadName;//道路
+    private String pileAcuList;//acu分区
+
+    public String getRoadName() {
+        return roadName;
+    }
+
+    public void setRoadName(String roadName) {
+        this.roadName = roadName;
+    }
+
+    public String getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(String pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
index c25e926..c7d7693 100644
--- a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
@@ -70,9 +70,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(Long.valueOf(inPgPersonId));
         PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("hostName",pgInPgPerson.getAssetCode());
-//        PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode());
-//        long maxId = pgTagPositionManager.getMaxId(pgTagMac.getTagMac());
-//        PGTagPosition pgTagPosition = pgTagPositionManager.get(maxId);
+
         PGTagPosition pgTagPosition = tagmacRun.GetTagStatus(pgTagMac);
         boolean bExist = false;
         bExist = pgTagPositionManager.findTagPosition(pgTagPosition.getPositionUpdatetime(),pgTagPosition.getHostId());
@@ -104,8 +102,7 @@
         PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(Long.valueOf(inPgPersonId));
         PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pgInPgPersonId",pgInPgPerson);
         System.out.println("time:"+pgInPgStatus.getInTime());
-//        PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pgInPgPersonId",inPgPersonId);
-//        PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode());
+
         PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("hostName",pgInPgPerson.getAssetCode());
 
         Map<Object,Object> mapPosition = new HashMap<>();
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
index 082ba5d..3eed00a 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
@@ -48,6 +48,7 @@
     public Map<String, Object> linkDevice(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         PgDeviceDto pgDeviceDto = null;
         try {
@@ -62,6 +63,7 @@
                     else {
                         pgDeviceDto = new PgDeviceDto(pgDevice);
                         msg = "报警关联设备获取成功";
+                        code="200";
                     }
                 }
             }
@@ -71,6 +73,7 @@
             e.printStackTrace();
             msg = "获取关联设备失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceDto);
 
@@ -86,6 +89,7 @@
     public Map<String, Object> linkPartitionCamera(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
         try {
@@ -106,6 +110,7 @@
 
                         pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(partition,position);
                         msg = "关联设备获取成功";
+                        code="200";
                     }
                 }
             }
@@ -115,6 +120,7 @@
             e.printStackTrace();
             msg = "分区设备关联失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceDtoList);
         return resultMap;
@@ -129,6 +135,7 @@
     public Map<String, Object> linkReservePlan(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgReservePlanDto> pgReservePlanDtoList=new ArrayList<>();
         try{
@@ -139,10 +146,12 @@
                 else {
                     pgReservePlanDtoList = pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
 
-                    if(pgReservePlanDtoList==null||pgReservePlanDtoList.size()==0)
-                        msg="不存在关联的报警预案";
-                    else
+                    if (pgReservePlanDtoList == null || pgReservePlanDtoList.size() == 0)
+                        msg = "不存在关联的报警预案";
+                    else {
                         msg = "关联预案获取成功";
+                        code="200";
+                    }
                 }
             }
             else
@@ -153,6 +162,7 @@
             e.printStackTrace();
             msg="预案关联失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgReservePlanDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
index 0ddbc4d..0ce886b 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
@@ -41,25 +41,19 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getAlarmList(@FormParam("alarmType") String alarmType,
                                             @FormParam("startDay") String startDay,
+                                            @FormParam("partition") String partition,
                                             @FormParam("endDay") String endDay,
                                             @FormParam("isNew") String isNew,
                                             @FormParam("page") int page,
                                             @FormParam("rows") int rows) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
         try {
-            pgAlarmDtoList = pgAlarmManager.getAllAlarm(alarmType,startDay,endDay,isNew,page,rows);
-            if (pgAlarmDtoList==null||pgAlarmDtoList.size() == 0)
-                msg = "没有报警信息";
-            else
-                msg = "报警信息获取成功";
+            resultMap = pgAlarmManager.getAllAlarm(alarmType,partition,startDay,endDay,isNew,page,rows);
+
         } catch (Exception e) {
             e.printStackTrace();
-            msg = "报警信息获取失败";
         }
-        resultMap.put("msg", msg);
-        resultMap.put("result", pgAlarmDtoList);
         return resultMap;
     }
 
@@ -71,9 +65,10 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> clearAlarmList(@FormParam("id") String id) throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        String result = "false";
+        String result = "";
+        String code="0";
 
         try {
             PgAlarm pgAlarm = new PgAlarm();
@@ -86,12 +81,14 @@
                 pgAlarmManager.save(pgAlarm);
                 msg = "报警信息清除成功";
                 result = "true";
+                code = "200";
             }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警信息清除失败";
             result = "false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
@@ -106,21 +103,26 @@
     public Map<String, Object> getAlarmByTypeOrTime(@FormParam("alarmType") String alarmType,
                                                     @FormParam("startTime") String startTime,
                                                     @FormParam("endTime") String endTime) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
-        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<PgAlarmDto>();
+        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
         try {
             pgAlarmDtoList = pgAlarmManager.getAlarmByTypeAndTime(alarmType, startTime, endTime);
             if (pgAlarmDtoList == null || pgAlarmDtoList.size() == 0)
                 msg = "报警信息不存在";
             else
+            {
                 msg = "报警信息获取成功";
+                code="200";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警信息获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
index 29ce8a4..ed0bf34 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
@@ -39,8 +39,8 @@
     public Map<String, Object> getAlarmRule(@FormParam("devType") String devType) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
-        System.out.println("devType:"+devType);
         List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<>();
         try {
             pgAlarmRuleDtoList = pgAlarmRuleManager.getAlarmRuleDto(devType);
@@ -52,6 +52,7 @@
             e.printStackTrace();
             msg = "报警阈值信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmRuleDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
index 24ab894..abef1b1 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
@@ -39,16 +39,21 @@
                                                      @FormParam("endDate") String endDate)throws Exception{
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
+
         List<PgAlarmTjDto> pgAlarmTjDtoList=null;
         try{
             pgAlarmTjDtoList=pgAlarmTjManager.getAlarmTjResultByType(startDate,endDate);
             msg="获取成功";
+            code="200";
         }
         catch(Exception ex) {
             msg = "统计失败";
         }
-        resultMap.put("result",pgAlarmTjDtoList);
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
+        resultMap.put("result",pgAlarmTjDtoList);
+
         return resultMap;
     }
 
@@ -61,23 +66,27 @@
     public Map<String, Object> getAlarmByTime(@FormParam("startTime") String startTime,
                                               @FormParam("endTime") String endTime,
                                               @FormParam("statisticType") String statisticType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code = "0";
 
-        List<PgAlarmTjDto> pgAlarmTjDtoList = new ArrayList<PgAlarmTjDto>();
+        List<PgAlarmTjDto> pgAlarmTjDtoList = new ArrayList<>();
         try {
             pgAlarmTjDtoList = pgAlarmTjManager.getAlarmByTime(startTime, endTime, statisticType);
             if(pgAlarmTjDtoList==null)
                 msg="报警统计信息获取失败";
-            else
-                msg="报警统计信息获取成功";
+            else {
+                msg = "报警统计信息获取成功";
+                code="200";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警统计信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmTjDtoList);
         return resultMap;
     }
 
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
index 28bc811..b6278a9 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
@@ -30,7 +30,6 @@
     @Resource
     private PgAlarmTypeManager pgAlarmTypeManager;
 
-
     /**
      * 获取报警类型
      */
@@ -38,19 +37,24 @@
     @Path("getAlarmType")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getAlarmTypeList()throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
-        List<PgAlarmTypeDto> pgAlarmTypeDtoList=new ArrayList<PgAlarmTypeDto>();
+        String code="";
+
+        List<PgAlarmTypeDto> pgAlarmTypeDtoList=new ArrayList<>();
         try {
             pgAlarmTypeDtoList = pgAlarmTypeManager.getAllAlarmTypeDto();
             if(pgAlarmTypeDtoList.size()==0)
                 msg="没有报警类型信息";
-            else
-                msg="报警类型信息获取成功";
+            else {
+                code="200";
+                msg = "报警类型信息获取成功";
+            }
         }catch(Exception e){
             e.printStackTrace();
             msg="报警类型信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAlarmTypeDtoList);
         return resultMap;
@@ -66,6 +70,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
@@ -83,6 +88,7 @@
                 logger.info("成功保存");
                 result = "true";
                 msg = "保存成功";
+                code="200";
             }
         } catch (Exception e) {
             result = "false";
@@ -90,6 +96,7 @@
             e.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -106,6 +113,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try{
             if(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
@@ -119,6 +127,7 @@
                 pgAlarmTypeManager.save(pgAlarmType);
                 result = "true";
                 msg = "编辑成功";
+                code="200";
             }
         }
         catch(Exception e)
@@ -128,6 +137,7 @@
             e.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("result",result);
         resultMap.put("msg",msg);
 
@@ -146,6 +156,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
         String result="false";
+        String code="0";
 
         try {
             PgAlarmType pgAlarmType=pgAlarmTypeManager.get(Long.valueOf(id));
@@ -157,6 +168,7 @@
             {
                 pgAlarmType.setActive(0);
                 pgAlarmTypeManager.save(pgAlarmType);
+                code="200";
                 msg="报警类型删除成功";
                 result="true";
             }
@@ -165,6 +177,7 @@
             msg="报警类型删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
index 4533e1a..85940bb 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
@@ -33,12 +33,15 @@
                                                  @FormParam("inSpectionPlace") String inSpectionPlace){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
         List<PgAssetPlanDto> pgAssetPlanDtoList=new ArrayList<>();
         try{
             pgAssetPlanDtoList=pgAssetPlanManager.getPgAssetPlanDtoList(startDay,endDay,inSpectionPlace);
-            if(pgAssetPlanDtoList!=null&&pgAssetPlanDtoList.size()!=0)
-                msg="巡检信息获取成功";
+            if(pgAssetPlanDtoList!=null&&pgAssetPlanDtoList.size()!=0) {
+                code="200";
+                msg = "巡检信息获取成功";
+            }
             else
                 msg="不存在巡检信息";
         }
@@ -47,6 +50,7 @@
             msg="巡检信息获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAssetPlanDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
index 47ef9d1..5cbdfcb 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
@@ -30,12 +30,15 @@
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
         String result="";
+        String code="0";
 
         List<PgAssetPlanStatic> pgAssetPlanStaticList = null;
         try{
             pgAssetPlanStaticList=pgAssetPlanManager.getPgAssetPlanStaticLisByTime(startTime,endTime,staticType);
-            if(pgAssetPlanStaticList!=null&&pgAssetPlanStaticList.size()!=0)
-                msg="巡检统计信息获取成功";
+            if(pgAssetPlanStaticList!=null&&pgAssetPlanStaticList.size()!=0) {
+                code = "200";
+                msg = "巡检统计信息获取成功";
+            }
             else
                 msg="统计信息获取失败";
         }
@@ -44,6 +47,7 @@
             msg="统计失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAssetPlanStaticList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
index 26f5d6a..503bfe3 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
@@ -40,6 +40,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="";
 
         try{
             PgAuthority pgAuthority=new PgAuthority();
@@ -50,6 +51,7 @@
 
             pgAuthorityManager.save(pgAuthority);
             msg="用户权限保存成功";
+            code="200";
             result="true";
         }
         catch(Exception e) {
@@ -57,6 +59,7 @@
             msg = "新增权限失败";
             result = "false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -65,22 +68,25 @@
 
     /*
        *编辑角权限信息
-        */
+    */
     @POST
     @Path("editAuthority")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> editAuthority(@FormParam("id") String id,
                                        @FormParam("authority") String authority,
                                        @FormParam("concent") String concent) throws Exception{
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
+
         try {
             PgAuthority pgAuthority=pgAuthorityManager.get(Long.valueOf(id));
             pgAuthority.setAuthority(authority);
             pgAuthority.setConcent(concent);
 
             pgAuthorityManager.save(pgAuthority);
+            code="200";
             msg="权限保存成功";
             result="true";
         }
@@ -90,7 +96,7 @@
             msg="权限编辑失败";
             result="false";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -105,9 +111,10 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> deleteAuthority(@FormParam("id") String id)throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
-        String result="false";
+        String result="";
+        String code="0";
 
         try {
             PgAuthority pgAuthority= pgAuthorityManager.get(Long.valueOf(id));
@@ -119,6 +126,7 @@
             {
                 pgAuthority.setActive(0);
                 pgAuthorityManager.save(pgAuthority);
+                code="200";
                 msg="删除权限成功";
                 result="true";
             }
@@ -127,37 +135,40 @@
             msg="删除权限失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
     }
 
     /*
-* 获取权限信息
- */
+    * 获取权限信息
+    */
     @POST
     @Path("getAuthorityList")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> getAuthorityList() {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgAuthorityDto> pgAuthorityDtoList = new ArrayList<PgAuthorityDto>();
         try {
             pgAuthorityDtoList = pgAuthorityManager.getAuthorityList();
             if (pgAuthorityDtoList == null)
                 msg = "不存在权限信息";
-            else
+            else {
+                code = "200";
                 msg = "权限信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "权限信息获取是失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAuthorityDtoList);
         return resultMap;
     }
 
 
-
-
 }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
index a9ef521..a74ecc7 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
@@ -45,6 +45,7 @@
                                                @FormParam("endDate") String endDate)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgHistoryDataDto> pgHistoryDataDtoList=new ArrayList<>();
 
         try {
@@ -55,13 +56,16 @@
                 pgHistoryDataDtoList=pgCh4Manager.getAllCH4Data(pgDevice,startDate,endDate);
                 if(pgHistoryDataDtoList==null)
                     msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+                else {
+                    code = "200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgHistoryDataDtoList);
         return resultMap;
@@ -75,8 +79,9 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getNewestCh4InfoByDev(@FormParam("assetCode") String assetCode)throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
+        String code="0";
         PgCh4Dto pgCh4Dto=new PgCh4Dto(null);
 
         try {
@@ -87,13 +92,17 @@
                 pgCh4Dto=pgCh4Manager.getNewestCH4Data(pgDevice);
                 if(pgCh4Dto==null)
                     msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgCh4Dto);
         return resultMap;
@@ -111,6 +120,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
@@ -127,6 +137,7 @@
                 pgCh4.setPgDeviceId(pgDevice);
 
                 pgCh4Manager.save(pgCh4);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -135,7 +146,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
index a7eac39..dfc8ca5 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
@@ -43,23 +43,27 @@
                                                       @FormParam("endDate") String endDate)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgHistoryDataDto> pgHistoryDataDtoList=new ArrayList<>();
 
         try {
             PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
                 msg="设备不存在";
-            else{
-                pgHistoryDataDtoList=pgCoManager.getAllCoData(pgDevice, startDate, endDate);
-                if(pgHistoryDataDtoList==null)
-                    msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+            else {
+                pgHistoryDataDtoList = pgCoManager.getAllCoData(pgDevice, startDate, endDate);
+                if (pgHistoryDataDtoList == null)
+                    msg = "没有满足要求的数据";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgHistoryDataDtoList);
         return resultMap;
@@ -75,6 +79,7 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         PgCoDto pgCoDto=new PgCoDto(null);
 
         try {
@@ -85,13 +90,16 @@
                 pgCoDto=pgCoManager.getNewestCoData(pgDevice);
                 if(pgCoDto==null)
                     msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgCoDto);
         return resultMap;
@@ -110,6 +118,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         try {
@@ -126,6 +135,7 @@
 
                 pgCoManager.save(pgCo);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
         } catch (Exception e) {
@@ -133,7 +143,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
index b4b826e..9af98a3 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
@@ -60,6 +60,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         try {
 
@@ -80,8 +81,8 @@
                 pgConstruction.setPgConstructionTypeId(pgConstructionType.getId());
                 pgConstruction.setActive(1);
                 pgConstruction.setParName(parName);
-                logger.info("保存成功");
                 pgConstructionManager.save(pgConstruction);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -90,6 +91,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("success", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -116,6 +118,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
@@ -140,6 +143,7 @@
                 pgConstruction.setParName(parName);
 
                 pgConstructionManager.save(pgConstruction);
+                code="200";
                 result = "true";
                 msg = "编辑成功";
             }
@@ -150,7 +154,7 @@
             e.printStackTrace();
 
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -167,6 +171,8 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
+
         try {
             PgConstruction pgConstruction = pgConstructionManager.get(Long.valueOf(id));
             if (pgConstruction == null)
@@ -177,6 +183,7 @@
             {
                 pgConstruction.setActive(0);
                 pgConstructionManager.save(pgConstruction);
+                code="200";
                 result = "true";
                 msg = "成功删除信息";
             }
@@ -185,6 +192,7 @@
             result = "false";
             msg = "删除失败";
         }
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -204,9 +212,11 @@
                                                   @FormParam("rows") int rows)throws Exception{
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
         List<PgConstructionDto> pgConstructionDtoList=new ArrayList<>();
         try{
             pgConstructionDtoList=pgConstructionManager.getPgContructionDto(cs_name,cs_type,startTime,endTime,page,rows);
+            code="200";
             msg="信息获取成功";
         }
         catch(Exception e)
@@ -214,6 +224,7 @@
             e.printStackTrace();
             msg="查询失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
 
@@ -231,18 +242,22 @@
                                                               @FormParam("statisticType") String statisticType) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgConstructionStiatistic> pgConstructionStiatisticList=new ArrayList<>();
         try {
             pgConstructionStiatisticList = pgConstructionManager.getConstructionByTimeAndStatus(startTime, endTime, statisticType);
             if(pgConstructionStiatisticList==null)
                 msg="施工统计信息获取失败";
-            else
-                msg="施工统计信息获取成功";
+            else {
+                code="200";
+                msg = "施工统计信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "施工统计信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgConstructionStiatisticList);
         return resultMap;
@@ -257,6 +272,7 @@
     public Map<String, Object> getConstructionByType(@FormParam("statisticType") String statisticType){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
         List<PgConstructionStiatistic> pgConstructionStiatisticList=new ArrayList<>();
 
         try{
@@ -268,6 +284,7 @@
                 resultMap.put("result",null);
             }
             else {
+                code="200";
                 msg = "统计信息获取成功";
                 resultMap.put("result", pgConstructionStiatisticList);
             }
@@ -278,6 +295,7 @@
             msg="统计失败";
             resultMap.put("result",null);
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         return resultMap;
     }
@@ -291,9 +309,11 @@
     public Map<String, Object> getConstructionToday() throws Exception{
         Map<String,Object> resultMap=new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgConstructionDto> pgConstructionDtoList=new ArrayList<PgConstructionDto>();
         try {
             pgConstructionDtoList = pgConstructionManager.getConstructionToday();
+            code="200";
             msg = "当天施工信息获取成功";
         }
         catch(Exception e)
@@ -301,7 +321,7 @@
             e.printStackTrace();
             msg="获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
         return resultMap;
@@ -316,6 +336,7 @@
     public Map<String, Object> getConstructionDev(@FormParam("id") String id) throws Exception{
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
         List<PgDeviceDto> pgDeviceDtoList =new ArrayList<>();
         try{
@@ -325,14 +346,17 @@
 
             if(pgDeviceDtoList==null)
                 msg="信息获取失败";
-            else
-                msg="信息获取成功";
+            else {
+                code="200";
+                msg = "信息获取成功";
+            }
         }
         catch(Exception e)
         {
             e.printStackTrace();
-            msg="设备信息获取成功";
+            msg="信息获取是被";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgDeviceDtoList);
 
@@ -346,17 +370,21 @@
     @Path("getConstruction")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getConstruction() throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
-        List<PgConstructionDto> pgConstructionDtoList=new ArrayList<PgConstructionDto>();
+        String code="0";
+
+        List<PgConstructionDto> pgConstructionDtoList=new ArrayList<>();
 
         try{
             pgConstructionDtoList=pgConstructionManager.getPgConstructionList();
             if(pgConstructionDtoList==null||pgConstructionDtoList.size()==0)
                 msg="不存在施工记录";
-            else
-                msg="施工信息获取成功";
+            else {
+                code = "200";
+                msg = "施工信息获取成功";
+            }
         }
         catch(Exception e)
         {
@@ -364,6 +392,7 @@
             msg="施工信息获取失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java
index fd3d53e..2019502 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java
@@ -39,12 +39,12 @@
         try {
             pgConstructionTypeDtoList = pgConstructionTypeManager.getAllConstructionTypeDto();
             if (pgConstructionTypeDtoList.size() == 0)
-                msg = "没有项目类型信息";
+                msg = "获取失败";
             else
-                msg = "项目类型获取成功";
+                msg = "获取成功";
         } catch (Exception e) {
             e.printStackTrace();
-            msg = "项目类型信息获取失败";
+            msg = "获取失败";
         }
         resultMap.put("msg", msg);
         resultMap.put("result", pgConstructionTypeDtoList);
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
index 90d001c..037a399 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
@@ -51,6 +51,7 @@
 
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if (StringUtils.isBlank(construct_doc)||StringUtils.isBlank(doc_name))
@@ -65,6 +66,7 @@
             pgCsDocument.setActive(1);
             pgCsDocumentManager.save(pgCsDocument);
 
+            code="200";
             result = "true";
             msg = "保存成功";
 
@@ -74,6 +76,7 @@
             ex.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("success", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -90,6 +93,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             PgCsDocument pgCsDocument = pgCsDocumentManager.get(Long.valueOf(id));
@@ -103,6 +107,7 @@
 
                 pgCsDocumentManager.save(pgCsDocument);
 
+                code="200";
                 result = "true";
                 msg = "编辑成功";
             }
@@ -112,6 +117,7 @@
             msg = "编辑失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -125,9 +131,9 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
         String result="";
+        String code="0";
 
         try{
-
             PgCsDocument pgCsDocument = pgCsDocumentManager.get(Long.valueOf(id));
             if(pgCsDocument==null)
             {
@@ -137,6 +143,7 @@
             else{
                 pgCsDocument.setActive(0);
                 pgCsDocumentManager.save(pgCsDocument);
+                code="200";
                 result="true";
                 msg="删除成功";
             }
@@ -147,7 +154,7 @@
             msg="预案删除失败";
             result="false";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -168,18 +175,21 @@
 
         String msg="";
         String result="";
+        String code="0";
 
         try {
             pgCsDocumentDtoList = pgCsDocumentManager.getAllDocData(cs_name);
-            if (pgCsDocumentDtoList != null)
+            if (pgCsDocumentDtoList != null) {
+                code="200";
                 msg = "获取数据成功";
+            }
             else
                 msg = "没有满足条件的数据";
         }catch (Exception e){
             e.printStackTrace();
             msg = "获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgCsDocumentDtoList);
         return resultMap;
@@ -192,20 +202,22 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
 
         String msg = "";
+        String code="0";
         ResponseEntity<byte[]> path = null;
         try {
             PgCsDocument pgCsDocument = pgCsDocumentManager.get(Long.valueOf(id));
             path = pgCsDocumentManager.downloadFile(pgCsDocument);
             if (path == null)
                 msg = "不存在该文档";
-            else
+            else {
+                code = "200";
                 msg = "下载成功";
-
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "下载失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", path.getBody());
         resultMap.put("msg", msg);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
index 94c5c84..ffc8b95 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
@@ -41,22 +41,24 @@
     public Map<String, Object> getPgDeviceByDevType(@FormParam("devType") String devType) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
         try {
-            pgDeviceDtoList = pgDeviceManager.getDeviceByDevTypee(devType);
+            pgDeviceDtoList = pgDeviceManager.getDeviceByDevType(devType);
             if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0){
                 msg="不存在满足要求的数据";
-                resultMap.put("result",null);
             }
             else{
-                resultMap.put("result", pgDeviceDtoList);
+                code="200";
                 msg = "获取成功";
             }
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", pgDeviceDtoList);
         return resultMap;
     }
 
@@ -69,25 +71,26 @@
     public Map<String, Object> getPgDeviceByAssetCode(@FormParam("assetCode") String assetCode) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         PgDeviceDto pgDeviceDto=null;
         try {
             PgDevice pgDevice = pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
             {
                 msg="不存在设备信息";
-                resultMap.put("result",null);
             }
             else {
                 pgDeviceDto = new PgDeviceDto(pgDevice);
                 msg = "获取成功";
-                resultMap.put("result", pgDeviceDto);
+                code="200";
             }
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", pgDeviceDto);
         return resultMap;
     }
 
@@ -102,27 +105,61 @@
                                              @FormParam("devType") String devType)throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
         try {
             pgDeviceDtoList = pgDeviceManager.getAllDevice(road,partition,devType);
             if(pgDeviceDtoList.size()==0) {
                 msg = "没有找到设备信息";
-                resultMap.put("result",null);
             }
             else {
                 msg = "设备信息获取成功";
-                resultMap.put("result", pgDeviceDtoList);
+                code="200";
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result", pgDeviceDtoList);
         return resultMap;
     }
 
     /**
+     * 显示设备列表
+     */
+    @POST
+    @Path("getPgDev")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String, Object> getPgDev(@FormParam("road") String road,
+                                             @FormParam("partition") String partition,
+                                             @FormParam("devType") String devType)throws Exception {
+        Map<String, Object> resultMap = new HashMap<>();
+        String msg="";
+        String code="0";
+        List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
+        try {
+            pgDeviceDtoList = pgDeviceManager.getAllDev(road,partition,devType);
+            if(pgDeviceDtoList.size()==0) {
+                msg = "没有找到设备信息";
+            }
+            else {
+                code="200";
+                msg = "设备信息获取成功";
+            }
+        }catch(Exception e){
+            e.printStackTrace();
+            msg="设备信息获取失败";
+        }
+        resultMap.put("code",code);
+        resultMap.put("msg",msg);
+        resultMap.put("result", pgDeviceDtoList);
+        return resultMap;
+    }
+
+
+    /**
      * 新增设备
      */
     @POST
@@ -145,6 +182,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if (pgDeviceManager.getDeviceByAssetCode(assetCode)!=null) {
@@ -169,6 +207,7 @@
 
                 pgDeviceManager.save(pgDevice);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
 
@@ -177,10 +216,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -208,14 +246,9 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
-            /*
-            if (pgDeviceManager.getDeviceByAssetCode(assetCode)!=null) {
-                result = "false";
-                msg = "已存在同名设备";
-            } else {
-            */
             PgDevice pgDevice = pgDeviceManager.get(Long.valueOf(id));
             pgDevice.setPipeGallery(pipeGallery);
             pgDevice.setPartition(partition);
@@ -233,14 +266,14 @@
 
             pgDeviceManager.save(pgDevice);
             result = "true";
+            code="200";
             msg = "编辑成功";
-            //}
         } catch (Exception e) {
             result = "false";
             msg = "编辑失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("result",result);
         resultMap.put("msg",msg);
         return resultMap;
@@ -256,7 +289,8 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
-        String result="false";
+        String result="";
+        String code="0";
 
         try {
             PgDevice pgDevice=pgDeviceManager.get(Long.valueOf(id));
@@ -268,6 +302,7 @@
             {
                 pgDevice.setActive(0);
                 pgDeviceManager.save(pgDevice);
+                code="200";
                 msg="设备删除成功";
                 result="true";
             }
@@ -276,6 +311,7 @@
             msg="设备删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -291,18 +327,18 @@
     {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         PgDeviceDto pgDeviceDto=null;
 
         try{
             PgDevice pgDevice=pgDeviceManager.getDeviceBydevCode(devCode);
             if(pgDevice==null) {
                 msg = "设备信息获取失败";
-                resultMap.put("result",null);
             }
             else{
                 pgDeviceDto = new PgDeviceDto(pgDevice);
                 msg = "设备信息获取成功";
-                resultMap.put("result",pgDeviceDto);
+                code="200";
             }
         }
         catch(Exception ex)
@@ -310,8 +346,9 @@
             ex.printStackTrace();
             msg="设备状态获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgDeviceDto);
         return resultMap;
     }
 
@@ -324,17 +361,17 @@
     public Map<String,Object> getDeviceByPartition(@FormParam("partition") String partition) throws Exception{
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<PgDeviceDto>();
 
         try{
             pgDeviceDtoList=pgDeviceManager.getPgDeviceDtoListByPartition(partition);
             if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0) {
                 msg = "设备信息获取失败";
-                resultMap.put("result",null);
             }
             else {
+                code="200";
                 msg = "设备信息获取成功";
-                resultMap.put("result",pgDeviceDtoList);
             }
         }
         catch(Exception e)
@@ -342,8 +379,9 @@
             e.printStackTrace();
             msg="设备信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgDeviceDtoList);
         return resultMap;
     }
 
@@ -353,17 +391,16 @@
     public Map<String,Object> getDeviceByOldDAssetCodeCode(@FormParam("assetCode") String assetCode) throws Exception{
         Map<String, Object> resultMap = new HashMap<>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
 
         try{
             pgDeviceDtoList=pgDeviceManager.getDeviceByOldDAssetCodeCode(assetCode);
-            if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0) {
-                msg = "设备信息获取失败";;
-                resultMap.put("result",null);
-            }
+            if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0)
+                msg = "设备信息获取失败";
             else {
                 msg = "设备信息获取成功";
-                resultMap.put("result",pgDeviceDtoList);
+                code="200";
             }
         }
         catch(Exception e)
@@ -372,8 +409,9 @@
             msg="设备信息获取失败";
             resultMap.put("result",null);
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgDeviceDtoList);
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java
index 421d249..f6f167d 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java
@@ -38,17 +38,21 @@
     public Map<String, Object> getDeviceTpeyList()throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgDeviceTypeDto> pgDeviceTypeDtoList=new ArrayList<PgDeviceTypeDto>();
         try {
             pgDeviceTypeDtoList = pgDeviceTypeManager.getAllDeviceType();
             if(pgDeviceTypeDtoList.size()==0)
                 msg="没有找到设备类型信息";
-            else
-                msg="设备类型信息获取成功";
+            else {
+                code="200";
+                msg = "设备类型信息获取成功";
+            }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备类型信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgDeviceTypeDtoList);
         return resultMap;
@@ -66,6 +70,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if (pgDeviceTypeManager.getDeviceTypeByDeType(devType)!=null) {
@@ -79,6 +84,7 @@
 
                 pgDeviceTypeManager.save(pgDeviceType);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
 
@@ -87,10 +93,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
index c276fb3..c789960 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
@@ -44,6 +44,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 
         try {
@@ -62,6 +63,7 @@
                 pgEquipment.setActive(1);
 
                 pgEquipmentManager.save(pgEquipment);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -70,9 +72,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -89,9 +91,10 @@
                                             @FormParam("ownerUnit") String ownerUnit,
                                             @FormParam("enterDate") String enterDate,
                                             @FormParam("curUser") String curUser) {
-        HashMap<String, Object> resultMap = new HashMap<String, Object>();
+        HashMap<String, Object> resultMap = new HashMap<>();
         String msg = "";
         String result = "";
+        String code="0";
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 
         try {
@@ -111,6 +114,7 @@
                 pgEquipment.setEnterDate(sdf.parse(enterDate));
 
                 pgEquipmentManager.save(pgEquipment);
+                code="200";
                 msg="编辑成功";
                 result="true";
             }
@@ -119,9 +123,9 @@
             result = "false";
             msg = "编辑失败";
         }
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -134,16 +138,19 @@
     public Map<String, Object> getEquipment(@FormParam("eqName") String eqName,
                                             @FormParam("eqCode") String eqCode,
                                             @FormParam("eqType") String eqType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        List<PgEquipmentDto> pgEquipmentDtoList=new ArrayList<PgEquipmentDto>();
+        String code="0";
+        List<PgEquipmentDto> pgEquipmentDtoList=new ArrayList<>();
 
         try{
             pgEquipmentDtoList=pgEquipmentManager.getEquipmentDtiList(eqName,eqCode,eqType);
             if(pgEquipmentDtoList==null||pgEquipmentDtoList.size()==0)
                 msg="不存在工器具记录";
-            else
-                msg="维获取成功";
+            else {
+                code = "200";
+                msg = "维获取成功";
+            }
         }
         catch(Exception e)
         {
@@ -166,6 +173,7 @@
         HashMap<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
         String result = "";
+        String code="";
 
         try {
             PgEquipment pgEquipment=pgEquipmentManager.get(Long.valueOf(id));
@@ -178,6 +186,7 @@
             {
                 pgEquipment.setActive(0);
                 pgEquipmentManager.save(pgEquipment);
+                code="200";
                 msg="删除成功";
                 result="true";
             }
@@ -186,6 +195,7 @@
             msg="设备信息获取失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -201,16 +211,19 @@
             throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=new ArrayList<PgDeviceTypeStatisticDto>();
 
         try {
             pgDeviceTypeStatisticDtoList=pgEquipmentManager.getDeviceStatisticByDevType(eqType);
 
+            code="200";
             msg = "获取成功";
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceTypeStatisticDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
index 05a9709..a90fd6c 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
@@ -4,9 +4,9 @@
 import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
 import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
 import com.casic.PgInterface.intelPlan.manager.PgPileAcuManager;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import com.casic.PgInterface.test.PlanData;
 import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.ModelAttribute;
 
 import javax.annotation.Resource;
 import javax.ws.rs.FormParam;
@@ -32,23 +32,25 @@
     public Map<String,Object> getPlanResult(@FormParam("planParamStr") String planParamStr){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
-        //List<PgPlanTask> pgPlanTaskList=pgPlanParams.getPgPlanTaskList();
         List<PgPlanTask> pgPlanTaskList=new PgPlanParams().getPgPlanParamsByString(planParamStr);
         List<PgPlanResultRe> pgPlanResultReList=new ArrayList<>();
 
-        try{
-                pgPlanResultReList=pgPileAcuManager.getPgPlanResultList(pgPlanTaskList);
-                if(pgPlanResultReList==null)
-                    msg="管线智能规划出错";
-                else
-                    msg="管线智能规划完成";
+        try {
+            pgPlanResultReList = pgPileAcuManager.getPgPlanResultList(pgPlanTaskList);
+            if (pgPlanResultReList == null)
+                msg = "管线智能规划出错";
+            else {
+                code="200";
+                msg = "管线智能规划完成";
+            }
         }
         catch(Exception ex){
             msg="智能规划出错";
             ex.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgPlanResultReList);
 
@@ -80,4 +82,30 @@
         return resultMap;
     }
 
+    @POST
+    @Path("getPlanTask")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getACUTask(@FormParam("pileAcuList") String pileAcuList){
+
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        String code="0";
+        List<PgAcuTask> pgAcuTaskList=new ArrayList<>();
+
+        try{
+            pgAcuTaskList=pgPileAcuManager.getACUTask(pileAcuList);
+            code="200";
+            msg="任务获取成功";
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            msg="任务获取失败";
+        }
+        resultMap.put("code",code);
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgAcuTaskList);
+
+        return resultMap;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
index ff85c61..66eec76 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
@@ -55,13 +55,13 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         try {
             PgInPgPerson pgInPgPerson = null;//pgInPgPersonManager.getPersonByUserName(userName);
             int iHostName = pgTagMacManager.getCount("select count(1) from PGTagMac where hostname = ?",assetCode);
-//            int iTagMac = pgTagMacManager.getCount("select count(1) from PGTagMac where tagmac = ?",assetCode.toUpperCase());
             if (0==iHostName)
             {
                 result = "false";
@@ -92,9 +92,8 @@
 
                 pgInPgStatusManager.save(pgInPgStatus);
 
-//                String syResult=pgInPgPersonManager.synchorizedInPgInfo(assetCode,userCode,userName,personType);
+                code="200";
                 result = "true";
-//                msg = "人员注册保存成功"+syResult;
                 msg = "人员注册保存成功";
             }
             else {
@@ -106,6 +105,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -120,6 +120,7 @@
     public Map<String, Object> getInPgPerson() throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<>();
         try {
@@ -127,11 +128,15 @@
             if (pgInPgInfoDtoList == null || pgInPgInfoDtoList.size() == 0)
                 msg = "没有找到入廊人员信息";
             else
+            {
+                code="200";
                 msg = "入廊人员信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "入廊人员信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
         return resultMap;
@@ -146,18 +151,22 @@
     public Map<String, Object> getInPgPersonInPg() throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
 
-        List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<PgInPgInfoDto>();
+        List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<>();
         try {
             pgInPgInfoDtoList = pgInPgPersonManager.getPgInPersonList(1);
             if (pgInPgInfoDtoList == null || pgInPgInfoDtoList.size() == 0)
                 msg = "没有找到入廊人员信息";
-            else
+            else {
+                code="200";
                 msg = "入廊人员信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "入廊人员信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
         return resultMap;
@@ -172,6 +181,7 @@
     public Map<String, Object> getInPgPersonByName(@FormParam("userName") String userName) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
 
         PgInPgPerson pgInPgPerson = null;
         PgInPgPersonDto pgInPgPersonDto=null;
@@ -184,12 +194,13 @@
                 pgInPgPersonDto=new PgInPgPersonDto(pgInPgPerson);
                 pgInPgPersonDtoList.add(pgInPgPersonDto);
                 msg = "人员信息获取成功";
+                code="200";
             }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "人员信息获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgPersonDtoList);
         return resultMap;
@@ -206,6 +217,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             PgInPgPerson pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName);
@@ -221,6 +233,7 @@
                     pgInPgPersonManager.save(pgInPgPerson);
                     result = "true";
                     msg = "编辑成功";
+                    code="200";
                 }
             }
         } catch (Exception e) {
@@ -228,9 +241,9 @@
             msg = "编辑失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -244,10 +257,12 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         int inPgNum=0;
         String msg = "";
+        String code="0";
 
         try{
             inPgNum=pgInPgStatusManager.getInPgNum();
 
+            code="200";
             msg="人员入廊次数获取成功";
         }
         catch(Exception e)
@@ -255,6 +270,7 @@
             e.printStackTrace();
             msg="人员入廊次数获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",inPgNum);
 
@@ -272,18 +288,22 @@
                                                    @FormParam("statisticType") String statisticType) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
 
         List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<PgInPgInfoDto>();
         try {
             pgInPgInfoDtoList = pgInPgPersonManager.getPgInPersonListByTime(startTime, endTime, statisticType);
             if(pgInPgInfoDtoList==null)
                 msg="入廊人员统计信息获取失败";
-            else
-                msg="入廊人员统计信息获取成功";
+            else {
+                code="200";
+                msg = "入廊人员统计信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "入廊人员统计信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
         return resultMap;
@@ -296,6 +316,7 @@
 
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
 
         try {
@@ -304,8 +325,10 @@
                 pgDeviceDtoList=pgDeviceManager.getPgCameraListByPosition("",apCodeStr);
                 if(pgDeviceDtoList==null)
                     msg="不存在关联摄像机";
-                else
-                    msg="关联摄像机获取成功";
+                else {
+                    code="200";
+                    msg = "关联摄像机获取成功";
+                }
             } else {
                 msg="请输入Ap编号";
             }
@@ -315,6 +338,7 @@
             msg="关联摄像机获取成功";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgDeviceDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java
index 507b3fe..b43f077 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java
@@ -34,6 +34,7 @@
 
         String result="";
         String msg="";
+        String code="";
         try{
             PgInPgStatus pgInPgStatus=new PgInPgStatus();
 
@@ -44,6 +45,7 @@
             pgInPgStatusManager.save(pgInPgStatus);
             msg="入廊时间提交成功";
             result="true";
+            code="200";
         }
         catch (Exception e){
             e.printStackTrace();
@@ -51,6 +53,7 @@
             result="false";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -66,6 +69,7 @@
 
         String result="";
         String msg="";
+        String code="0";
         try{
             PgInPgPerson pgInPgPerson=pgInPgPersonManager.getPgInPgPersonByAssetCode(assetCode);
 
@@ -79,6 +83,7 @@
             pgInPgStatusManager.save(pgInPgStatus);
 
             msg="出廊时间提交成功";
+            code="200";
             result="true";
         }
         catch (Exception e){
@@ -87,6 +92,7 @@
             result="false";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
index 9def330..9c0ba1f 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
@@ -33,17 +33,20 @@
                                             @FormParam("existNum") String existNum) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         String result="";
 
         try {
             pgIntelPlanManager.savePgIntelPlan(parName,lineName,maxNum,existNum);
             msg="规划数据保存成功";
+            code="200";
             result="true";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "规划数据保存失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
@@ -55,15 +58,18 @@
     public Map<String, Object> getIntelLineType() throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgIntelPlanTypeDto> pgIntelPlanTypeDtoList=new ArrayList<>();
         try {
             pgIntelPlanTypeDtoList=pgIntelPlanManager.getIntelPlanType();
+            code="200";
             msg="获取排线类型成功";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "获取排线类型失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgIntelPlanTypeDtoList);
         return resultMap;
@@ -76,6 +82,7 @@
                                             @FormParam("partitionStr") String partitionStr) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgIntelPlanDto> pgIntelPlanDtoList = new ArrayList<>();
 
@@ -83,8 +90,10 @@
             pgIntelPlanDtoList = pgIntelPlanManager.getPgIntelPlanListByPartion(lineName, partitionStr);
             if(pgIntelPlanDtoList==null||pgIntelPlanDtoList.size()==0)
                 msg="请输入正确的规划参数";
-            else
-                msg="规划数据获取成功";
+            else {
+                code="200";
+                msg = "规划数据获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "规划数据获取失败";
@@ -103,10 +112,12 @@
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
         String result="";
+        String code="0";
 
         try {
             boolean bl=pgIntelPlanManager.addLineUse(lineName,partitionStr,num);
             if(bl){
+                code="200";
                 msg="排线入廊成功";
                 result="true";
             }
@@ -119,6 +130,7 @@
             msg = "排线入廊失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
@@ -132,6 +144,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
         String result="";
+        String code="0";
 
         try {
             PgIntelPlan pgIntelPlan=pgIntelPlanManager.getPgIntelPlanByParNameAndLine(lineName,parName);
@@ -140,11 +153,13 @@
             pgIntelPlanManager.save(pgIntelPlan);
             msg="规划数据删除成功";
             result="true";
+            code="200";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "规划数据删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java b/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java
index 378af00..9c39523 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java
@@ -1,5 +1,6 @@
 package com.casic.PgInterface.rs;
 
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
 import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
 import com.casic.PgInterface.intelPlan.dto.PgLineHoleDTO;
 import com.casic.PgInterface.intelPlan.manager.PgLineHoleManager;
@@ -27,6 +28,9 @@
     @Resource
     private PgPileAcuManager pgPileAcuManager;
 
+    @Resource
+    private PgRoadManager pgRoadManager;
+
     @POST
     @Path("getPgLineAcuHole")
     @Produces(MediaType.APPLICATION_JSON)
@@ -34,23 +38,32 @@
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
         String result="";
+        String code="0";
         List<PgLineHoleDTO> pgLineHoleDTOList=new ArrayList<>();
 
         try {
             PgPileAcu pgPileAcu=pgPileAcuManager.getPgPileAcuByCode(acuCode);
             if(pgPileAcu==null){
                 msg="不存在分区";
-            }else{
-                pgLineHoleDTOList=pgLineHoleManager.getCurrentHoleByAcu(pgPileAcu.getId());
-                if(pgLineHoleDTOList!=null&&pgLineHoleDTOList.size()!=0)
-                    msg="获取成功";
-                else
-                    msg="未找到入廊数据";
+            }else {
+                pgLineHoleDTOList = pgLineHoleManager.getCurrentHoleByAcu(pgPileAcu.getId());
+                if (pgLineHoleDTOList != null && pgLineHoleDTOList.size() != 0)
+                {
+                    code="200";
+                    msg = "获取成功";
+                }
+                else {
+                    PgLineHoleDTO pgLineHoleDTO=new PgLineHoleDTO();
+                    pgLineHoleDTO.setRoad(pgRoadManager.get(pgPileAcu.getRoadId()).getRoadName());
+                    pgLineHoleDTOList.add(pgLineHoleDTO);
+                    msg = "未找到入廊数据";
+                }
             }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgLineHoleDTOList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgLogRs.java b/src/main/java/com/casic/PgInterface/rs/PgLogRs.java
index 39cff52..30db63b 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgLogRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgLogRs.java
@@ -45,6 +45,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         PgLog pgLog=new PgLog();
         try {
             PgUser pgUser = new PgUser();
@@ -60,14 +61,15 @@
             pgLogManager.save(pgLog);
             result = "true";
             msg = "保存成功";
-
+            code="200";
         } catch (Exception e) {
             result = "false";
             msg = "保存失败";
             e.printStackTrace();
         }
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -83,17 +85,21 @@
             throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgLogDto> pgLogDtoList = new ArrayList<PgLogDto>();
         try {
             pgLogDtoList = pgLogManager.getAllLogs(userName, startTime, endTime);
             if (pgLogDtoList == null || pgLogDtoList.size() == 0)
                 msg = "没有找到日志信息";
-            else
+            else {
+                code="200";
                 msg = "日志信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "日志信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgLogDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java
index 9fd0a5f..37b72f6 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java
@@ -36,19 +36,23 @@
         Map<String,Object> resultMap=new HashMap<>();
 
         String msg = "";
+        String code="0";
         List<PgMaintainType> pgMaintainTypeList=new ArrayList<>();
         try{
             pgMaintainTypeList=pgMaintainTypeManager.getMaintainType();
             if(pgMaintainTypeList!=null&&pgMaintainTypeList.size()!=0)
                 msg="不存在运维类别";
-            else
-                msg="运维类别获取成功";
+            else {
+                code="200";
+                msg = "运维类别获取成功";
+            }
         }
         catch(Exception ex)
         {
             ex.printStackTrace();
             msg="运维类别获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgMaintainTypeList);
 
@@ -65,10 +69,11 @@
         Map<String,Object> resultMap=new HashMap<>();
 
         String msg = "";
+        String code="0";
         List<PgMaintainTypeDto> pgMaintainTypeDtoList=new ArrayList<PgMaintainTypeDto>();
         try{
             pgMaintainTypeDtoList=pgMaintainTypeManager.getMaintainTypeModel(type);
-
+            code="200";
             msg="维护类型获取成功";
         }
         catch(Exception ex)
@@ -77,9 +82,9 @@
             msg="维护类型获取失败";
         }
 
-        resultMap.put("result",pgMaintainTypeDtoList);
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgMaintainTypeDtoList);
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java
index d735cc9..82ffca4 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java
@@ -33,12 +33,16 @@
                                                  @FormParam("endTime") String endTime){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
         List<PgMaintanceRecordHeadDto> pgMaintanceRecordHeadDtoList=new ArrayList<>();
         try{
             pgMaintanceRecordHeadDtoList=pgMaintanceRecordHeadManager.getPgMaintanceRecordHeadLsit(repairMan,startTime,endTime);
             if(pgMaintanceRecordHeadDtoList!=null&&pgMaintanceRecordHeadDtoList.size()!=0)
+            {
+                code="200";
                 msg="维护信息获取成功";
+            }
             else
                 msg="不存在维护信息";
         }
@@ -47,6 +51,7 @@
             msg="巡检信息获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgMaintanceRecordHeadDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java
index effc9df..9f46fc8 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java
@@ -32,12 +32,16 @@
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
         String result="";
+        String code="0";
 
         List<PgMaintanceRecordHeadStatic> pgMaintanceRecordHeadStaticList=new ArrayList<>();
         try{
             pgMaintanceRecordHeadStaticList=pgMaintanceRecordHeadManager.getPgMaintanceRecordHeadStaticLisByTime(startTime,endTime,staticType);
             if(pgMaintanceRecordHeadStaticList!=null&&pgMaintanceRecordHeadStaticList.size()!=0)
+            {
+                code="200";
                 msg="维护统计信息获取成功";
+            }
             else
                 msg="维护统计失败";
         }
@@ -46,7 +50,7 @@
             ex.printStackTrace();
             msg="统计失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgMaintanceRecordHeadStaticList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java b/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java
index 3a67bf3..6a5f4dc 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java
@@ -39,27 +39,31 @@
     @Path("getO2InfoByDevAndDate")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getO2InfoByDevAndDate(@FormParam("assetCode") String assetCode,
-                                                      @FormParam("startDate") String startDate,
-                                                      @FormParam("endDate") String endDate)throws Exception {
+                                                     @FormParam("startDate") String startDate,
+                                                     @FormParam("endDate") String endDate)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgHistoryDataDto> pgHistoryDataDtoList=new ArrayList<>();
 
         try {
             PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
                 msg="设备不存在";
-            else{
-                pgHistoryDataDtoList=pgO2Manager.getAllO2Data(pgDevice, startDate, endDate);
-                if(pgHistoryDataDtoList==null)
-                    msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+            else {
+                pgHistoryDataDtoList = pgO2Manager.getAllO2Data(pgDevice, startDate, endDate);
+                if (pgHistoryDataDtoList == null)
+                    msg = "没有满足要求的数据";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgHistoryDataDtoList);
         return resultMap;
@@ -75,23 +79,27 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         PgO2Dto pgO2Dto=new PgO2Dto(null);
 
         try {
             PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
                 msg="设备不存在";
-            else{
-                pgO2Dto=pgO2Manager.getNewestO2Data(pgDevice);
-                if(pgO2Dto==null)
-                    msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+            else {
+                pgO2Dto = pgO2Manager.getNewestO2Data(pgDevice);
+                if (pgO2Dto == null)
+                    msg = "没有满足要求的数据";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgO2Dto);
         return resultMap;
@@ -104,11 +112,12 @@
     @Path("addO2Data")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> addO2Data(@FormParam("devCode") String devCode,
-                                          @FormParam("upTime") String upTime,
-                                          @FormParam("o2") String o2)throws Exception {
+                                         @FormParam("upTime") String upTime,
+                                         @FormParam("o2") String o2)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
@@ -125,6 +134,7 @@
                 pgO2.setPgDeviceId(pgDevice);
 
                 pgO2Manager.save(pgO2);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -133,9 +143,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java b/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java
index 6217cde..70b3b41 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java
@@ -30,8 +30,6 @@
 public class PgOverViewRs {
 
     @Resource
-    private PgInPgPersonManager pgInPgPersonManager;
-    @Resource
     private PgInPgStatusManager pgInPgStatusManager;
     @Resource
     private PgAlarmManager pgAlarmManager;
@@ -46,18 +44,21 @@
     @Path("getPersonNumInPgByMonth")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<Object, String> getMonthInPgPersonNum() throws Exception {
-        Map<Object, String> resultMap = new HashMap<Object, String>();
+        Map<Object, String> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         int inNum = 0;
 
         try {
             inNum = pgInPgStatusManager.getMonthInPgPersonNum();
+            code="200";
             msg = "本月入廊人员次数获取成功";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "本月入廊人员次数获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", String.valueOf(inNum));
 
@@ -73,15 +74,18 @@
     public Map<Object, String> getWeekInPgPersonNum() throws Exception {
         Map<Object, String> resultMap = new HashMap<Object, String>();
         String msg = "";
+        String code="0";
         int inNum = 0;
         try {
             inNum = pgInPgStatusManager.getWeekInPgPersonNum();
+            code="200";
             msg = "本周入廊人员次数获取成功";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "本周入廊人员次数获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", String.valueOf(inNum));
 
@@ -97,19 +101,22 @@
     public Map<String, Object> getDayInPgStatistic() throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<>();
         try {
             pgInPgInfoDtoList = pgInPgStatusManager.getPgInPersonListByDay();
             if (pgInPgInfoDtoList == null)
                 msg = "信息获取失败";
-            else
+            else {
+                code="200";
                 msg = "信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "信息获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
         return resultMap;
@@ -124,18 +131,23 @@
     public Map<String, Object> getTodayInPgInfo() throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
 
         List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<PgInPgInfoDto>();
         try {
             pgInPgInfoDtoList = pgInPgStatusManager.getTodayInPgInfo();
             if(pgInPgInfoDtoList!=null||pgInPgInfoDtoList.size()!=0)
+            {
+                code="200";
                 msg = "信息获取成功";
+            }
             else
                 msg="当天没有入廊人员信息";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
 
@@ -149,18 +161,22 @@
     public Map<String, Object> getAlarmNum(@FormParam("isDevFault") String isDevFault) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         int num = 0;
 
         try {
             if(isDevFault!=null){
                 num = pgAlarmManager.getAlarmNum(isDevFault);
-                msg = "报警数量获取成功";}
+                msg = "报警数量获取成功";
+                code="200";
+            }
             else
                 msg="请输入统计参数";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警数量统计失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", num);
 
@@ -176,16 +192,18 @@
     public Map<Object, String> getMonthAlarmNum(@FormParam("isDevFault") String isDevFault) throws Exception {
         Map<Object, String> resultMap = new HashMap<Object, String>();
         String msg = "";
+        String code="0";
         int inNum = 0;
 
         try {
-                inNum = pgAlarmManager.getMonthAlarmNum(isDevFault);
-                msg = "报警次数获取成功";
+            inNum = pgAlarmManager.getMonthAlarmNum(isDevFault);
+            code="200";
+            msg = "报警次数获取成功";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警次数获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", String.valueOf(inNum));
 
@@ -201,15 +219,17 @@
     public Map<Object, String> getWeekAlarmNum(@FormParam("isDevFault") String isDevFault) throws Exception {
         Map<Object, String> resultMap = new HashMap<Object, String>();
         String msg = "";
+        String code="0";
         int inNum = 0;
         try {
             inNum = pgAlarmManager.getWeekAlarmNum(isDevFault);
+            code="200";
             msg = "报警次数获取成功";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警次数获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", String.valueOf(inNum));
 
@@ -225,14 +245,17 @@
     public Map<String, Object> getDayAlarmStatistic() throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgAlarmTjDto> pgAlarmTjDtoList = new ArrayList<PgAlarmTjDto>();
         try {
             pgAlarmTjDtoList = pgAlarmManager.getDayAlarmStatistic();
             if (pgAlarmTjDtoList == null)
                 msg = "信息获取失败";
-            else
+            else {
+                code="200";
                 msg = "信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "信息获取失败";
@@ -252,9 +275,11 @@
     public Map<String, Object> getAlarmList(@FormParam("isDevFault") String isDevFault) throws Exception{
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         List<PgAlarmDto> pgAlarmDtoList=new ArrayList<>();
         try{
             pgAlarmDtoList=pgAlarmManager.getAlarmList(isDevFault);
+            code="200";
             msg="信息获取成功";
         }
         catch(Exception e)
@@ -262,6 +287,7 @@
             e.printStackTrace();
             msg="信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAlarmDtoList);
 
@@ -278,17 +304,19 @@
     public Map<String,Object> getConstructionNum() throws Exception{
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgConstructionTypeNumStatisticDto> pgConstructionTypeNumDtoList=new ArrayList<PgConstructionTypeNumStatisticDto>();
         try{
             pgConstructionTypeNumDtoList=pgConstructionManager.getConstructionNum();
             msg="施工数量获取成功";
+            code="200";
         }
         catch(Exception e)
         {
             e.printStackTrace();
             msg="施工数量统计";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionTypeNumDtoList);
 
@@ -302,21 +330,25 @@
     @Path("getConstructionToday")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> getConstructionToday() throws Exception{
-        Map<String,Object > resultMap = new HashMap<String,Object>();
+        Map<String,Object > resultMap = new HashMap<>();
         String msg = "";
-        List<PgConstructionDto> pgConstructionDtoList=new ArrayList<PgConstructionDto>();
+        String code="0";
+        List<PgConstructionDto> pgConstructionDtoList=new ArrayList<>();
         try {
             pgConstructionDtoList = pgConstructionManager.getConstructionToday();
-            if (pgConstructionDtoList == null&&pgConstructionDtoList.size()==0)
+            if (pgConstructionDtoList == null && pgConstructionDtoList.size() == 0)
                 msg = "不存在施工信息";
-            else
+            else {
+                code="200";
                 msg = "施工信息获取成功";
+            }
         }
         catch(Exception e)
         {
             e.printStackTrace();
             msg="施工信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java b/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java
index d3c10d4..31ffcfc 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java
@@ -48,6 +48,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 
         try {
@@ -66,9 +67,9 @@
                 pgPartition.setMaterial(material);
                 pgPartition.setActive(1);
 
-                logger.info("成功保存");
                 pgPartitionManager.save(pgPartition);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
         } catch (Exception e) {
@@ -76,9 +77,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
         return resultMap;
     }
     /*
@@ -100,6 +101,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         PgPartition partition = new PgPartition();
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
@@ -122,6 +124,7 @@
 
                 pgPartitionManager.save(pgPartition);
                 result = "true";
+                code="200";
                 msg = "编辑成功";
             }
 
@@ -131,8 +134,10 @@
             e.printStackTrace();
         }
 
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
+
         return resultMap;
     }
 
@@ -147,7 +152,8 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
-        String result="false";
+        String result="";
+        String code="0";
 
         try {
             PgPartition pgPartition=pgPartitionManager.get(Long.valueOf(id));
@@ -161,12 +167,14 @@
                 pgPartitionManager.save(pgPartition);
                 msg="分区删除成功";
                 result="true";
+                code="200";
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="分区删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -181,14 +189,17 @@
     public Map<String, Object> getPartition() throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgPartitionDto> pgPartitionDtoList = new ArrayList<PgPartitionDto>();
         try {
             pgPartitionDtoList = pgPartitionManager.getPgPartitionDtoList();
+            code="200";
             msg = "获取成功";
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgPartitionDtoList);
         return resultMap;
@@ -203,14 +214,17 @@
     public Map<String, Object> getPartitionListByName(@FormParam("parName") String parName) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgPartitionDto> pgPartitionDtoList = new ArrayList<PgPartitionDto>();
         try {
             pgPartitionDtoList = pgPartitionManager.getPartitionByName(parName);
+            code="200";
             msg = "获取成功";
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgPartitionDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java b/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java
index 883adf9..cf81b72 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java
@@ -37,6 +37,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
         PgRoad pgRoad=pgRoadManager.getPgRoadByName(road);
         try {
             PgPileAcu pgPileAcu=new PgPileAcu();
@@ -49,6 +50,7 @@
             pgPileAcu.setActive(true);
 
             pgPileAcuManager.save(pgPileAcu);
+            code="200";
             result="true";
             msg="保存成功";
         } catch (Exception e) {
@@ -56,9 +58,10 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
+
         return resultMap;
     }
 
@@ -73,6 +76,7 @@
 
         String result="";
         String msg="";
+        String code="0";
         try{
             PgPileAcu pgPileAcu=pgPileAcuManager.get(id);
             if(pgPileAcu==null){
@@ -83,7 +87,7 @@
             {
                 pgPileAcu.setActive(false);
                 pgPileAcuManager.save(pgPileAcu);
-
+                code="200";
                 result="true";
                 msg="桩号删除成功";
             }
@@ -94,8 +98,9 @@
             ex.printStackTrace();
         }
 
-        resultMap.put("result",result);
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
+        resultMap.put("result",result);
 
         return resultMap;
     }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPileRs.java b/src/main/java/com/casic/PgInterface/rs/PgPileRs.java
index cf62954..c9999ac 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgPileRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgPileRs.java
@@ -33,6 +33,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             PgPile pgPile=new PgPile();
@@ -40,6 +41,7 @@
             pgPile.setActive(true);
 
             pgPileManager.save(pgPile);
+            code="200";
             result="true";
             msg="保存成功";
         } catch (Exception e) {
@@ -47,9 +49,10 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
+
         return resultMap;
     }
 
@@ -64,9 +67,10 @@
         Map<String,Object> resultMap=new HashMap<>();
         List<PgPileDTO> pgPileDTOList=new ArrayList<>();
         String msg="";
+        String code="0";
         try{
             pgPileDTOList=pgPileManager.getPgPileDTOList();
-
+            code="200";
             msg="获取成功";
         }
         catch(Exception ex){
@@ -74,8 +78,9 @@
             msg="获取成失败";
             ex.printStackTrace();
         }
-        resultMap.put("result",pgPileDTOList);
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
+        resultMap.put("result",pgPileDTOList);
 
         return resultMap;
     }
@@ -91,6 +96,7 @@
 
         String result="";
         String msg="";
+        String code="0";
         try{
             PgPile pgPile=pgPileManager.get(id);
             if(pgPile==null){
@@ -101,7 +107,7 @@
             {
                 pgPile.setActive(false);
                 pgPileManager.save(pgPile);
-
+                code="200";
                 result="true";
                 msg="桩号删除成功";
             }
@@ -111,9 +117,9 @@
             msg="桩号删除失败";
             ex.printStackTrace();
         }
-
-        resultMap.put("result",result);
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
+        resultMap.put("result",result);
 
         return resultMap;
     }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
index 6ee63ff..63b5597 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
@@ -53,10 +53,12 @@
         try {
                resultMap = pgPipeLineManager.addPipeLine(lineCode,lineType,secRow,secColumn,pileAcuList);
                resultMap.put("msg","提交成功");
+               resultMap.put("code","200");
                resultMap.put("result","true");
 
         } catch (Exception e) {
             e.printStackTrace();
+            resultMap.put("code","0");
             resultMap.put("result","false");
             resultMap.put("msg","提交失败");
             return  resultMap;
@@ -74,14 +76,17 @@
     public Map<String, Object> getPipeLineByLineType(@FormParam("lineType") String lineType) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgPipeLineDto> pgPipeLineDtoList=new ArrayList<PgPipeLineDto>();
         try {
             pgPipeLineDtoList = pgPipeLineManager.getPipeLineByLineType(lineType);
+            code="200";
             msg = "获取成功";
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgPipeLineDtoList);
         return resultMap;
@@ -96,6 +101,7 @@
     public Map<String, Object> getPipeLineByName(@FormParam("lineCode") String lineCode) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         PgPipeLineDto pgPipeLineDto=null;
         try {
             PgPipeLine pgPipeLine = pgPipeLineManager.getPipeLineBylineName(lineCode);
@@ -103,12 +109,14 @@
                 msg="不存在："+lineCode;
             else {
                 pgPipeLineDto = new PgPipeLineDto(pgPipeLine);
+                code="200";
                 msg = "获取成功";
             }
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgPipeLineDto);
         return resultMap;
@@ -123,15 +131,18 @@
     public Map<String,Object> getPipeLengthStatic()throws Exception{
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         List<PgPipeLineLengthStatic> pgPipeLineLengthStaticList=new ArrayList<PgPipeLineLengthStatic>();
         try {
             pgPipeLineLengthStaticList = pgPipeLineManager.getPipeLengthByName();
+            code="200";
             msg="管线长度获取成功";
         }catch(Exception e)
         {
             e.printStackTrace();
             msg="管线长度统计失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgPipeLineLengthStaticList);
 
@@ -147,14 +158,17 @@
     public Map<String, Object> getPipeLineType() throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgPipeLineTypeDto> pgPipeLineTypeDtoList=new ArrayList<PgPipeLineTypeDto>();
         try {
             pgPipeLineTypeDtoList = pgPipeLineManager.getPipeType();
+            code="200";
             msg = "获取成功";
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgPipeLineTypeDtoList);
         return resultMap;
@@ -170,20 +184,24 @@
         Map<String,Object> resultMap=new HashMap<String, Object>();
 
         String msg="";
+        String code="0";
         List<PgPipeLineTypeNumDto> pgPipeLineTypeNumDtoList=new ArrayList<PgPipeLineTypeNumDto>();
 
-        try{
-            pgPipeLineTypeNumDtoList=pgPipeLineManager.getPipeTypeNum();
+        try {
+            pgPipeLineTypeNumDtoList = pgPipeLineManager.getPipeTypeNum();
 
-            if(pgPipeLineTypeNumDtoList==null)
-                msg="不存在管线类型占比";
-            else
-                msg="管线占比获取成功";
+            if (pgPipeLineTypeNumDtoList == null)
+                msg = "不存在管线类型占比";
+            else {
+                code="200";
+                msg = "管线占比获取成功";
+            }
         }
         catch (Exception e){
             msg="管线占比数量获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgPipeLineTypeNumDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java
index 672b376..7042994 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java
@@ -43,17 +43,21 @@
     public Map<String,Object> getReservePlan() {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgReservePlanDto> pgReservePlanDtoList = new ArrayList<PgReservePlanDto>();
         try {
             pgReservePlanDtoList = pgReservePlanManager.getPgReservePlanDto();
             if (pgReservePlanDtoList == null)
                 msg = "不存在预案信息";
-            else
+            else {
+                code="200";
                 msg = "预案信息获取成功";
-        } catch (Exception e) {
+            }
+        }catch (Exception e) {
             e.printStackTrace();
             msg = "预案信息获取是失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgReservePlanDtoList);
         return resultMap;
@@ -66,6 +70,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
 
         String msg = "";
+        String code="0";
         ResponseEntity<byte[]> path = null;
         try {
             PgReservePlan pgReservePlan = pgReservePlanManager.get(Long.valueOf(id));
@@ -73,15 +78,17 @@
 
             if (path == null)
                 msg = "不存在该文档";
-            else
+            else {
+                code="200";
                 msg = "下载成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "下载失败";
         }
-
-        resultMap.put("result", path.getBody());
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", path.getBody());
         return resultMap;
     }
     /*
@@ -99,6 +106,7 @@
         Map<String,Object> resultMap=new HashMap<String, Object>();
         String msg="";
         String result="";
+        String code="0";
 
         try {
             PgReservePlan pgReservePlan = new PgReservePlan();
@@ -124,6 +132,7 @@
                 pgReservePlanManager.save(pgReservePlan);
                 msg = "新增成功";
                 result = "true";
+                code="200";
             }
         }
         catch(Exception e)
@@ -133,6 +142,7 @@
             result="false";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -152,6 +162,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             PgReservePlan pgReservePlan=pgReservePlanManager.get(Long.valueOf(id));
@@ -177,6 +188,7 @@
 
                     pgReservePlanManager.save(pgReservePlan);
 
+                    code="200";
                     result = "true";
                     msg = "编辑成功";
                 }
@@ -187,6 +199,7 @@
             msg = "编辑失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -201,6 +214,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
         String result="";
+        String code="0";
 
         try{
 
@@ -214,6 +228,7 @@
                 pgReservePlan.setActive(0);;
                 pgReservePlanManager.save(pgReservePlan);
                 result="true";
+                code="200";
                 msg="删除成功";
             }
         }
@@ -224,6 +239,7 @@
             result="false";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java b/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java
index 8f049c8..3c48a8d 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java
@@ -42,19 +42,22 @@
         Map<String,Object> resultMap=new HashMap<String, Object>();
 
         String msg="";
+        String code="0";
         List<PgRoadDto> pgRoadDtoList=new ArrayList<PgRoadDto>();
-        try{
+        try {
             pgRoadDtoList = pgRoadManager.getAllRoad();
             if (pgRoadDtoList.size() == 0)
                 msg = "没有道路信息";
-            else
+            else {
+                code="200";
                 msg = "道路信息获取成功";
+            }
         }
         catch(Exception e){
             msg="道路信息获取失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgRoadDtoList);
 
@@ -71,6 +74,7 @@
         Map<String,Object> resultMap=new HashMap<String, Object>();
         String msg="";
         String result="";
+        String code="0";
 
         try{
             PgRoad pgRoad=new PgRoad();
@@ -78,7 +82,7 @@
             pgRoad.setActive(1);
 
             pgRoadManager.save(pgRoad);
-
+            code="200";
             msg="新增道路成功";
             result="true";
         }
@@ -87,7 +91,7 @@
             result="true";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -107,6 +111,7 @@
 
         String msg="";
         String result="";
+        String code="0";
 
         try {
             PgRoad pgRoad=pgRoadManager.get(Long.valueOf(id));
@@ -123,6 +128,7 @@
                 pgRoadManager.save(pgRoad);
                 msg="道路信息保存成功";
                 result="true";
+                code="200";
             }
         }
         catch(Exception e){
@@ -130,6 +136,7 @@
             result="false";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -147,6 +154,7 @@
 
         String msg="";
         String result="";
+        String code="0";
         PgRoad pgRoad=null;
 
         try{
@@ -159,6 +167,7 @@
                 pgRoad.setActive(0);
                 pgRoadManager.save(pgRoad);
                 msg="道路删除成功";
+                code="200";
                 result="true";
             }
         }
@@ -168,6 +177,7 @@
             e.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -184,26 +194,29 @@
         Map<String,Object> resultMap=new HashMap<String, Object>();
         String msg="";
         String result="";
+        String code="0";
 
         List<PgPartitionDto> pgPartitionDtoList=null;
         try{
             PgRoad pgRoad=pgRoadManager.getPgRoadByName(roadName);
             if(pgRoad==null)
                 msg="不存在道路信息";
-            else
-            {
-                pgPartitionDtoList=pgPartitionManager.getPgPartitonDtoByRoad(pgRoad);
-                if(pgPartitionDtoList==null||pgPartitionDtoList.size()==0)
-                    msg="该道路没有分区信息";
-                else
-                    msg="分区信息获取成功";
+            else {
+                pgPartitionDtoList = pgPartitionManager.getPgPartitonDtoByRoad(pgRoad);
+                if (pgPartitionDtoList == null || pgPartitionDtoList.size() == 0)
+                    msg = "该道路没有分区信息";
+                else {
+                    code="200";
+                    msg = "分区信息获取成功";
+                }
             }
         }
         catch (Exception e)
         {
+            e.printStackTrace();
             msg="分区信息获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgPartitionDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java b/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java
index 90d709a..7a713bf 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java
@@ -42,17 +42,21 @@
     public Map<String,Object> getRoleList() {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgRoleDto> pgRoleDtoList = new ArrayList<PgRoleDto>();
         try {
             pgRoleDtoList = pgRoleManager.getPgRoleDtoList();
             if (pgRoleDtoList == null)
                 msg = "不存在角色信息";
-            else
+            else {
+                code="200";
                 msg = "角色信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "角色信息获取是失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgRoleDtoList);
         return resultMap;
@@ -69,6 +73,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try{
             PgAuthority pgAuthority=pgAuthorityManager.getAuthorityByAuthority(authority);
@@ -79,6 +84,7 @@
 
             pgRoleManager.save(pgRole);
             msg="用户角色保存成功";
+            code="200";
             result="true";
         }
         catch(Exception e) {
@@ -86,6 +92,7 @@
             msg = "新增角色失败";
             result = "false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -104,6 +111,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         try {
             PgRole pgRole = pgRoleManager.get(Long.valueOf(id));
 
@@ -112,6 +120,7 @@
             pgRole.setPgAuthorityId(pgAuthority);
             pgRoleManager.save(pgRole);
 
+            code="200";
             msg="角色保存成功";
             result="true";
         }
@@ -122,6 +131,7 @@
             result="false";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -138,7 +148,8 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
-        String result="false";
+        String result="";
+        String code="0";
 
         try {
             PgRole pgRole= pgRoleManager.get(Long.valueOf(id));
@@ -152,12 +163,14 @@
                 pgRoleManager.save(pgRole);
                 msg="删除角色成功";
                 result="true";
+                code="200";
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="删除角色失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java b/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java
index 0e413b8..d146811 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java
@@ -38,6 +38,7 @@
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
         String result="";
+        String code="0";
         PgRoad pgRoad=pgRoadManager.getPgRoadByName(road);
 
         try{
@@ -55,13 +56,14 @@
             pgSectionManager.save(pgSection);
             msg="截面信息保存成功";
             result="true";
+            code="200";
         }
         catch(Exception ex){
             msg="界面信息保存失败";
             result="false";
             ex.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -77,6 +79,7 @@
 
         String msg="";
         String result="";
+        String code="0";
 
         try{
             PgSection pgSection=pgSectionManager.get(id);
@@ -84,6 +87,7 @@
             pgSection.setActive(false);
             pgSectionManager.save(pgSection);
 
+            code="200";
             msg="截面删除成功";
             result="true";
         }
@@ -92,7 +96,7 @@
             result="false";
             ex.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -107,16 +111,19 @@
         Map<String,Object> resultMap=new HashMap<>();
         List<PgLineType> pgLineTypeList=new ArrayList<>();
         String msg="";
+        String code="0";
 
         try{
             pgLineTypeList=pgSectionManager.getLineType();
             msg="获取成功";
+            code="200";
         }
         catch(Exception ex){
             ex.printStackTrace();
             msg="获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgLineTypeList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgShRs.java b/src/main/java/com/casic/PgInterface/rs/PgShRs.java
index 1e35f4b..323c82f 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgShRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgShRs.java
@@ -45,23 +45,27 @@
                                                      @FormParam("endDate") String endDate)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgHistoryDataDto> pgHistoryDataDtoList=new ArrayList<>();
 
         try {
             PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
                 msg="设备不存在";
-            else{
-                pgHistoryDataDtoList=pgShManager.getAllShData(pgDevice, startDate, endDate);
-                if(pgHistoryDataDtoList==null)
-                    msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+            else {
+                pgHistoryDataDtoList = pgShManager.getAllShData(pgDevice, startDate, endDate);
+                if (pgHistoryDataDtoList == null)
+                    msg = "没有满足要求的数据";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgHistoryDataDtoList);
         return resultMap;
@@ -77,23 +81,27 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         PgShDto pgShDto=new PgShDto(null);
 
         try {
             PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
                 msg="设备不存在";
-            else{
-                pgShDto=pgShManager.getNewestShData(pgDevice);
-                if(pgShDto==null)
-                    msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+            else {
+                pgShDto = pgShManager.getNewestShData(pgDevice);
+                if (pgShDto == null)
+                    msg = "没有满足要求的数据";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgShDto);
         return resultMap;
@@ -111,6 +119,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
@@ -128,6 +137,7 @@
 
                 pgShManager.save(pgSh);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
         } catch (Exception e) {
@@ -135,9 +145,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java b/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java
index a23b2da..76023a9 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java
@@ -43,23 +43,27 @@
                                                       @FormParam("endDate") String endDate)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgHistoryTempDto> pgHistoryTempDtoList=new ArrayList<>();
 
         try {
             PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
                 msg="设备不存在";
-            else{
-                pgHistoryTempDtoList=pgTempHumManager.getAllTempHumData(pgDevice, startDate, endDate);
-                if(pgHistoryTempDtoList==null)
-                    msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+            else {
+                pgHistoryTempDtoList = pgTempHumManager.getAllTempHumData(pgDevice, startDate, endDate);
+                if (pgHistoryTempDtoList == null)
+                    msg = "没有满足要求的数据";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgHistoryTempDtoList);
         return resultMap;
@@ -75,23 +79,27 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         PgTempHumDto pgTempHumDto=new PgTempHumDto(null);
 
         try {
             PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
                 msg="设备不存在";
-            else{
-                pgTempHumDto=pgTempHumManager.getNewestTempHumData(pgDevice);
-                if(pgTempHumDto==null)
-                    msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+            else {
+                pgTempHumDto = pgTempHumManager.getNewestTempHumData(pgDevice);
+                if (pgTempHumDto == null)
+                    msg = "没有满足要求的数据";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgTempHumDto);
         return resultMap;
@@ -110,6 +118,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         try {
@@ -127,6 +136,7 @@
 
                 pgTempHumManager.save(pgTempHum);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
         } catch (Exception e) {
@@ -135,8 +145,10 @@
             e.printStackTrace();
         }
 
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
+
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgUserRs.java b/src/main/java/com/casic/PgInterface/rs/PgUserRs.java
index 73895f5..ff814a1 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgUserRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgUserRs.java
@@ -42,17 +42,21 @@
     public Map<String, Object> getUserList()throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgUserDto> pgUserDtoList=new ArrayList<PgUserDto>();
         try {
             pgUserDtoList = pgUserManager.getAllUser();
             if(pgUserDtoList.size()==0)
                 msg="没有找到人员信息";
-            else
-                msg="获取成功";
+            else {
+                code="200";
+                msg = "获取成功";
+            }
         }catch(Exception e){
             e.printStackTrace();
             msg="获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgUserDtoList);
         return resultMap;
@@ -74,6 +78,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             PgRole pgRole=pgRoleManager.getPgRoleByRole(role);
@@ -94,10 +99,10 @@
                 else
                     pgUser.setRoleId(pgRole.getId());
                 pgUser.setActive(1);
-                logger.info("成功保存");
 
                 pgUserManager.save(pgUser);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
         } catch (Exception e) {
@@ -106,6 +111,7 @@
             e.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -129,6 +135,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
         try {
 
             PgRole pgRole=pgRoleManager.getPgRoleByRole(role);
@@ -145,8 +152,8 @@
                 pgUser.setRoleId(pgRole.getId());
             pgUserManager.save(pgUser);
             result = "true";
+            code="200";
             msg = "编辑成功";
-            //}
         } catch (Exception e) {
             result = "false";
             msg = "编辑失败";
@@ -166,9 +173,10 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> deleteUser(@FormParam("id") String id)throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
-        String result="false";
+        String result="";
+        String code="0";
 
         try {
             PgUser pgUser= pgUserManager.get(Long.valueOf(id));
@@ -180,6 +188,7 @@
             {
                 pgUser.setActive(0);
                 pgUserManager.save(pgUser);
+                code="200";
                 msg="删除人员成功";
                 result="true";
             }
@@ -188,6 +197,7 @@
             msg="删除人员失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -204,13 +214,14 @@
         Map<String,Object> resultMap=new HashMap<String, Object>();
         String msg="";
         String result="";
-
+        String code="0";
         try{
             PgUserDto pgUserDto=pgUserManager.signIn(userName,passWord);
 
             if(pgUserDto==null)
                 msg="false";
             else {
+                code="200";
                 msg="true";
                 result=pgUserDto.getRole();
             }
@@ -220,6 +231,7 @@
             e.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java b/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java
index 71ad0ae..3998c67 100644
--- a/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java
@@ -45,6 +45,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         PipeGallery pipeGallery = new PipeGallery();
         try {
 
@@ -58,6 +59,7 @@
                 logger.info("成功保存");
                 pipeGalleryManager.save(pipeGallery);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
 
@@ -67,6 +69,7 @@
             e.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -85,6 +88,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         PipeGallery pipeGallery=new PipeGallery();
         try {
@@ -97,12 +101,14 @@
 
             pipeGalleryManager.save(pipeGallery);
             result = "true";
+            code="200";
             msg = "编辑成功";
         } catch (Exception e) {
             result = "false";
             msg = "编辑失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("result",result);
         resultMap.put("msg",msg);
         return resultMap;
@@ -118,7 +124,8 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
-        String result="false";
+        String result="";
+        String code="0";
 
         try {
             PipeGallery pipeGallery=pipeGalleryManager.get(Long.valueOf(id));
@@ -132,12 +139,14 @@
                 pipeGalleryManager.save(pipeGallery);
                 msg="管廊删除成功";
                 result="true";
+                code="200";
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="管廊删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -151,13 +160,15 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> getPgLengthStatic()
     {
-        Map<String,Object> resultMap=new HashMap<String, Object>();
+        Map<String,Object> resultMap=new HashMap<>();
         List<PipeGalleryStatic> pipeGalleryStaticList=new ArrayList<PipeGalleryStatic>();
         String msg="";
+        String code="0";
 
         try{
             pipeGalleryStaticList=pipeGalleryManager.getPgLengthByName();
 
+            code="200";
             msg="仓体长度获取成功";
         }
         catch(Exception e)
@@ -165,7 +176,7 @@
             e.printStackTrace();
             msg="仓体长度获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pipeGalleryStaticList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java b/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java
index 5c95409..0ce205f 100644
--- a/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java
@@ -43,14 +43,12 @@
 
         try {
 
-
             msg = "获取成功";
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
         resultMap.put("msg", msg);
-        //resultMap.put("result", );
         return resultMap;
     }
     /*
@@ -88,16 +86,18 @@
             throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=new ArrayList<PgDeviceTypeStatisticDto>();
 
         try {
             pgDeviceTypeStatisticDtoList=pgDeviceManager.getDeviceStatisticByDevType();
-
+            code="200";
             msg = "获取成功";
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceTypeStatisticDtoList);
         return resultMap;

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 25ded8a..283d7ab 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,20 +7,56 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" 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/construction/manager/PgCsDocumentManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/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/manager/PgAlarmManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/~$说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/~$说明20191207.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.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$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/接口说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明20191207.docx" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
@@ -51,7 +87,7 @@
         <counts>
           <entry key="class" value="4" />
           <entry key="iml" value="2" />
-          <entry key="java" value="707" />
+          <entry key="java" value="820" />
           <entry key="properties" value="14" />
           <entry key="xml" value="7" />
         </counts>
@@ -60,7 +96,7 @@
         <counts>
           <entry key="CLASS" value="4" />
           <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="707" />
+          <entry key="JAVA" value="820" />
           <entry key="Properties" value="14" />
           <entry key="XML" value="7" />
         </counts>
@@ -68,32 +104,32 @@
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
           <entry key="dummy" value="38" />
-          <entry key="java" value="30161" />
+          <entry key="java" value="40859" />
           <entry key="properties" value="100" />
-          <entry key="txt" value="176" />
+          <entry key="txt" value="186" />
           <entry key="xml" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="30161" />
-          <entry key="PLAIN_TEXT" value="214" />
+          <entry key="JAVA" value="40859" />
+          <entry key="PLAIN_TEXT" value="224" />
           <entry key="Properties" value="100" />
           <entry key="XML" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="48" />
+          <entry key="project.closed" value="51" />
           <entry key="project.open.time.1" value="5" />
           <entry key="project.open.time.12" value="2" />
           <entry key="project.open.time.13" value="1" />
           <entry key="project.open.time.15" value="1" />
           <entry key="project.open.time.16" value="1" />
           <entry key="project.open.time.17" value="1" />
-          <entry key="project.open.time.2" value="1" />
+          <entry key="project.open.time.2" value="2" />
           <entry key="project.open.time.20" value="1" />
-          <entry key="project.open.time.23" value="1" />
+          <entry key="project.open.time.23" value="2" />
           <entry key="project.open.time.24" value="2" />
           <entry key="project.open.time.251" value="1" />
           <entry key="project.open.time.27" value="2" />
@@ -106,8 +142,8 @@
           <entry key="project.open.time.36" value="1" />
           <entry key="project.open.time.37" value="1" />
           <entry key="project.open.time.39" value="2" />
-          <entry key="project.open.time.4" value="2" />
-          <entry key="project.open.time.40" value="1" />
+          <entry key="project.open.time.4" value="3" />
+          <entry key="project.open.time.40" value="2" />
           <entry key="project.open.time.41" value="2" />
           <entry key="project.open.time.42" value="2" />
           <entry key="project.open.time.43" value="2" />
@@ -122,23 +158,25 @@
           <entry key="project.open.time.6" value="3" />
           <entry key="project.open.time.63" value="2" />
           <entry key="project.open.time.64" value="1" />
+          <entry key="project.open.time.66" value="1" />
           <entry key="project.open.time.71" value="2" />
+          <entry key="project.open.time.74" value="1" />
           <entry key="project.open.time.76" value="1" />
           <entry key="project.open.time.8" value="2" />
           <entry key="project.open.time.9" value="1" />
           <entry key="project.open.time.97" value="1" />
-          <entry key="project.opened" value="78" />
+          <entry key="project.opened" value="84" />
         </counts>
       </usages-collector>
     </session>
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+            <state relative-caret-position="396">
+              <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
               <folding>
                 <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
                 <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -147,73 +185,6 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <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="99">
-              <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-              <folding>
-                <element signature="imports" expanded="true" />
-                <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-1170">
-              <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state>
-              <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
-              <folding>
-                <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-                <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="true">
-        <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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-              <folding>
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-                <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>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <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="352">
-              <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -225,18 +196,9 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>inCriteria</find>
-      <find>getPgPlanResulList</find>
-      <find>getPileAcuListByPileAcuStr</find>
-      <find>distinct</find>
-      <find>order</find>
-      <find>canPlanLine</find>
-      <find>isExistLine</find>
-      <find>getPlanResult</find>
       <find>pgPipeLine</find>
       <find>getPipeLineBylineName</find>
       <find>StringU</find>
-      <find>getAllAlarm</find>
       <find>getAlarmList</find>
       <find>getPgInPersonListByDay</find>
       <find>getDayInPgStatistic</find>
@@ -254,7 +216,16 @@
       <find>getPgContructionByNameOrType</find>
       <find>&quot;&quot;,&quot;&quot;,</find>
       <find>getPgContructionDtoByNameOrType</find>
+      <find>addConstruction</find>
+      <find>getPgLineAcuHole</find>
+      <find>getPlanResult</find>
       <find>getConstruction</find>
+      <find>addPipeLine</find>
+      <find>未找到入廊数据</find>
+      <find>getCurrentHoleByAcu</find>
+      <find>getAllAlarm</find>
+      <find>getPgDeviceDtoListByPartition</find>
+      <find>getPgDeviceByDevType</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -263,57 +234,57 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlan.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileHoleManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/planData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/PlanData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
       </list>
     </option>
   </component>
@@ -359,7 +330,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -421,53 +391,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="dto" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="manager" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -479,29 +402,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="rs" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -516,6 +416,7 @@
         </subPane>
       </pane>
       <pane id="Scope" />
+      <pane id="PackagesPane" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -710,7 +611,13 @@
       <workItem from="1574902733573" duration="1829000" />
       <workItem from="1574998240004" duration="7016000" />
       <workItem from="1575247959683" duration="6997000" />
-      <workItem from="1575704345590" duration="40473000" />
+      <workItem from="1575704345590" duration="69381000" />
+      <workItem from="1575869479666" duration="721000" />
+      <workItem from="1575947104878" duration="6101000" />
+      <workItem from="1576128264436" duration="3347000" />
+      <workItem from="1576208571543" duration="22000" />
+      <workItem from="1576227513917" duration="862000" />
+      <workItem from="1576293721220" duration="18246000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -817,11 +724,18 @@
       <option name="project" value="LOCAL" />
       <updated>1575775489149</updated>
     </task>
-    <option name="localTasksCounter" value="16" />
+    <task id="LOCAL-00016" summary="整改施工信息">
+      <created>1575791780774</created>
+      <option name="number" value="00016" />
+      <option name="presentableId" value="LOCAL-00016" />
+      <option name="project" value="LOCAL" />
+      <updated>1575791780774</updated>
+    </task>
+    <option name="localTasksCounter" value="17" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="452131000" />
+    <option name="totallyTimeSpent" value="510338000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -834,9 +748,8 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
-    <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.24205749" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2647504" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -847,7 +760,7 @@
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.3295082" />
       <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.4819672" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.65737706" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.3295082" />
@@ -939,7 +852,8 @@
     <MESSAGE value="重新设计智能规划部分" />
     <MESSAGE value="完成智能规划对接" />
     <MESSAGE value="修改报警统计" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改报警统计" />
+    <MESSAGE value="整改施工信息" />
+    <option name="LAST_COMMIT_MESSAGE" value="整改施工信息" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -951,16 +865,10 @@
           <option name="timeStamp" value="3" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java</url>
-          <line>69</line>
+          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java</url>
+          <line>40</line>
           <properties />
-          <option name="timeStamp" value="21" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java</url>
-          <line>96</line>
-          <properties />
-          <option name="timeStamp" value="38" />
+          <option name="timeStamp" value="122" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
@@ -970,394 +878,452 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <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="2068">
-          <caret line="154" column="35" selection-start-line="154" selection-start-column="35" selection-end-line="154" selection-end-column="35" />
-        </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="3300">
-          <caret line="297" column="22" selection-start-line="297" selection-start-column="22" selection-end-line="297" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/StringUtils.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
-          <caret line="13" column="48" lean-forward="true" selection-start-line="13" selection-start-column="48" selection-end-line="13" selection-end-column="48" />
+          <caret line="11" column="5" selection-start-line="11" selection-start-column="5" selection-end-line="11" selection-end-column="5" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="78" lean-forward="true" selection-start-line="78" selection-end-line="78" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="616">
-          <caret line="41" column="1" selection-start-line="41" selection-start-column="1" selection-end-line="41" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="110">
-          <caret line="12" column="23" selection-start-line="12" selection-start-column="23" selection-end-line="12" selection-end-column="23" />
+        <state relative-caret-position="516">
+          <caret line="114" column="12" selection-start-line="114" selection-start-column="12" selection-end-line="114" selection-end-column="12" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="164">
-          <caret line="56" lean-forward="true" selection-start-line="56" selection-end-line="56" />
+        <state relative-caret-position="418">
+          <caret line="33" column="44" selection-start-line="33" selection-start-column="44" selection-end-line="33" selection-end-column="44" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="258">
-          <caret line="27" column="12" lean-forward="true" selection-start-line="27" selection-start-column="12" selection-end-line="27" selection-end-column="12" />
+        <state relative-caret-position="132">
+          <caret line="11" column="20" lean-forward="true" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="20" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.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="-12">
-          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        <state relative-caret-position="516">
+          <caret line="142" column="54" selection-start-line="142" selection-start-column="54" selection-end-line="142" selection-end-column="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="858">
-          <caret line="55" column="27" lean-forward="true" selection-start-line="55" selection-start-column="27" selection-end-line="55" selection-end-column="27" />
+        <state relative-caret-position="66">
+          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="58">
+          <caret line="18" column="28" selection-start-line="18" selection-start-column="19" selection-end-line="18" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="305">
+          <caret line="24" column="31" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="714">
+          <caret line="58" column="5" lean-forward="true" selection-start-line="58" selection-start-column="5" selection-end-line="58" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="924">
+          <caret line="134" column="92" selection-start-line="134" selection-start-column="92" selection-end-line="134" selection-end-column="92" />
+          <folding>
+            <element signature="method#linkDevice#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkPartitionCamera#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkReservePlan#0;class#PgAlarmLinkRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1066">
+          <caret line="90" lean-forward="true" selection-start-line="90" selection-end-line="90" />
+          <folding>
+            <element signature="method#getTjResultByAlarmType#0;class#PgAlarmTjRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="946">
+          <caret line="148" column="11" lean-forward="true" selection-start-line="148" selection-start-column="11" selection-end-line="148" selection-end-column="11" />
+          <folding>
+            <element signature="method#getAlarmTypeList#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#addAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#editAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#deleteAlarmType#0;class#PgAlarmTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="208">
+          <caret line="46" column="23" lean-forward="true" selection-start-line="46" selection-start-column="23" selection-end-line="46" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="113" column="9" lean-forward="true" selection-start-line="113" selection-start-column="9" selection-end-line="113" selection-end-column="9" />
+          <folding>
+            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
+            <element signature="method#getNewestCh4InfoByDev#0;class#PgCh4Rs#0" />
+            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="145" column="6" lean-forward="true" selection-start-line="145" selection-start-column="6" selection-end-line="145" selection-end-column="6" />
+          <folding>
+            <element signature="method#addAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#editAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#deleteAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#getAuthorityList#0;class#PgAuthorityRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="58" column="1" lean-forward="true" selection-start-line="58" selection-start-column="1" selection-end-line="58" selection-end-column="1" />
+          <folding>
+            <element signature="method#getPgAssetPlanList#0;class#PgAssetPlanRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="370">
+          <caret line="371" column="66" selection-start-line="371" selection-start-column="66" selection-end-line="371" selection-end-column="66" />
+          <folding>
+            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#searchConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionDev#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="139" column="13" lean-forward="true" selection-start-line="139" selection-start-column="13" selection-end-line="139" selection-end-column="13" />
+          <folding>
+            <element signature="method#getCoInfoByDevAndDate#0;class#PgCoRs#0" />
+            <element signature="method#getNewestCoInfoByDev#0;class#PgCoRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="540">
+          <caret line="223" column="5" lean-forward="true" selection-start-line="223" selection-start-column="5" selection-end-line="223" selection-end-column="5" />
+          <folding>
+            <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="682">
+          <caret line="100" lean-forward="true" selection-start-line="100" selection-end-line="100" />
+          <folding>
+            <element signature="method#getDeviceTpeyList#0;class#PgDeviceTypeRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="377">
+          <caret line="225" column="35" selection-start-line="225" selection-start-column="35" selection-end-line="225" selection-end-column="35" />
+          <folding>
+            <element signature="method#addEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#addEquipment#1;class#PgEquipmentRs#0" />
+            <element signature="method#getEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#deleteEquipment#0;class#PgEquipmentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="406">
+          <caret line="109" lean-forward="true" selection-start-line="109" selection-end-line="109" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="154">
+          <caret line="28" column="19" selection-start-line="28" selection-start-column="19" selection-end-line="28" selection-end-column="19" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="748">
-          <caret line="49" column="5" lean-forward="true" selection-start-line="49" selection-start-column="5" selection-end-line="49" selection-end-column="5" />
+        <state relative-caret-position="296">
+          <caret line="161" column="35" selection-start-line="161" selection-start-column="35" selection-end-line="161" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="384">
+          <caret line="99" column="5" lean-forward="true" selection-start-line="99" selection-start-column="5" selection-end-line="99" selection-end-column="5" />
+        </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="362">
+          <caret line="340" column="35" selection-start-line="340" selection-start-column="35" selection-end-line="340" selection-end-column="35" />
+          <folding>
+            <element signature="method#addInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPersonInPg#0;class#PgInPgPersonRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-606">
+          <caret line="76" column="20" lean-forward="true" selection-start-line="76" selection-start-column="20" selection-end-line="76" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="65" column="35" selection-start-line="65" selection-start-column="35" selection-end-line="65" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="101" column="35" selection-start-line="101" selection-start-column="35" selection-end-line="101" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="84" column="35" selection-start-line="84" selection-start-column="35" selection-end-line="84" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="59" lean-forward="true" selection-start-line="59" selection-end-line="59" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="60" column="1" lean-forward="true" selection-start-line="60" selection-start-column="1" selection-end-line="60" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="145" column="35" selection-start-line="145" selection-start-column="35" selection-end-line="145" selection-end-column="35" />
+        </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="274">
+          <caret line="350" column="35" selection-start-line="350" selection-start-column="35" selection-end-line="350" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="121" column="39" selection-start-line="121" selection-start-column="39" selection-end-line="121" selection-end-column="39" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="28" column="8" lean-forward="true" selection-start-line="28" selection-start-column="8" selection-end-line="28" selection-end-column="8" />
+        <state relative-caret-position="340">
+          <caret line="103" selection-start-line="103" selection-end-line="103" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="226" column="35" selection-start-line="226" selection-start-column="35" selection-end-line="226" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="203" column="35" selection-start-line="203" selection-start-column="35" selection-end-line="203" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="241" column="35" selection-start-line="241" selection-start-column="35" selection-end-line="241" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="225" column="1" lean-forward="true" selection-start-line="225" selection-start-column="1" selection-end-line="225" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="176" column="5" lean-forward="true" selection-start-line="176" selection-start-column="5" selection-end-line="176" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="178" column="35" lean-forward="true" selection-start-line="178" selection-start-column="35" selection-end-line="178" selection-end-column="35" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="516">
-          <caret line="94" column="53" selection-start-line="94" selection-start-column="53" selection-end-line="94" selection-end-column="53" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="814">
-          <caret line="52" column="9" lean-forward="true" selection-start-line="52" selection-start-column="9" selection-end-line="52" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="182">
-          <caret line="58" column="12" lean-forward="true" selection-start-line="58" selection-start-column="12" selection-end-line="58" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="34" lean-forward="true" selection-start-line="34" selection-end-line="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="32" lean-forward="true" selection-start-line="32" selection-end-line="32" />
-          <folding>
-            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
-            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="185">
-          <caret line="63" column="13" selection-start-line="63" selection-start-column="13" selection-end-line="63" selection-end-column="13" />
-          <folding>
-            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
-            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
-            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="e#6319#6324#0" />
-            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
-          </folding>
+          <caret line="240" lean-forward="true" selection-start-line="240" selection-end-line="240" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
-          <caret line="58" column="28" lean-forward="true" selection-start-line="58" selection-start-column="28" selection-end-line="58" selection-end-column="28" />
-          <folding>
-            <element signature="method#addTempHumData#0;class#PgTempHumRs#0" />
-          </folding>
+        <state relative-caret-position="340">
+          <caret line="148" column="34" selection-start-line="148" selection-start-column="34" selection-end-line="148" selection-end-column="34" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
+        <state relative-caret-position="458">
+          <caret line="99" column="35" selection-start-line="99" selection-start-column="35" selection-end-line="99" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+        <state relative-caret-position="384">
+          <caret line="145" column="32" lean-forward="true" selection-start-line="145" selection-start-column="32" selection-end-line="145" selection-end-column="32" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="414">
-          <caret line="22" column="46" lean-forward="true" selection-start-line="22" selection-start-column="46" selection-end-line="22" selection-end-column="46" />
-        </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="396">
-          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" column="83" selection-start-line="11" selection-start-column="83" selection-end-line="11" selection-end-column="83" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="26">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
-          <folding>
-            <element signature="method#getPgInPgStatusByPerson#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNumByName#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNum#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPersonListByDay#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPgStatusByPgInPgPerson#0;class#PgInPgStatusManager#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="44">
-          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-12">
-          <caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="87" lean-forward="true" selection-start-line="87" selection-end-line="87" />
-          <folding>
-            <element signature="method#getConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#addConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#deleteConstructionType#0;class#PgConstructionTypeRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
-          <folding>
-            <element signature="method#getConstructionTypeByType#0;class#PgConstructionTypeManager#0" />
-            <element signature="method#getAllConstructionTypeDto#0;class#PgConstructionTypeManager#0" />
-          </folding>
-        </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="145">
-          <caret line="258" column="9" lean-forward="true" selection-start-line="258" selection-start-column="9" selection-end-line="258" selection-end-column="9" />
-          <folding>
-            <element signature="method#getMonthInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayInPgStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgOverViewRs#0" />
-            <element signature="method#getAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getMonthAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayAlarmStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgOverViewRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="103">
-          <caret line="105" column="50" lean-forward="true" selection-start-line="105" selection-start-column="50" selection-end-line="105" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateBasicDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="99">
-          <caret line="125" selection-start-line="125" selection-end-line="125" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="190">
-          <caret line="24" column="35" lean-forward="true" selection-start-line="24" selection-start-column="35" selection-end-line="24" selection-end-column="35" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="436">
-          <caret line="24" lean-forward="true" selection-start-line="24" selection-end-line="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" lean-forward="true" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="300">
-          <caret line="34" column="31" lean-forward="true" selection-start-line="34" selection-start-column="31" selection-end-line="34" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="42" column="13" lean-forward="true" selection-start-line="42" selection-start-column="13" selection-end-line="42" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="120" column="72" lean-forward="true" selection-start-line="120" selection-start-column="72" selection-end-line="120" selection-end-column="72" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="293">
-          <caret line="58" column="73" lean-forward="true" selection-start-line="58" selection-start-column="73" selection-end-line="58" selection-end-column="73" />
-          <folding>
-            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
-            <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
-          </folding>
-        </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="307">
-          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
+        <state relative-caret-position="758">
+          <caret line="130" column="5" lean-forward="true" selection-start-line="130" selection-start-column="5" selection-end-line="130" selection-end-column="5" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1170">
-          <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
+        <state relative-caret-position="494">
+          <caret line="86" column="62" lean-forward="true" selection-start-line="86" selection-start-column="62" selection-end-line="86" selection-end-column="62" />
           <folding>
-            <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-            <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+            <element signature="method#getAllDevice#0;class#PgDeviceManager#0" />
+            <element signature="method#getAllDev#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="195" column="28" lean-forward="true" selection-start-line="195" selection-start-column="28" selection-end-line="195" selection-end-column="28" />
+        <state relative-caret-position="166">
+          <caret line="174" column="13" lean-forward="true" selection-start-line="174" selection-start-column="13" selection-end-line="174" selection-end-column="13" />
           <folding>
-            <element signature="method#getAlarmByTypeAndTime#0;class#PgAlarmManager#0" />
-            <element signature="method#getAlarmNum#0;class#PgAlarmManager#0" />
             <element signature="method#getDayAlarmStatistic#0;class#PgAlarmManager#0" />
+            <element signature="method#getAlarmList#0;class#PgAlarmManager#0" />
             <element signature="method#createDTO#0;class#PgAlarmManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="364">
+          <caret line="46" column="56" lean-forward="true" selection-start-line="46" selection-start-column="56" selection-end-line="46" selection-end-column="56" />
+          <folding>
+            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
+            <element signature="method#getPgDev#0;class#PgDeviceRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
+            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+        <state relative-caret-position="396">
+          <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
           <folding>
             <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
             <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -1365,52 +1331,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="239">
-          <caret line="21" column="33" lean-forward="true" selection-start-line="21" selection-start-column="33" selection-end-line="21" selection-end-column="33" />
-        </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="352">
-          <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-        </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="99">
-          <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-          </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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-          <folding>
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-            <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>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
index c436c93..e913155 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
@@ -132,7 +132,10 @@
             this.setAlarmType("");
         else
             this.setAlarmType(pgAlarm.getAlarmTypeId().getAlarmType());
-        this.setAlarmValue(pgAlarm.getAlarmValue());
+        if(pgAlarm.getAlarmValue()==null)
+            this.setAlarmValue("");
+        else
+            this.setAlarmValue(pgAlarm.getAlarmValue());
         if (pgAlarm.getAlarmDate() != null)
             this.setAlarmDate(sdf.format(pgAlarm.getAlarmDate()));
         else
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
index a43965c..565cb41 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -159,11 +159,21 @@
     }
 
     //获取历史报警消息列表
-    public List<PgAlarmDto> getAllAlarm(String alarmType,String startDay,String endDay,String isNew,int page,int rows) {
-        try {
+    public  Map<String, Object> getAllAlarm(String alarmType,String partition,String startDay,String endDay,String isNew,int page,int rows) {
 
+        Map<String, Object> resultMap = new HashMap<>();
+        String msg="";
+
+        try {
             Criteria criteria = createCriteria(PgAlarm.class);
 
+            if (StringUtils.isNotBlank(partition)) {
+                DetachedCriteria inCriteria = DetachedCriteria.forClass(PgDevice.class);
+                inCriteria.add(Restrictions.eq("partition", partition));
+                inCriteria.setProjection(Property.forName("id"));
+                criteria.add(Property.forName("alarmDevId").in(inCriteria));
+            }
+
             if (StringUtils.isNotBlank(alarmType)&&!alarmType.contains("全部")&&pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
                 criteria.add(Restrictions.eq("alarmTypeId", pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)));
 
@@ -190,8 +200,16 @@
             for (PgAlarm pgAlarm : pgAlarmList) {
                 pgAlarmDtoList.add(new PgAlarmDto(pgAlarm));
             }
-
-            return pgAlarmDtoList;
+            if(pgAlarmDtoList==null||pgAlarmDtoList.size()==0) {
+                resultMap.put("msg", "没有报警信息");
+                resultMap.put("code","0");
+            }else {
+                resultMap.put("code","200");
+                resultMap.put("msg", "报警信息获取成功");
+            }
+            resultMap.put("count",pg.getTotalCount());
+            resultMap.put("result",pgAlarmDtoList);
+            return resultMap;
         }
         catch(Exception ex){
             ex.printStackTrace();
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index 7547560..654f49e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -24,11 +24,11 @@
 
         Criteria criteria = createCriteria(PgDevice.class);
 
-        if(road!=null)
+        if(StringUtils.isNotBlank(road))
             criteria.add(Restrictions.eq("road",road));
-        if(partition!=null)
+        if(StringUtils.isNotBlank(partition))
             criteria.add(Restrictions.eq("partition",partition));
-        if(devType!=null)
+        if(StringUtils.isNotBlank(devType))
             criteria.add(Restrictions.eq("devType",devType));
 
         criteria.add(Restrictions.eq("active", 1));
@@ -43,6 +43,29 @@
         return pgDeviceDtoList;
     }
 
+    public List<PgDeviceDto> getAllDev(String road,String partition,String devType) {
+
+        Criteria criteria = createCriteria(PgDevice.class);
+
+        if(StringUtils.isNotBlank(road))
+            criteria.add(Restrictions.eq("road",road));
+        if(StringUtils.isNotBlank(partition))
+            criteria.add(Restrictions.eq("partition",partition));
+        if(StringUtils.isNotBlank(devType))
+            criteria.add(Restrictions.like("devType","%"+devType+"%"));
+
+        criteria.add(Restrictions.eq("active", 1));
+        criteria.addOrder(Order.desc("id"));
+        List<PgDevice> pgDeviceList = criteria.list();
+
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
+        for (PgDevice pgDevice : pgDeviceList) {
+            pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
+        }
+
+        return pgDeviceDtoList;
+    }
+
     //根据名字获取当前设备
     public PgDevice getDeviceByAssetCode(String assetCode) {
         Criteria criteria=createCriteria(PgDevice.class);
@@ -56,9 +79,9 @@
     }
 
     //根据类型获取设备列表
-    public List<PgDeviceDto> getDeviceByDevTypee(String devType) {
+    public List<PgDeviceDto> getDeviceByDevType(String devType) {
         Criteria criteria=createCriteria(PgDevice.class);
-        criteria.add(Restrictions.eq("devType",devType));
+        criteria.add(Restrictions.like("devType","%"+devType+"%"));
 
         List<PgDevice> pgDeviceList=criteria.list();
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
@@ -106,7 +129,7 @@
         criteria.add(Restrictions.eq("partition",partition));
 
         List<PgDevice> pgDeviceList=criteria.list();
-        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<PgDeviceDto>();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
 
         for (PgDevice pgDevice : pgDeviceList) {
             pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
index 3a3bccd..595730e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
@@ -1,10 +1,13 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.devTable.domain.PgAlarmType;
 import com.casic.PgInterface.devTable.domain.PgPartition;
 import com.casic.PgInterface.devTable.domain.PgRoad;
 import com.casic.PgInterface.devTable.domain.PipeGallery;
 import com.casic.PgInterface.devTable.dto.PgPartitionDto;
+import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
@@ -12,7 +15,9 @@
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Created by yxw on 2017/11/4.
@@ -21,7 +26,8 @@
 public class PgPartitionManager extends HibernateEntityDao<PgPartition> {
 
     @Resource
-    PgRoadManager pgRoadManager;
+    private PgRoadManager pgRoadManager;
+
 
     public PgPartition getPartitionByParName(String parName) {
         Criteria criteria = getSession().createCriteria(PgPartition.class);
@@ -99,4 +105,5 @@
         return pgPartitionDtoList;
     }
 
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
index f216360..a6928f1 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
@@ -5,6 +5,7 @@
 public class PgPlanResultRe {
 
     private String taskKey;
+    private List<String> pileAcuList;
     private List<PgPlanResult> pgPlanResultList;
 
     public String getTaskKey() {
@@ -15,6 +16,14 @@
         this.taskKey = taskKey;
     }
 
+    public List<String> getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(List<String> pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+
     public List<PgPlanResult> getPgPlanResultList() {
         return pgPlanResultList;
     }
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
index 71ea765..47eea07 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
@@ -54,9 +54,7 @@
 
         List<PgLineHole> pgLineHoleList=criteria.list();
         List<PgLineHoleDTO> pgLineHoleDTOList=new ArrayList<>();
-        if(pgLineHoleList==null||pgLineHoleList.size()==0)
-            return null;
-        else
+        if(pgLineHoleList!=null&&pgLineHoleList.size()!=0)
             pgLineHoleDTOList=PgLineHoleDTO.ConvertToDTOList(pgLineHoleList,pgPileAcuManager,pgRoadManager);
         return pgLineHoleDTOList;
     }
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
index 0fd9e1f..841a386 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
@@ -1,12 +1,15 @@
 package com.casic.PgInterface.intelPlan.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.devTable.domain.PgPartition;
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
 import com.casic.PgInterface.intelPlan.domain.PgLineHole;
 import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
 import com.casic.PgInterface.intelPlan.domain.PgSection;
 import com.casic.PgInterface.intelPlan.dto.PgPlanResult;
 import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
 import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -22,6 +25,9 @@
     @Resource
     private PgLineHoleManager pgLineHoleManager;
 
+    @Resource
+    private PgRoadManager pgRoadManager;
+
     public PgPileAcu getPgPileAcuByCode(String acuCode){
         List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
 
@@ -58,7 +64,9 @@
         for(PgPlanTask pgPlanTask:pgPlanTaskList){
             List<PgPlanResult> pgPlanResultList=getPgPlanResultByPlantask(pgPlanTask);
             PgPlanResultRe pgPlanResultRe=new PgPlanResultRe();
+
             pgPlanResultRe.setTaskKey(pgPlanTask.getTaskKey());
+            pgPlanResultRe.setPileAcuList(pgPlanTask.getPileAcuList());
             pgPlanResultRe.setPgPlanResultList(pgPlanResultList);
 
             pgPlanResultReList.add(pgPlanResultRe);
@@ -142,4 +150,57 @@
         return length;
     }
 
+    private PgPileAcu getPgPileAcuByAcuCode(String acuCode){
+        List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
+
+        if(pgPileAcuList==null||pgPileAcuList.size()==0)
+            return null;
+        else
+            return pgPileAcuList.get(0);
+    }
+
+    public List<PgAcuTask> getACUTask(String pileAcuList){
+        String[] acuArray=pileAcuList.split(",");
+        List<PgAcuTask> pgAcuTaskList=new ArrayList<>();
+
+        for(String acu:acuArray){
+            PgPileAcu pgPileAcu=this.getPgPileAcuByCode(acu);
+            String roadName=pgRoadManager.get(pgPileAcu.getRoadId()).getRoadName();
+
+            if(!containRoad(roadName,pgAcuTaskList))
+            {
+                PgAcuTask pgAcuTask=new PgAcuTask();
+                pgAcuTask.setRoadName(roadName);
+                pgAcuTask.setPileAcuList(acu);
+                pgAcuTaskList.add(pgAcuTask);
+            }
+            else{
+                PgAcuTask pgAcuTask=getIndexRoad(roadName,pgAcuTaskList);
+                if(pgAcuTask!=null)
+                    pgAcuTask.setPileAcuList(pgAcuTask.getPileAcuList()+","+acu);
+            }
+        }
+
+        return pgAcuTaskList;
+    }
+
+    private boolean containRoad(String roadName,List<PgAcuTask> pgAcuTaskList){
+        if(pgAcuTaskList==null||pgAcuTaskList.size()==0) return false;
+        for(PgAcuTask pgAcuTask:pgAcuTaskList){
+            if(pgAcuTask.getRoadName().equals(roadName))
+                return true;
+        }
+
+        return false;
+    }
+
+    private PgAcuTask getIndexRoad(String roadName, List<PgAcuTask> pgAcuTaskList){
+        for(PgAcuTask pgAcuTask:pgAcuTaskList){
+            if(pgAcuTask.getRoadName().equals(roadName))
+                return pgAcuTask;
+        }
+
+        return null;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java
new file mode 100644
index 0000000..323f7ef
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java
@@ -0,0 +1,25 @@
+package com.casic.PgInterface.reservePlan.dto;
+
+import java.util.List;
+
+public class PgAcuTask {
+
+    private String roadName;//道路
+    private String pileAcuList;//acu分区
+
+    public String getRoadName() {
+        return roadName;
+    }
+
+    public void setRoadName(String roadName) {
+        this.roadName = roadName;
+    }
+
+    public String getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(String pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
index c25e926..c7d7693 100644
--- a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
@@ -70,9 +70,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(Long.valueOf(inPgPersonId));
         PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("hostName",pgInPgPerson.getAssetCode());
-//        PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode());
-//        long maxId = pgTagPositionManager.getMaxId(pgTagMac.getTagMac());
-//        PGTagPosition pgTagPosition = pgTagPositionManager.get(maxId);
+
         PGTagPosition pgTagPosition = tagmacRun.GetTagStatus(pgTagMac);
         boolean bExist = false;
         bExist = pgTagPositionManager.findTagPosition(pgTagPosition.getPositionUpdatetime(),pgTagPosition.getHostId());
@@ -104,8 +102,7 @@
         PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(Long.valueOf(inPgPersonId));
         PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pgInPgPersonId",pgInPgPerson);
         System.out.println("time:"+pgInPgStatus.getInTime());
-//        PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pgInPgPersonId",inPgPersonId);
-//        PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode());
+
         PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("hostName",pgInPgPerson.getAssetCode());
 
         Map<Object,Object> mapPosition = new HashMap<>();
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
index 082ba5d..3eed00a 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
@@ -48,6 +48,7 @@
     public Map<String, Object> linkDevice(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         PgDeviceDto pgDeviceDto = null;
         try {
@@ -62,6 +63,7 @@
                     else {
                         pgDeviceDto = new PgDeviceDto(pgDevice);
                         msg = "报警关联设备获取成功";
+                        code="200";
                     }
                 }
             }
@@ -71,6 +73,7 @@
             e.printStackTrace();
             msg = "获取关联设备失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceDto);
 
@@ -86,6 +89,7 @@
     public Map<String, Object> linkPartitionCamera(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
         try {
@@ -106,6 +110,7 @@
 
                         pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(partition,position);
                         msg = "关联设备获取成功";
+                        code="200";
                     }
                 }
             }
@@ -115,6 +120,7 @@
             e.printStackTrace();
             msg = "分区设备关联失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceDtoList);
         return resultMap;
@@ -129,6 +135,7 @@
     public Map<String, Object> linkReservePlan(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgReservePlanDto> pgReservePlanDtoList=new ArrayList<>();
         try{
@@ -139,10 +146,12 @@
                 else {
                     pgReservePlanDtoList = pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
 
-                    if(pgReservePlanDtoList==null||pgReservePlanDtoList.size()==0)
-                        msg="不存在关联的报警预案";
-                    else
+                    if (pgReservePlanDtoList == null || pgReservePlanDtoList.size() == 0)
+                        msg = "不存在关联的报警预案";
+                    else {
                         msg = "关联预案获取成功";
+                        code="200";
+                    }
                 }
             }
             else
@@ -153,6 +162,7 @@
             e.printStackTrace();
             msg="预案关联失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgReservePlanDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
index 0ddbc4d..0ce886b 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
@@ -41,25 +41,19 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getAlarmList(@FormParam("alarmType") String alarmType,
                                             @FormParam("startDay") String startDay,
+                                            @FormParam("partition") String partition,
                                             @FormParam("endDay") String endDay,
                                             @FormParam("isNew") String isNew,
                                             @FormParam("page") int page,
                                             @FormParam("rows") int rows) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
         try {
-            pgAlarmDtoList = pgAlarmManager.getAllAlarm(alarmType,startDay,endDay,isNew,page,rows);
-            if (pgAlarmDtoList==null||pgAlarmDtoList.size() == 0)
-                msg = "没有报警信息";
-            else
-                msg = "报警信息获取成功";
+            resultMap = pgAlarmManager.getAllAlarm(alarmType,partition,startDay,endDay,isNew,page,rows);
+
         } catch (Exception e) {
             e.printStackTrace();
-            msg = "报警信息获取失败";
         }
-        resultMap.put("msg", msg);
-        resultMap.put("result", pgAlarmDtoList);
         return resultMap;
     }
 
@@ -71,9 +65,10 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> clearAlarmList(@FormParam("id") String id) throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        String result = "false";
+        String result = "";
+        String code="0";
 
         try {
             PgAlarm pgAlarm = new PgAlarm();
@@ -86,12 +81,14 @@
                 pgAlarmManager.save(pgAlarm);
                 msg = "报警信息清除成功";
                 result = "true";
+                code = "200";
             }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警信息清除失败";
             result = "false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
@@ -106,21 +103,26 @@
     public Map<String, Object> getAlarmByTypeOrTime(@FormParam("alarmType") String alarmType,
                                                     @FormParam("startTime") String startTime,
                                                     @FormParam("endTime") String endTime) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
-        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<PgAlarmDto>();
+        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
         try {
             pgAlarmDtoList = pgAlarmManager.getAlarmByTypeAndTime(alarmType, startTime, endTime);
             if (pgAlarmDtoList == null || pgAlarmDtoList.size() == 0)
                 msg = "报警信息不存在";
             else
+            {
                 msg = "报警信息获取成功";
+                code="200";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警信息获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
index 29ce8a4..ed0bf34 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
@@ -39,8 +39,8 @@
     public Map<String, Object> getAlarmRule(@FormParam("devType") String devType) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
-        System.out.println("devType:"+devType);
         List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<>();
         try {
             pgAlarmRuleDtoList = pgAlarmRuleManager.getAlarmRuleDto(devType);
@@ -52,6 +52,7 @@
             e.printStackTrace();
             msg = "报警阈值信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmRuleDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
index 24ab894..abef1b1 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
@@ -39,16 +39,21 @@
                                                      @FormParam("endDate") String endDate)throws Exception{
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
+
         List<PgAlarmTjDto> pgAlarmTjDtoList=null;
         try{
             pgAlarmTjDtoList=pgAlarmTjManager.getAlarmTjResultByType(startDate,endDate);
             msg="获取成功";
+            code="200";
         }
         catch(Exception ex) {
             msg = "统计失败";
         }
-        resultMap.put("result",pgAlarmTjDtoList);
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
+        resultMap.put("result",pgAlarmTjDtoList);
+
         return resultMap;
     }
 
@@ -61,23 +66,27 @@
     public Map<String, Object> getAlarmByTime(@FormParam("startTime") String startTime,
                                               @FormParam("endTime") String endTime,
                                               @FormParam("statisticType") String statisticType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code = "0";
 
-        List<PgAlarmTjDto> pgAlarmTjDtoList = new ArrayList<PgAlarmTjDto>();
+        List<PgAlarmTjDto> pgAlarmTjDtoList = new ArrayList<>();
         try {
             pgAlarmTjDtoList = pgAlarmTjManager.getAlarmByTime(startTime, endTime, statisticType);
             if(pgAlarmTjDtoList==null)
                 msg="报警统计信息获取失败";
-            else
-                msg="报警统计信息获取成功";
+            else {
+                msg = "报警统计信息获取成功";
+                code="200";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警统计信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmTjDtoList);
         return resultMap;
     }
 
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
index 28bc811..b6278a9 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
@@ -30,7 +30,6 @@
     @Resource
     private PgAlarmTypeManager pgAlarmTypeManager;
 
-
     /**
      * 获取报警类型
      */
@@ -38,19 +37,24 @@
     @Path("getAlarmType")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getAlarmTypeList()throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
-        List<PgAlarmTypeDto> pgAlarmTypeDtoList=new ArrayList<PgAlarmTypeDto>();
+        String code="";
+
+        List<PgAlarmTypeDto> pgAlarmTypeDtoList=new ArrayList<>();
         try {
             pgAlarmTypeDtoList = pgAlarmTypeManager.getAllAlarmTypeDto();
             if(pgAlarmTypeDtoList.size()==0)
                 msg="没有报警类型信息";
-            else
-                msg="报警类型信息获取成功";
+            else {
+                code="200";
+                msg = "报警类型信息获取成功";
+            }
         }catch(Exception e){
             e.printStackTrace();
             msg="报警类型信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAlarmTypeDtoList);
         return resultMap;
@@ -66,6 +70,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
@@ -83,6 +88,7 @@
                 logger.info("成功保存");
                 result = "true";
                 msg = "保存成功";
+                code="200";
             }
         } catch (Exception e) {
             result = "false";
@@ -90,6 +96,7 @@
             e.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -106,6 +113,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try{
             if(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
@@ -119,6 +127,7 @@
                 pgAlarmTypeManager.save(pgAlarmType);
                 result = "true";
                 msg = "编辑成功";
+                code="200";
             }
         }
         catch(Exception e)
@@ -128,6 +137,7 @@
             e.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("result",result);
         resultMap.put("msg",msg);
 
@@ -146,6 +156,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
         String result="false";
+        String code="0";
 
         try {
             PgAlarmType pgAlarmType=pgAlarmTypeManager.get(Long.valueOf(id));
@@ -157,6 +168,7 @@
             {
                 pgAlarmType.setActive(0);
                 pgAlarmTypeManager.save(pgAlarmType);
+                code="200";
                 msg="报警类型删除成功";
                 result="true";
             }
@@ -165,6 +177,7 @@
             msg="报警类型删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
index 4533e1a..85940bb 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
@@ -33,12 +33,15 @@
                                                  @FormParam("inSpectionPlace") String inSpectionPlace){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
         List<PgAssetPlanDto> pgAssetPlanDtoList=new ArrayList<>();
         try{
             pgAssetPlanDtoList=pgAssetPlanManager.getPgAssetPlanDtoList(startDay,endDay,inSpectionPlace);
-            if(pgAssetPlanDtoList!=null&&pgAssetPlanDtoList.size()!=0)
-                msg="巡检信息获取成功";
+            if(pgAssetPlanDtoList!=null&&pgAssetPlanDtoList.size()!=0) {
+                code="200";
+                msg = "巡检信息获取成功";
+            }
             else
                 msg="不存在巡检信息";
         }
@@ -47,6 +50,7 @@
             msg="巡检信息获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAssetPlanDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
index 47ef9d1..5cbdfcb 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
@@ -30,12 +30,15 @@
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
         String result="";
+        String code="0";
 
         List<PgAssetPlanStatic> pgAssetPlanStaticList = null;
         try{
             pgAssetPlanStaticList=pgAssetPlanManager.getPgAssetPlanStaticLisByTime(startTime,endTime,staticType);
-            if(pgAssetPlanStaticList!=null&&pgAssetPlanStaticList.size()!=0)
-                msg="巡检统计信息获取成功";
+            if(pgAssetPlanStaticList!=null&&pgAssetPlanStaticList.size()!=0) {
+                code = "200";
+                msg = "巡检统计信息获取成功";
+            }
             else
                 msg="统计信息获取失败";
         }
@@ -44,6 +47,7 @@
             msg="统计失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAssetPlanStaticList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
index 26f5d6a..503bfe3 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
@@ -40,6 +40,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="";
 
         try{
             PgAuthority pgAuthority=new PgAuthority();
@@ -50,6 +51,7 @@
 
             pgAuthorityManager.save(pgAuthority);
             msg="用户权限保存成功";
+            code="200";
             result="true";
         }
         catch(Exception e) {
@@ -57,6 +59,7 @@
             msg = "新增权限失败";
             result = "false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -65,22 +68,25 @@
 
     /*
        *编辑角权限信息
-        */
+    */
     @POST
     @Path("editAuthority")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> editAuthority(@FormParam("id") String id,
                                        @FormParam("authority") String authority,
                                        @FormParam("concent") String concent) throws Exception{
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
+
         try {
             PgAuthority pgAuthority=pgAuthorityManager.get(Long.valueOf(id));
             pgAuthority.setAuthority(authority);
             pgAuthority.setConcent(concent);
 
             pgAuthorityManager.save(pgAuthority);
+            code="200";
             msg="权限保存成功";
             result="true";
         }
@@ -90,7 +96,7 @@
             msg="权限编辑失败";
             result="false";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -105,9 +111,10 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> deleteAuthority(@FormParam("id") String id)throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
-        String result="false";
+        String result="";
+        String code="0";
 
         try {
             PgAuthority pgAuthority= pgAuthorityManager.get(Long.valueOf(id));
@@ -119,6 +126,7 @@
             {
                 pgAuthority.setActive(0);
                 pgAuthorityManager.save(pgAuthority);
+                code="200";
                 msg="删除权限成功";
                 result="true";
             }
@@ -127,37 +135,40 @@
             msg="删除权限失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
     }
 
     /*
-* 获取权限信息
- */
+    * 获取权限信息
+    */
     @POST
     @Path("getAuthorityList")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> getAuthorityList() {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgAuthorityDto> pgAuthorityDtoList = new ArrayList<PgAuthorityDto>();
         try {
             pgAuthorityDtoList = pgAuthorityManager.getAuthorityList();
             if (pgAuthorityDtoList == null)
                 msg = "不存在权限信息";
-            else
+            else {
+                code = "200";
                 msg = "权限信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "权限信息获取是失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAuthorityDtoList);
         return resultMap;
     }
 
 
-
-
 }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
index a9ef521..a74ecc7 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
@@ -45,6 +45,7 @@
                                                @FormParam("endDate") String endDate)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgHistoryDataDto> pgHistoryDataDtoList=new ArrayList<>();
 
         try {
@@ -55,13 +56,16 @@
                 pgHistoryDataDtoList=pgCh4Manager.getAllCH4Data(pgDevice,startDate,endDate);
                 if(pgHistoryDataDtoList==null)
                     msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+                else {
+                    code = "200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgHistoryDataDtoList);
         return resultMap;
@@ -75,8 +79,9 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getNewestCh4InfoByDev(@FormParam("assetCode") String assetCode)throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
+        String code="0";
         PgCh4Dto pgCh4Dto=new PgCh4Dto(null);
 
         try {
@@ -87,13 +92,17 @@
                 pgCh4Dto=pgCh4Manager.getNewestCH4Data(pgDevice);
                 if(pgCh4Dto==null)
                     msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgCh4Dto);
         return resultMap;
@@ -111,6 +120,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
@@ -127,6 +137,7 @@
                 pgCh4.setPgDeviceId(pgDevice);
 
                 pgCh4Manager.save(pgCh4);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -135,7 +146,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
index a7eac39..dfc8ca5 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
@@ -43,23 +43,27 @@
                                                       @FormParam("endDate") String endDate)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgHistoryDataDto> pgHistoryDataDtoList=new ArrayList<>();
 
         try {
             PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
                 msg="设备不存在";
-            else{
-                pgHistoryDataDtoList=pgCoManager.getAllCoData(pgDevice, startDate, endDate);
-                if(pgHistoryDataDtoList==null)
-                    msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+            else {
+                pgHistoryDataDtoList = pgCoManager.getAllCoData(pgDevice, startDate, endDate);
+                if (pgHistoryDataDtoList == null)
+                    msg = "没有满足要求的数据";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgHistoryDataDtoList);
         return resultMap;
@@ -75,6 +79,7 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         PgCoDto pgCoDto=new PgCoDto(null);
 
         try {
@@ -85,13 +90,16 @@
                 pgCoDto=pgCoManager.getNewestCoData(pgDevice);
                 if(pgCoDto==null)
                     msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgCoDto);
         return resultMap;
@@ -110,6 +118,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         try {
@@ -126,6 +135,7 @@
 
                 pgCoManager.save(pgCo);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
         } catch (Exception e) {
@@ -133,7 +143,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
index b4b826e..9af98a3 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
@@ -60,6 +60,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         try {
 
@@ -80,8 +81,8 @@
                 pgConstruction.setPgConstructionTypeId(pgConstructionType.getId());
                 pgConstruction.setActive(1);
                 pgConstruction.setParName(parName);
-                logger.info("保存成功");
                 pgConstructionManager.save(pgConstruction);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -90,6 +91,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("success", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -116,6 +118,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
@@ -140,6 +143,7 @@
                 pgConstruction.setParName(parName);
 
                 pgConstructionManager.save(pgConstruction);
+                code="200";
                 result = "true";
                 msg = "编辑成功";
             }
@@ -150,7 +154,7 @@
             e.printStackTrace();
 
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -167,6 +171,8 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
+
         try {
             PgConstruction pgConstruction = pgConstructionManager.get(Long.valueOf(id));
             if (pgConstruction == null)
@@ -177,6 +183,7 @@
             {
                 pgConstruction.setActive(0);
                 pgConstructionManager.save(pgConstruction);
+                code="200";
                 result = "true";
                 msg = "成功删除信息";
             }
@@ -185,6 +192,7 @@
             result = "false";
             msg = "删除失败";
         }
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -204,9 +212,11 @@
                                                   @FormParam("rows") int rows)throws Exception{
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
         List<PgConstructionDto> pgConstructionDtoList=new ArrayList<>();
         try{
             pgConstructionDtoList=pgConstructionManager.getPgContructionDto(cs_name,cs_type,startTime,endTime,page,rows);
+            code="200";
             msg="信息获取成功";
         }
         catch(Exception e)
@@ -214,6 +224,7 @@
             e.printStackTrace();
             msg="查询失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
 
@@ -231,18 +242,22 @@
                                                               @FormParam("statisticType") String statisticType) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgConstructionStiatistic> pgConstructionStiatisticList=new ArrayList<>();
         try {
             pgConstructionStiatisticList = pgConstructionManager.getConstructionByTimeAndStatus(startTime, endTime, statisticType);
             if(pgConstructionStiatisticList==null)
                 msg="施工统计信息获取失败";
-            else
-                msg="施工统计信息获取成功";
+            else {
+                code="200";
+                msg = "施工统计信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "施工统计信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgConstructionStiatisticList);
         return resultMap;
@@ -257,6 +272,7 @@
     public Map<String, Object> getConstructionByType(@FormParam("statisticType") String statisticType){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
         List<PgConstructionStiatistic> pgConstructionStiatisticList=new ArrayList<>();
 
         try{
@@ -268,6 +284,7 @@
                 resultMap.put("result",null);
             }
             else {
+                code="200";
                 msg = "统计信息获取成功";
                 resultMap.put("result", pgConstructionStiatisticList);
             }
@@ -278,6 +295,7 @@
             msg="统计失败";
             resultMap.put("result",null);
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         return resultMap;
     }
@@ -291,9 +309,11 @@
     public Map<String, Object> getConstructionToday() throws Exception{
         Map<String,Object> resultMap=new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgConstructionDto> pgConstructionDtoList=new ArrayList<PgConstructionDto>();
         try {
             pgConstructionDtoList = pgConstructionManager.getConstructionToday();
+            code="200";
             msg = "当天施工信息获取成功";
         }
         catch(Exception e)
@@ -301,7 +321,7 @@
             e.printStackTrace();
             msg="获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
         return resultMap;
@@ -316,6 +336,7 @@
     public Map<String, Object> getConstructionDev(@FormParam("id") String id) throws Exception{
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
         List<PgDeviceDto> pgDeviceDtoList =new ArrayList<>();
         try{
@@ -325,14 +346,17 @@
 
             if(pgDeviceDtoList==null)
                 msg="信息获取失败";
-            else
-                msg="信息获取成功";
+            else {
+                code="200";
+                msg = "信息获取成功";
+            }
         }
         catch(Exception e)
         {
             e.printStackTrace();
-            msg="设备信息获取成功";
+            msg="信息获取是被";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgDeviceDtoList);
 
@@ -346,17 +370,21 @@
     @Path("getConstruction")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getConstruction() throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
-        List<PgConstructionDto> pgConstructionDtoList=new ArrayList<PgConstructionDto>();
+        String code="0";
+
+        List<PgConstructionDto> pgConstructionDtoList=new ArrayList<>();
 
         try{
             pgConstructionDtoList=pgConstructionManager.getPgConstructionList();
             if(pgConstructionDtoList==null||pgConstructionDtoList.size()==0)
                 msg="不存在施工记录";
-            else
-                msg="施工信息获取成功";
+            else {
+                code = "200";
+                msg = "施工信息获取成功";
+            }
         }
         catch(Exception e)
         {
@@ -364,6 +392,7 @@
             msg="施工信息获取失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java
index fd3d53e..2019502 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java
@@ -39,12 +39,12 @@
         try {
             pgConstructionTypeDtoList = pgConstructionTypeManager.getAllConstructionTypeDto();
             if (pgConstructionTypeDtoList.size() == 0)
-                msg = "没有项目类型信息";
+                msg = "获取失败";
             else
-                msg = "项目类型获取成功";
+                msg = "获取成功";
         } catch (Exception e) {
             e.printStackTrace();
-            msg = "项目类型信息获取失败";
+            msg = "获取失败";
         }
         resultMap.put("msg", msg);
         resultMap.put("result", pgConstructionTypeDtoList);
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
index 90d001c..037a399 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
@@ -51,6 +51,7 @@
 
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if (StringUtils.isBlank(construct_doc)||StringUtils.isBlank(doc_name))
@@ -65,6 +66,7 @@
             pgCsDocument.setActive(1);
             pgCsDocumentManager.save(pgCsDocument);
 
+            code="200";
             result = "true";
             msg = "保存成功";
 
@@ -74,6 +76,7 @@
             ex.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("success", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -90,6 +93,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             PgCsDocument pgCsDocument = pgCsDocumentManager.get(Long.valueOf(id));
@@ -103,6 +107,7 @@
 
                 pgCsDocumentManager.save(pgCsDocument);
 
+                code="200";
                 result = "true";
                 msg = "编辑成功";
             }
@@ -112,6 +117,7 @@
             msg = "编辑失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -125,9 +131,9 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
         String result="";
+        String code="0";
 
         try{
-
             PgCsDocument pgCsDocument = pgCsDocumentManager.get(Long.valueOf(id));
             if(pgCsDocument==null)
             {
@@ -137,6 +143,7 @@
             else{
                 pgCsDocument.setActive(0);
                 pgCsDocumentManager.save(pgCsDocument);
+                code="200";
                 result="true";
                 msg="删除成功";
             }
@@ -147,7 +154,7 @@
             msg="预案删除失败";
             result="false";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -168,18 +175,21 @@
 
         String msg="";
         String result="";
+        String code="0";
 
         try {
             pgCsDocumentDtoList = pgCsDocumentManager.getAllDocData(cs_name);
-            if (pgCsDocumentDtoList != null)
+            if (pgCsDocumentDtoList != null) {
+                code="200";
                 msg = "获取数据成功";
+            }
             else
                 msg = "没有满足条件的数据";
         }catch (Exception e){
             e.printStackTrace();
             msg = "获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgCsDocumentDtoList);
         return resultMap;
@@ -192,20 +202,22 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
 
         String msg = "";
+        String code="0";
         ResponseEntity<byte[]> path = null;
         try {
             PgCsDocument pgCsDocument = pgCsDocumentManager.get(Long.valueOf(id));
             path = pgCsDocumentManager.downloadFile(pgCsDocument);
             if (path == null)
                 msg = "不存在该文档";
-            else
+            else {
+                code = "200";
                 msg = "下载成功";
-
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "下载失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", path.getBody());
         resultMap.put("msg", msg);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
index 94c5c84..ffc8b95 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
@@ -41,22 +41,24 @@
     public Map<String, Object> getPgDeviceByDevType(@FormParam("devType") String devType) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
         try {
-            pgDeviceDtoList = pgDeviceManager.getDeviceByDevTypee(devType);
+            pgDeviceDtoList = pgDeviceManager.getDeviceByDevType(devType);
             if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0){
                 msg="不存在满足要求的数据";
-                resultMap.put("result",null);
             }
             else{
-                resultMap.put("result", pgDeviceDtoList);
+                code="200";
                 msg = "获取成功";
             }
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", pgDeviceDtoList);
         return resultMap;
     }
 
@@ -69,25 +71,26 @@
     public Map<String, Object> getPgDeviceByAssetCode(@FormParam("assetCode") String assetCode) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         PgDeviceDto pgDeviceDto=null;
         try {
             PgDevice pgDevice = pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
             {
                 msg="不存在设备信息";
-                resultMap.put("result",null);
             }
             else {
                 pgDeviceDto = new PgDeviceDto(pgDevice);
                 msg = "获取成功";
-                resultMap.put("result", pgDeviceDto);
+                code="200";
             }
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", pgDeviceDto);
         return resultMap;
     }
 
@@ -102,27 +105,61 @@
                                              @FormParam("devType") String devType)throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
         try {
             pgDeviceDtoList = pgDeviceManager.getAllDevice(road,partition,devType);
             if(pgDeviceDtoList.size()==0) {
                 msg = "没有找到设备信息";
-                resultMap.put("result",null);
             }
             else {
                 msg = "设备信息获取成功";
-                resultMap.put("result", pgDeviceDtoList);
+                code="200";
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result", pgDeviceDtoList);
         return resultMap;
     }
 
     /**
+     * 显示设备列表
+     */
+    @POST
+    @Path("getPgDev")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String, Object> getPgDev(@FormParam("road") String road,
+                                             @FormParam("partition") String partition,
+                                             @FormParam("devType") String devType)throws Exception {
+        Map<String, Object> resultMap = new HashMap<>();
+        String msg="";
+        String code="0";
+        List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
+        try {
+            pgDeviceDtoList = pgDeviceManager.getAllDev(road,partition,devType);
+            if(pgDeviceDtoList.size()==0) {
+                msg = "没有找到设备信息";
+            }
+            else {
+                code="200";
+                msg = "设备信息获取成功";
+            }
+        }catch(Exception e){
+            e.printStackTrace();
+            msg="设备信息获取失败";
+        }
+        resultMap.put("code",code);
+        resultMap.put("msg",msg);
+        resultMap.put("result", pgDeviceDtoList);
+        return resultMap;
+    }
+
+
+    /**
      * 新增设备
      */
     @POST
@@ -145,6 +182,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if (pgDeviceManager.getDeviceByAssetCode(assetCode)!=null) {
@@ -169,6 +207,7 @@
 
                 pgDeviceManager.save(pgDevice);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
 
@@ -177,10 +216,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -208,14 +246,9 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
-            /*
-            if (pgDeviceManager.getDeviceByAssetCode(assetCode)!=null) {
-                result = "false";
-                msg = "已存在同名设备";
-            } else {
-            */
             PgDevice pgDevice = pgDeviceManager.get(Long.valueOf(id));
             pgDevice.setPipeGallery(pipeGallery);
             pgDevice.setPartition(partition);
@@ -233,14 +266,14 @@
 
             pgDeviceManager.save(pgDevice);
             result = "true";
+            code="200";
             msg = "编辑成功";
-            //}
         } catch (Exception e) {
             result = "false";
             msg = "编辑失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("result",result);
         resultMap.put("msg",msg);
         return resultMap;
@@ -256,7 +289,8 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
-        String result="false";
+        String result="";
+        String code="0";
 
         try {
             PgDevice pgDevice=pgDeviceManager.get(Long.valueOf(id));
@@ -268,6 +302,7 @@
             {
                 pgDevice.setActive(0);
                 pgDeviceManager.save(pgDevice);
+                code="200";
                 msg="设备删除成功";
                 result="true";
             }
@@ -276,6 +311,7 @@
             msg="设备删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -291,18 +327,18 @@
     {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         PgDeviceDto pgDeviceDto=null;
 
         try{
             PgDevice pgDevice=pgDeviceManager.getDeviceBydevCode(devCode);
             if(pgDevice==null) {
                 msg = "设备信息获取失败";
-                resultMap.put("result",null);
             }
             else{
                 pgDeviceDto = new PgDeviceDto(pgDevice);
                 msg = "设备信息获取成功";
-                resultMap.put("result",pgDeviceDto);
+                code="200";
             }
         }
         catch(Exception ex)
@@ -310,8 +346,9 @@
             ex.printStackTrace();
             msg="设备状态获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgDeviceDto);
         return resultMap;
     }
 
@@ -324,17 +361,17 @@
     public Map<String,Object> getDeviceByPartition(@FormParam("partition") String partition) throws Exception{
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<PgDeviceDto>();
 
         try{
             pgDeviceDtoList=pgDeviceManager.getPgDeviceDtoListByPartition(partition);
             if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0) {
                 msg = "设备信息获取失败";
-                resultMap.put("result",null);
             }
             else {
+                code="200";
                 msg = "设备信息获取成功";
-                resultMap.put("result",pgDeviceDtoList);
             }
         }
         catch(Exception e)
@@ -342,8 +379,9 @@
             e.printStackTrace();
             msg="设备信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgDeviceDtoList);
         return resultMap;
     }
 
@@ -353,17 +391,16 @@
     public Map<String,Object> getDeviceByOldDAssetCodeCode(@FormParam("assetCode") String assetCode) throws Exception{
         Map<String, Object> resultMap = new HashMap<>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
 
         try{
             pgDeviceDtoList=pgDeviceManager.getDeviceByOldDAssetCodeCode(assetCode);
-            if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0) {
-                msg = "设备信息获取失败";;
-                resultMap.put("result",null);
-            }
+            if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0)
+                msg = "设备信息获取失败";
             else {
                 msg = "设备信息获取成功";
-                resultMap.put("result",pgDeviceDtoList);
+                code="200";
             }
         }
         catch(Exception e)
@@ -372,8 +409,9 @@
             msg="设备信息获取失败";
             resultMap.put("result",null);
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgDeviceDtoList);
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java
index 421d249..f6f167d 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java
@@ -38,17 +38,21 @@
     public Map<String, Object> getDeviceTpeyList()throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgDeviceTypeDto> pgDeviceTypeDtoList=new ArrayList<PgDeviceTypeDto>();
         try {
             pgDeviceTypeDtoList = pgDeviceTypeManager.getAllDeviceType();
             if(pgDeviceTypeDtoList.size()==0)
                 msg="没有找到设备类型信息";
-            else
-                msg="设备类型信息获取成功";
+            else {
+                code="200";
+                msg = "设备类型信息获取成功";
+            }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备类型信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgDeviceTypeDtoList);
         return resultMap;
@@ -66,6 +70,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if (pgDeviceTypeManager.getDeviceTypeByDeType(devType)!=null) {
@@ -79,6 +84,7 @@
 
                 pgDeviceTypeManager.save(pgDeviceType);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
 
@@ -87,10 +93,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
index c276fb3..c789960 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
@@ -44,6 +44,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 
         try {
@@ -62,6 +63,7 @@
                 pgEquipment.setActive(1);
 
                 pgEquipmentManager.save(pgEquipment);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -70,9 +72,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -89,9 +91,10 @@
                                             @FormParam("ownerUnit") String ownerUnit,
                                             @FormParam("enterDate") String enterDate,
                                             @FormParam("curUser") String curUser) {
-        HashMap<String, Object> resultMap = new HashMap<String, Object>();
+        HashMap<String, Object> resultMap = new HashMap<>();
         String msg = "";
         String result = "";
+        String code="0";
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 
         try {
@@ -111,6 +114,7 @@
                 pgEquipment.setEnterDate(sdf.parse(enterDate));
 
                 pgEquipmentManager.save(pgEquipment);
+                code="200";
                 msg="编辑成功";
                 result="true";
             }
@@ -119,9 +123,9 @@
             result = "false";
             msg = "编辑失败";
         }
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -134,16 +138,19 @@
     public Map<String, Object> getEquipment(@FormParam("eqName") String eqName,
                                             @FormParam("eqCode") String eqCode,
                                             @FormParam("eqType") String eqType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        List<PgEquipmentDto> pgEquipmentDtoList=new ArrayList<PgEquipmentDto>();
+        String code="0";
+        List<PgEquipmentDto> pgEquipmentDtoList=new ArrayList<>();
 
         try{
             pgEquipmentDtoList=pgEquipmentManager.getEquipmentDtiList(eqName,eqCode,eqType);
             if(pgEquipmentDtoList==null||pgEquipmentDtoList.size()==0)
                 msg="不存在工器具记录";
-            else
-                msg="维获取成功";
+            else {
+                code = "200";
+                msg = "维获取成功";
+            }
         }
         catch(Exception e)
         {
@@ -166,6 +173,7 @@
         HashMap<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
         String result = "";
+        String code="";
 
         try {
             PgEquipment pgEquipment=pgEquipmentManager.get(Long.valueOf(id));
@@ -178,6 +186,7 @@
             {
                 pgEquipment.setActive(0);
                 pgEquipmentManager.save(pgEquipment);
+                code="200";
                 msg="删除成功";
                 result="true";
             }
@@ -186,6 +195,7 @@
             msg="设备信息获取失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -201,16 +211,19 @@
             throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=new ArrayList<PgDeviceTypeStatisticDto>();
 
         try {
             pgDeviceTypeStatisticDtoList=pgEquipmentManager.getDeviceStatisticByDevType(eqType);
 
+            code="200";
             msg = "获取成功";
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceTypeStatisticDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
index 05a9709..a90fd6c 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
@@ -4,9 +4,9 @@
 import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
 import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
 import com.casic.PgInterface.intelPlan.manager.PgPileAcuManager;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import com.casic.PgInterface.test.PlanData;
 import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.ModelAttribute;
 
 import javax.annotation.Resource;
 import javax.ws.rs.FormParam;
@@ -32,23 +32,25 @@
     public Map<String,Object> getPlanResult(@FormParam("planParamStr") String planParamStr){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
-        //List<PgPlanTask> pgPlanTaskList=pgPlanParams.getPgPlanTaskList();
         List<PgPlanTask> pgPlanTaskList=new PgPlanParams().getPgPlanParamsByString(planParamStr);
         List<PgPlanResultRe> pgPlanResultReList=new ArrayList<>();
 
-        try{
-                pgPlanResultReList=pgPileAcuManager.getPgPlanResultList(pgPlanTaskList);
-                if(pgPlanResultReList==null)
-                    msg="管线智能规划出错";
-                else
-                    msg="管线智能规划完成";
+        try {
+            pgPlanResultReList = pgPileAcuManager.getPgPlanResultList(pgPlanTaskList);
+            if (pgPlanResultReList == null)
+                msg = "管线智能规划出错";
+            else {
+                code="200";
+                msg = "管线智能规划完成";
+            }
         }
         catch(Exception ex){
             msg="智能规划出错";
             ex.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgPlanResultReList);
 
@@ -80,4 +82,30 @@
         return resultMap;
     }
 
+    @POST
+    @Path("getPlanTask")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getACUTask(@FormParam("pileAcuList") String pileAcuList){
+
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        String code="0";
+        List<PgAcuTask> pgAcuTaskList=new ArrayList<>();
+
+        try{
+            pgAcuTaskList=pgPileAcuManager.getACUTask(pileAcuList);
+            code="200";
+            msg="任务获取成功";
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            msg="任务获取失败";
+        }
+        resultMap.put("code",code);
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgAcuTaskList);
+
+        return resultMap;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
index ff85c61..66eec76 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
@@ -55,13 +55,13 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         try {
             PgInPgPerson pgInPgPerson = null;//pgInPgPersonManager.getPersonByUserName(userName);
             int iHostName = pgTagMacManager.getCount("select count(1) from PGTagMac where hostname = ?",assetCode);
-//            int iTagMac = pgTagMacManager.getCount("select count(1) from PGTagMac where tagmac = ?",assetCode.toUpperCase());
             if (0==iHostName)
             {
                 result = "false";
@@ -92,9 +92,8 @@
 
                 pgInPgStatusManager.save(pgInPgStatus);
 
-//                String syResult=pgInPgPersonManager.synchorizedInPgInfo(assetCode,userCode,userName,personType);
+                code="200";
                 result = "true";
-//                msg = "人员注册保存成功"+syResult;
                 msg = "人员注册保存成功";
             }
             else {
@@ -106,6 +105,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -120,6 +120,7 @@
     public Map<String, Object> getInPgPerson() throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<>();
         try {
@@ -127,11 +128,15 @@
             if (pgInPgInfoDtoList == null || pgInPgInfoDtoList.size() == 0)
                 msg = "没有找到入廊人员信息";
             else
+            {
+                code="200";
                 msg = "入廊人员信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "入廊人员信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
         return resultMap;
@@ -146,18 +151,22 @@
     public Map<String, Object> getInPgPersonInPg() throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
 
-        List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<PgInPgInfoDto>();
+        List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<>();
         try {
             pgInPgInfoDtoList = pgInPgPersonManager.getPgInPersonList(1);
             if (pgInPgInfoDtoList == null || pgInPgInfoDtoList.size() == 0)
                 msg = "没有找到入廊人员信息";
-            else
+            else {
+                code="200";
                 msg = "入廊人员信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "入廊人员信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
         return resultMap;
@@ -172,6 +181,7 @@
     public Map<String, Object> getInPgPersonByName(@FormParam("userName") String userName) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
 
         PgInPgPerson pgInPgPerson = null;
         PgInPgPersonDto pgInPgPersonDto=null;
@@ -184,12 +194,13 @@
                 pgInPgPersonDto=new PgInPgPersonDto(pgInPgPerson);
                 pgInPgPersonDtoList.add(pgInPgPersonDto);
                 msg = "人员信息获取成功";
+                code="200";
             }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "人员信息获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgPersonDtoList);
         return resultMap;
@@ -206,6 +217,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             PgInPgPerson pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName);
@@ -221,6 +233,7 @@
                     pgInPgPersonManager.save(pgInPgPerson);
                     result = "true";
                     msg = "编辑成功";
+                    code="200";
                 }
             }
         } catch (Exception e) {
@@ -228,9 +241,9 @@
             msg = "编辑失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -244,10 +257,12 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         int inPgNum=0;
         String msg = "";
+        String code="0";
 
         try{
             inPgNum=pgInPgStatusManager.getInPgNum();
 
+            code="200";
             msg="人员入廊次数获取成功";
         }
         catch(Exception e)
@@ -255,6 +270,7 @@
             e.printStackTrace();
             msg="人员入廊次数获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",inPgNum);
 
@@ -272,18 +288,22 @@
                                                    @FormParam("statisticType") String statisticType) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
 
         List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<PgInPgInfoDto>();
         try {
             pgInPgInfoDtoList = pgInPgPersonManager.getPgInPersonListByTime(startTime, endTime, statisticType);
             if(pgInPgInfoDtoList==null)
                 msg="入廊人员统计信息获取失败";
-            else
-                msg="入廊人员统计信息获取成功";
+            else {
+                code="200";
+                msg = "入廊人员统计信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "入廊人员统计信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
         return resultMap;
@@ -296,6 +316,7 @@
 
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
 
         try {
@@ -304,8 +325,10 @@
                 pgDeviceDtoList=pgDeviceManager.getPgCameraListByPosition("",apCodeStr);
                 if(pgDeviceDtoList==null)
                     msg="不存在关联摄像机";
-                else
-                    msg="关联摄像机获取成功";
+                else {
+                    code="200";
+                    msg = "关联摄像机获取成功";
+                }
             } else {
                 msg="请输入Ap编号";
             }
@@ -315,6 +338,7 @@
             msg="关联摄像机获取成功";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgDeviceDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java
index 507b3fe..b43f077 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java
@@ -34,6 +34,7 @@
 
         String result="";
         String msg="";
+        String code="";
         try{
             PgInPgStatus pgInPgStatus=new PgInPgStatus();
 
@@ -44,6 +45,7 @@
             pgInPgStatusManager.save(pgInPgStatus);
             msg="入廊时间提交成功";
             result="true";
+            code="200";
         }
         catch (Exception e){
             e.printStackTrace();
@@ -51,6 +53,7 @@
             result="false";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -66,6 +69,7 @@
 
         String result="";
         String msg="";
+        String code="0";
         try{
             PgInPgPerson pgInPgPerson=pgInPgPersonManager.getPgInPgPersonByAssetCode(assetCode);
 
@@ -79,6 +83,7 @@
             pgInPgStatusManager.save(pgInPgStatus);
 
             msg="出廊时间提交成功";
+            code="200";
             result="true";
         }
         catch (Exception e){
@@ -87,6 +92,7 @@
             result="false";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
index 9def330..9c0ba1f 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
@@ -33,17 +33,20 @@
                                             @FormParam("existNum") String existNum) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         String result="";
 
         try {
             pgIntelPlanManager.savePgIntelPlan(parName,lineName,maxNum,existNum);
             msg="规划数据保存成功";
+            code="200";
             result="true";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "规划数据保存失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
@@ -55,15 +58,18 @@
     public Map<String, Object> getIntelLineType() throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgIntelPlanTypeDto> pgIntelPlanTypeDtoList=new ArrayList<>();
         try {
             pgIntelPlanTypeDtoList=pgIntelPlanManager.getIntelPlanType();
+            code="200";
             msg="获取排线类型成功";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "获取排线类型失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgIntelPlanTypeDtoList);
         return resultMap;
@@ -76,6 +82,7 @@
                                             @FormParam("partitionStr") String partitionStr) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgIntelPlanDto> pgIntelPlanDtoList = new ArrayList<>();
 
@@ -83,8 +90,10 @@
             pgIntelPlanDtoList = pgIntelPlanManager.getPgIntelPlanListByPartion(lineName, partitionStr);
             if(pgIntelPlanDtoList==null||pgIntelPlanDtoList.size()==0)
                 msg="请输入正确的规划参数";
-            else
-                msg="规划数据获取成功";
+            else {
+                code="200";
+                msg = "规划数据获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "规划数据获取失败";
@@ -103,10 +112,12 @@
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
         String result="";
+        String code="0";
 
         try {
             boolean bl=pgIntelPlanManager.addLineUse(lineName,partitionStr,num);
             if(bl){
+                code="200";
                 msg="排线入廊成功";
                 result="true";
             }
@@ -119,6 +130,7 @@
             msg = "排线入廊失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
@@ -132,6 +144,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
         String result="";
+        String code="0";
 
         try {
             PgIntelPlan pgIntelPlan=pgIntelPlanManager.getPgIntelPlanByParNameAndLine(lineName,parName);
@@ -140,11 +153,13 @@
             pgIntelPlanManager.save(pgIntelPlan);
             msg="规划数据删除成功";
             result="true";
+            code="200";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "规划数据删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java b/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java
index 378af00..9c39523 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java
@@ -1,5 +1,6 @@
 package com.casic.PgInterface.rs;
 
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
 import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
 import com.casic.PgInterface.intelPlan.dto.PgLineHoleDTO;
 import com.casic.PgInterface.intelPlan.manager.PgLineHoleManager;
@@ -27,6 +28,9 @@
     @Resource
     private PgPileAcuManager pgPileAcuManager;
 
+    @Resource
+    private PgRoadManager pgRoadManager;
+
     @POST
     @Path("getPgLineAcuHole")
     @Produces(MediaType.APPLICATION_JSON)
@@ -34,23 +38,32 @@
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
         String result="";
+        String code="0";
         List<PgLineHoleDTO> pgLineHoleDTOList=new ArrayList<>();
 
         try {
             PgPileAcu pgPileAcu=pgPileAcuManager.getPgPileAcuByCode(acuCode);
             if(pgPileAcu==null){
                 msg="不存在分区";
-            }else{
-                pgLineHoleDTOList=pgLineHoleManager.getCurrentHoleByAcu(pgPileAcu.getId());
-                if(pgLineHoleDTOList!=null&&pgLineHoleDTOList.size()!=0)
-                    msg="获取成功";
-                else
-                    msg="未找到入廊数据";
+            }else {
+                pgLineHoleDTOList = pgLineHoleManager.getCurrentHoleByAcu(pgPileAcu.getId());
+                if (pgLineHoleDTOList != null && pgLineHoleDTOList.size() != 0)
+                {
+                    code="200";
+                    msg = "获取成功";
+                }
+                else {
+                    PgLineHoleDTO pgLineHoleDTO=new PgLineHoleDTO();
+                    pgLineHoleDTO.setRoad(pgRoadManager.get(pgPileAcu.getRoadId()).getRoadName());
+                    pgLineHoleDTOList.add(pgLineHoleDTO);
+                    msg = "未找到入廊数据";
+                }
             }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgLineHoleDTOList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgLogRs.java b/src/main/java/com/casic/PgInterface/rs/PgLogRs.java
index 39cff52..30db63b 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgLogRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgLogRs.java
@@ -45,6 +45,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         PgLog pgLog=new PgLog();
         try {
             PgUser pgUser = new PgUser();
@@ -60,14 +61,15 @@
             pgLogManager.save(pgLog);
             result = "true";
             msg = "保存成功";
-
+            code="200";
         } catch (Exception e) {
             result = "false";
             msg = "保存失败";
             e.printStackTrace();
         }
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -83,17 +85,21 @@
             throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgLogDto> pgLogDtoList = new ArrayList<PgLogDto>();
         try {
             pgLogDtoList = pgLogManager.getAllLogs(userName, startTime, endTime);
             if (pgLogDtoList == null || pgLogDtoList.size() == 0)
                 msg = "没有找到日志信息";
-            else
+            else {
+                code="200";
                 msg = "日志信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "日志信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgLogDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java
index 9fd0a5f..37b72f6 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java
@@ -36,19 +36,23 @@
         Map<String,Object> resultMap=new HashMap<>();
 
         String msg = "";
+        String code="0";
         List<PgMaintainType> pgMaintainTypeList=new ArrayList<>();
         try{
             pgMaintainTypeList=pgMaintainTypeManager.getMaintainType();
             if(pgMaintainTypeList!=null&&pgMaintainTypeList.size()!=0)
                 msg="不存在运维类别";
-            else
-                msg="运维类别获取成功";
+            else {
+                code="200";
+                msg = "运维类别获取成功";
+            }
         }
         catch(Exception ex)
         {
             ex.printStackTrace();
             msg="运维类别获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgMaintainTypeList);
 
@@ -65,10 +69,11 @@
         Map<String,Object> resultMap=new HashMap<>();
 
         String msg = "";
+        String code="0";
         List<PgMaintainTypeDto> pgMaintainTypeDtoList=new ArrayList<PgMaintainTypeDto>();
         try{
             pgMaintainTypeDtoList=pgMaintainTypeManager.getMaintainTypeModel(type);
-
+            code="200";
             msg="维护类型获取成功";
         }
         catch(Exception ex)
@@ -77,9 +82,9 @@
             msg="维护类型获取失败";
         }
 
-        resultMap.put("result",pgMaintainTypeDtoList);
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgMaintainTypeDtoList);
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java
index d735cc9..82ffca4 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java
@@ -33,12 +33,16 @@
                                                  @FormParam("endTime") String endTime){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
         List<PgMaintanceRecordHeadDto> pgMaintanceRecordHeadDtoList=new ArrayList<>();
         try{
             pgMaintanceRecordHeadDtoList=pgMaintanceRecordHeadManager.getPgMaintanceRecordHeadLsit(repairMan,startTime,endTime);
             if(pgMaintanceRecordHeadDtoList!=null&&pgMaintanceRecordHeadDtoList.size()!=0)
+            {
+                code="200";
                 msg="维护信息获取成功";
+            }
             else
                 msg="不存在维护信息";
         }
@@ -47,6 +51,7 @@
             msg="巡检信息获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgMaintanceRecordHeadDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java
index effc9df..9f46fc8 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java
@@ -32,12 +32,16 @@
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
         String result="";
+        String code="0";
 
         List<PgMaintanceRecordHeadStatic> pgMaintanceRecordHeadStaticList=new ArrayList<>();
         try{
             pgMaintanceRecordHeadStaticList=pgMaintanceRecordHeadManager.getPgMaintanceRecordHeadStaticLisByTime(startTime,endTime,staticType);
             if(pgMaintanceRecordHeadStaticList!=null&&pgMaintanceRecordHeadStaticList.size()!=0)
+            {
+                code="200";
                 msg="维护统计信息获取成功";
+            }
             else
                 msg="维护统计失败";
         }
@@ -46,7 +50,7 @@
             ex.printStackTrace();
             msg="统计失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgMaintanceRecordHeadStaticList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java b/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java
index 3a67bf3..6a5f4dc 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java
@@ -39,27 +39,31 @@
     @Path("getO2InfoByDevAndDate")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getO2InfoByDevAndDate(@FormParam("assetCode") String assetCode,
-                                                      @FormParam("startDate") String startDate,
-                                                      @FormParam("endDate") String endDate)throws Exception {
+                                                     @FormParam("startDate") String startDate,
+                                                     @FormParam("endDate") String endDate)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgHistoryDataDto> pgHistoryDataDtoList=new ArrayList<>();
 
         try {
             PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
                 msg="设备不存在";
-            else{
-                pgHistoryDataDtoList=pgO2Manager.getAllO2Data(pgDevice, startDate, endDate);
-                if(pgHistoryDataDtoList==null)
-                    msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+            else {
+                pgHistoryDataDtoList = pgO2Manager.getAllO2Data(pgDevice, startDate, endDate);
+                if (pgHistoryDataDtoList == null)
+                    msg = "没有满足要求的数据";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgHistoryDataDtoList);
         return resultMap;
@@ -75,23 +79,27 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         PgO2Dto pgO2Dto=new PgO2Dto(null);
 
         try {
             PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
                 msg="设备不存在";
-            else{
-                pgO2Dto=pgO2Manager.getNewestO2Data(pgDevice);
-                if(pgO2Dto==null)
-                    msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+            else {
+                pgO2Dto = pgO2Manager.getNewestO2Data(pgDevice);
+                if (pgO2Dto == null)
+                    msg = "没有满足要求的数据";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgO2Dto);
         return resultMap;
@@ -104,11 +112,12 @@
     @Path("addO2Data")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> addO2Data(@FormParam("devCode") String devCode,
-                                          @FormParam("upTime") String upTime,
-                                          @FormParam("o2") String o2)throws Exception {
+                                         @FormParam("upTime") String upTime,
+                                         @FormParam("o2") String o2)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
@@ -125,6 +134,7 @@
                 pgO2.setPgDeviceId(pgDevice);
 
                 pgO2Manager.save(pgO2);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -133,9 +143,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java b/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java
index 6217cde..70b3b41 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java
@@ -30,8 +30,6 @@
 public class PgOverViewRs {
 
     @Resource
-    private PgInPgPersonManager pgInPgPersonManager;
-    @Resource
     private PgInPgStatusManager pgInPgStatusManager;
     @Resource
     private PgAlarmManager pgAlarmManager;
@@ -46,18 +44,21 @@
     @Path("getPersonNumInPgByMonth")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<Object, String> getMonthInPgPersonNum() throws Exception {
-        Map<Object, String> resultMap = new HashMap<Object, String>();
+        Map<Object, String> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         int inNum = 0;
 
         try {
             inNum = pgInPgStatusManager.getMonthInPgPersonNum();
+            code="200";
             msg = "本月入廊人员次数获取成功";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "本月入廊人员次数获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", String.valueOf(inNum));
 
@@ -73,15 +74,18 @@
     public Map<Object, String> getWeekInPgPersonNum() throws Exception {
         Map<Object, String> resultMap = new HashMap<Object, String>();
         String msg = "";
+        String code="0";
         int inNum = 0;
         try {
             inNum = pgInPgStatusManager.getWeekInPgPersonNum();
+            code="200";
             msg = "本周入廊人员次数获取成功";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "本周入廊人员次数获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", String.valueOf(inNum));
 
@@ -97,19 +101,22 @@
     public Map<String, Object> getDayInPgStatistic() throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<>();
         try {
             pgInPgInfoDtoList = pgInPgStatusManager.getPgInPersonListByDay();
             if (pgInPgInfoDtoList == null)
                 msg = "信息获取失败";
-            else
+            else {
+                code="200";
                 msg = "信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "信息获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
         return resultMap;
@@ -124,18 +131,23 @@
     public Map<String, Object> getTodayInPgInfo() throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
 
         List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<PgInPgInfoDto>();
         try {
             pgInPgInfoDtoList = pgInPgStatusManager.getTodayInPgInfo();
             if(pgInPgInfoDtoList!=null||pgInPgInfoDtoList.size()!=0)
+            {
+                code="200";
                 msg = "信息获取成功";
+            }
             else
                 msg="当天没有入廊人员信息";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
 
@@ -149,18 +161,22 @@
     public Map<String, Object> getAlarmNum(@FormParam("isDevFault") String isDevFault) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         int num = 0;
 
         try {
             if(isDevFault!=null){
                 num = pgAlarmManager.getAlarmNum(isDevFault);
-                msg = "报警数量获取成功";}
+                msg = "报警数量获取成功";
+                code="200";
+            }
             else
                 msg="请输入统计参数";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警数量统计失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", num);
 
@@ -176,16 +192,18 @@
     public Map<Object, String> getMonthAlarmNum(@FormParam("isDevFault") String isDevFault) throws Exception {
         Map<Object, String> resultMap = new HashMap<Object, String>();
         String msg = "";
+        String code="0";
         int inNum = 0;
 
         try {
-                inNum = pgAlarmManager.getMonthAlarmNum(isDevFault);
-                msg = "报警次数获取成功";
+            inNum = pgAlarmManager.getMonthAlarmNum(isDevFault);
+            code="200";
+            msg = "报警次数获取成功";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警次数获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", String.valueOf(inNum));
 
@@ -201,15 +219,17 @@
     public Map<Object, String> getWeekAlarmNum(@FormParam("isDevFault") String isDevFault) throws Exception {
         Map<Object, String> resultMap = new HashMap<Object, String>();
         String msg = "";
+        String code="0";
         int inNum = 0;
         try {
             inNum = pgAlarmManager.getWeekAlarmNum(isDevFault);
+            code="200";
             msg = "报警次数获取成功";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警次数获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", String.valueOf(inNum));
 
@@ -225,14 +245,17 @@
     public Map<String, Object> getDayAlarmStatistic() throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgAlarmTjDto> pgAlarmTjDtoList = new ArrayList<PgAlarmTjDto>();
         try {
             pgAlarmTjDtoList = pgAlarmManager.getDayAlarmStatistic();
             if (pgAlarmTjDtoList == null)
                 msg = "信息获取失败";
-            else
+            else {
+                code="200";
                 msg = "信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "信息获取失败";
@@ -252,9 +275,11 @@
     public Map<String, Object> getAlarmList(@FormParam("isDevFault") String isDevFault) throws Exception{
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         List<PgAlarmDto> pgAlarmDtoList=new ArrayList<>();
         try{
             pgAlarmDtoList=pgAlarmManager.getAlarmList(isDevFault);
+            code="200";
             msg="信息获取成功";
         }
         catch(Exception e)
@@ -262,6 +287,7 @@
             e.printStackTrace();
             msg="信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAlarmDtoList);
 
@@ -278,17 +304,19 @@
     public Map<String,Object> getConstructionNum() throws Exception{
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgConstructionTypeNumStatisticDto> pgConstructionTypeNumDtoList=new ArrayList<PgConstructionTypeNumStatisticDto>();
         try{
             pgConstructionTypeNumDtoList=pgConstructionManager.getConstructionNum();
             msg="施工数量获取成功";
+            code="200";
         }
         catch(Exception e)
         {
             e.printStackTrace();
             msg="施工数量统计";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionTypeNumDtoList);
 
@@ -302,21 +330,25 @@
     @Path("getConstructionToday")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> getConstructionToday() throws Exception{
-        Map<String,Object > resultMap = new HashMap<String,Object>();
+        Map<String,Object > resultMap = new HashMap<>();
         String msg = "";
-        List<PgConstructionDto> pgConstructionDtoList=new ArrayList<PgConstructionDto>();
+        String code="0";
+        List<PgConstructionDto> pgConstructionDtoList=new ArrayList<>();
         try {
             pgConstructionDtoList = pgConstructionManager.getConstructionToday();
-            if (pgConstructionDtoList == null&&pgConstructionDtoList.size()==0)
+            if (pgConstructionDtoList == null && pgConstructionDtoList.size() == 0)
                 msg = "不存在施工信息";
-            else
+            else {
+                code="200";
                 msg = "施工信息获取成功";
+            }
         }
         catch(Exception e)
         {
             e.printStackTrace();
             msg="施工信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java b/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java
index d3c10d4..31ffcfc 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java
@@ -48,6 +48,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 
         try {
@@ -66,9 +67,9 @@
                 pgPartition.setMaterial(material);
                 pgPartition.setActive(1);
 
-                logger.info("成功保存");
                 pgPartitionManager.save(pgPartition);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
         } catch (Exception e) {
@@ -76,9 +77,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
         return resultMap;
     }
     /*
@@ -100,6 +101,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         PgPartition partition = new PgPartition();
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
@@ -122,6 +124,7 @@
 
                 pgPartitionManager.save(pgPartition);
                 result = "true";
+                code="200";
                 msg = "编辑成功";
             }
 
@@ -131,8 +134,10 @@
             e.printStackTrace();
         }
 
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
+
         return resultMap;
     }
 
@@ -147,7 +152,8 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
-        String result="false";
+        String result="";
+        String code="0";
 
         try {
             PgPartition pgPartition=pgPartitionManager.get(Long.valueOf(id));
@@ -161,12 +167,14 @@
                 pgPartitionManager.save(pgPartition);
                 msg="分区删除成功";
                 result="true";
+                code="200";
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="分区删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -181,14 +189,17 @@
     public Map<String, Object> getPartition() throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgPartitionDto> pgPartitionDtoList = new ArrayList<PgPartitionDto>();
         try {
             pgPartitionDtoList = pgPartitionManager.getPgPartitionDtoList();
+            code="200";
             msg = "获取成功";
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgPartitionDtoList);
         return resultMap;
@@ -203,14 +214,17 @@
     public Map<String, Object> getPartitionListByName(@FormParam("parName") String parName) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgPartitionDto> pgPartitionDtoList = new ArrayList<PgPartitionDto>();
         try {
             pgPartitionDtoList = pgPartitionManager.getPartitionByName(parName);
+            code="200";
             msg = "获取成功";
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgPartitionDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java b/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java
index 883adf9..cf81b72 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java
@@ -37,6 +37,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
         PgRoad pgRoad=pgRoadManager.getPgRoadByName(road);
         try {
             PgPileAcu pgPileAcu=new PgPileAcu();
@@ -49,6 +50,7 @@
             pgPileAcu.setActive(true);
 
             pgPileAcuManager.save(pgPileAcu);
+            code="200";
             result="true";
             msg="保存成功";
         } catch (Exception e) {
@@ -56,9 +58,10 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
+
         return resultMap;
     }
 
@@ -73,6 +76,7 @@
 
         String result="";
         String msg="";
+        String code="0";
         try{
             PgPileAcu pgPileAcu=pgPileAcuManager.get(id);
             if(pgPileAcu==null){
@@ -83,7 +87,7 @@
             {
                 pgPileAcu.setActive(false);
                 pgPileAcuManager.save(pgPileAcu);
-
+                code="200";
                 result="true";
                 msg="桩号删除成功";
             }
@@ -94,8 +98,9 @@
             ex.printStackTrace();
         }
 
-        resultMap.put("result",result);
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
+        resultMap.put("result",result);
 
         return resultMap;
     }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPileRs.java b/src/main/java/com/casic/PgInterface/rs/PgPileRs.java
index cf62954..c9999ac 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgPileRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgPileRs.java
@@ -33,6 +33,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             PgPile pgPile=new PgPile();
@@ -40,6 +41,7 @@
             pgPile.setActive(true);
 
             pgPileManager.save(pgPile);
+            code="200";
             result="true";
             msg="保存成功";
         } catch (Exception e) {
@@ -47,9 +49,10 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
+
         return resultMap;
     }
 
@@ -64,9 +67,10 @@
         Map<String,Object> resultMap=new HashMap<>();
         List<PgPileDTO> pgPileDTOList=new ArrayList<>();
         String msg="";
+        String code="0";
         try{
             pgPileDTOList=pgPileManager.getPgPileDTOList();
-
+            code="200";
             msg="获取成功";
         }
         catch(Exception ex){
@@ -74,8 +78,9 @@
             msg="获取成失败";
             ex.printStackTrace();
         }
-        resultMap.put("result",pgPileDTOList);
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
+        resultMap.put("result",pgPileDTOList);
 
         return resultMap;
     }
@@ -91,6 +96,7 @@
 
         String result="";
         String msg="";
+        String code="0";
         try{
             PgPile pgPile=pgPileManager.get(id);
             if(pgPile==null){
@@ -101,7 +107,7 @@
             {
                 pgPile.setActive(false);
                 pgPileManager.save(pgPile);
-
+                code="200";
                 result="true";
                 msg="桩号删除成功";
             }
@@ -111,9 +117,9 @@
             msg="桩号删除失败";
             ex.printStackTrace();
         }
-
-        resultMap.put("result",result);
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
+        resultMap.put("result",result);
 
         return resultMap;
     }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
index 6ee63ff..63b5597 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
@@ -53,10 +53,12 @@
         try {
                resultMap = pgPipeLineManager.addPipeLine(lineCode,lineType,secRow,secColumn,pileAcuList);
                resultMap.put("msg","提交成功");
+               resultMap.put("code","200");
                resultMap.put("result","true");
 
         } catch (Exception e) {
             e.printStackTrace();
+            resultMap.put("code","0");
             resultMap.put("result","false");
             resultMap.put("msg","提交失败");
             return  resultMap;
@@ -74,14 +76,17 @@
     public Map<String, Object> getPipeLineByLineType(@FormParam("lineType") String lineType) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgPipeLineDto> pgPipeLineDtoList=new ArrayList<PgPipeLineDto>();
         try {
             pgPipeLineDtoList = pgPipeLineManager.getPipeLineByLineType(lineType);
+            code="200";
             msg = "获取成功";
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgPipeLineDtoList);
         return resultMap;
@@ -96,6 +101,7 @@
     public Map<String, Object> getPipeLineByName(@FormParam("lineCode") String lineCode) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         PgPipeLineDto pgPipeLineDto=null;
         try {
             PgPipeLine pgPipeLine = pgPipeLineManager.getPipeLineBylineName(lineCode);
@@ -103,12 +109,14 @@
                 msg="不存在："+lineCode;
             else {
                 pgPipeLineDto = new PgPipeLineDto(pgPipeLine);
+                code="200";
                 msg = "获取成功";
             }
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgPipeLineDto);
         return resultMap;
@@ -123,15 +131,18 @@
     public Map<String,Object> getPipeLengthStatic()throws Exception{
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         List<PgPipeLineLengthStatic> pgPipeLineLengthStaticList=new ArrayList<PgPipeLineLengthStatic>();
         try {
             pgPipeLineLengthStaticList = pgPipeLineManager.getPipeLengthByName();
+            code="200";
             msg="管线长度获取成功";
         }catch(Exception e)
         {
             e.printStackTrace();
             msg="管线长度统计失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgPipeLineLengthStaticList);
 
@@ -147,14 +158,17 @@
     public Map<String, Object> getPipeLineType() throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgPipeLineTypeDto> pgPipeLineTypeDtoList=new ArrayList<PgPipeLineTypeDto>();
         try {
             pgPipeLineTypeDtoList = pgPipeLineManager.getPipeType();
+            code="200";
             msg = "获取成功";
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgPipeLineTypeDtoList);
         return resultMap;
@@ -170,20 +184,24 @@
         Map<String,Object> resultMap=new HashMap<String, Object>();
 
         String msg="";
+        String code="0";
         List<PgPipeLineTypeNumDto> pgPipeLineTypeNumDtoList=new ArrayList<PgPipeLineTypeNumDto>();
 
-        try{
-            pgPipeLineTypeNumDtoList=pgPipeLineManager.getPipeTypeNum();
+        try {
+            pgPipeLineTypeNumDtoList = pgPipeLineManager.getPipeTypeNum();
 
-            if(pgPipeLineTypeNumDtoList==null)
-                msg="不存在管线类型占比";
-            else
-                msg="管线占比获取成功";
+            if (pgPipeLineTypeNumDtoList == null)
+                msg = "不存在管线类型占比";
+            else {
+                code="200";
+                msg = "管线占比获取成功";
+            }
         }
         catch (Exception e){
             msg="管线占比数量获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgPipeLineTypeNumDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java
index 672b376..7042994 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java
@@ -43,17 +43,21 @@
     public Map<String,Object> getReservePlan() {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgReservePlanDto> pgReservePlanDtoList = new ArrayList<PgReservePlanDto>();
         try {
             pgReservePlanDtoList = pgReservePlanManager.getPgReservePlanDto();
             if (pgReservePlanDtoList == null)
                 msg = "不存在预案信息";
-            else
+            else {
+                code="200";
                 msg = "预案信息获取成功";
-        } catch (Exception e) {
+            }
+        }catch (Exception e) {
             e.printStackTrace();
             msg = "预案信息获取是失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgReservePlanDtoList);
         return resultMap;
@@ -66,6 +70,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
 
         String msg = "";
+        String code="0";
         ResponseEntity<byte[]> path = null;
         try {
             PgReservePlan pgReservePlan = pgReservePlanManager.get(Long.valueOf(id));
@@ -73,15 +78,17 @@
 
             if (path == null)
                 msg = "不存在该文档";
-            else
+            else {
+                code="200";
                 msg = "下载成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "下载失败";
         }
-
-        resultMap.put("result", path.getBody());
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", path.getBody());
         return resultMap;
     }
     /*
@@ -99,6 +106,7 @@
         Map<String,Object> resultMap=new HashMap<String, Object>();
         String msg="";
         String result="";
+        String code="0";
 
         try {
             PgReservePlan pgReservePlan = new PgReservePlan();
@@ -124,6 +132,7 @@
                 pgReservePlanManager.save(pgReservePlan);
                 msg = "新增成功";
                 result = "true";
+                code="200";
             }
         }
         catch(Exception e)
@@ -133,6 +142,7 @@
             result="false";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -152,6 +162,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             PgReservePlan pgReservePlan=pgReservePlanManager.get(Long.valueOf(id));
@@ -177,6 +188,7 @@
 
                     pgReservePlanManager.save(pgReservePlan);
 
+                    code="200";
                     result = "true";
                     msg = "编辑成功";
                 }
@@ -187,6 +199,7 @@
             msg = "编辑失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -201,6 +214,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
         String result="";
+        String code="0";
 
         try{
 
@@ -214,6 +228,7 @@
                 pgReservePlan.setActive(0);;
                 pgReservePlanManager.save(pgReservePlan);
                 result="true";
+                code="200";
                 msg="删除成功";
             }
         }
@@ -224,6 +239,7 @@
             result="false";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java b/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java
index 8f049c8..3c48a8d 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java
@@ -42,19 +42,22 @@
         Map<String,Object> resultMap=new HashMap<String, Object>();
 
         String msg="";
+        String code="0";
         List<PgRoadDto> pgRoadDtoList=new ArrayList<PgRoadDto>();
-        try{
+        try {
             pgRoadDtoList = pgRoadManager.getAllRoad();
             if (pgRoadDtoList.size() == 0)
                 msg = "没有道路信息";
-            else
+            else {
+                code="200";
                 msg = "道路信息获取成功";
+            }
         }
         catch(Exception e){
             msg="道路信息获取失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgRoadDtoList);
 
@@ -71,6 +74,7 @@
         Map<String,Object> resultMap=new HashMap<String, Object>();
         String msg="";
         String result="";
+        String code="0";
 
         try{
             PgRoad pgRoad=new PgRoad();
@@ -78,7 +82,7 @@
             pgRoad.setActive(1);
 
             pgRoadManager.save(pgRoad);
-
+            code="200";
             msg="新增道路成功";
             result="true";
         }
@@ -87,7 +91,7 @@
             result="true";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -107,6 +111,7 @@
 
         String msg="";
         String result="";
+        String code="0";
 
         try {
             PgRoad pgRoad=pgRoadManager.get(Long.valueOf(id));
@@ -123,6 +128,7 @@
                 pgRoadManager.save(pgRoad);
                 msg="道路信息保存成功";
                 result="true";
+                code="200";
             }
         }
         catch(Exception e){
@@ -130,6 +136,7 @@
             result="false";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -147,6 +154,7 @@
 
         String msg="";
         String result="";
+        String code="0";
         PgRoad pgRoad=null;
 
         try{
@@ -159,6 +167,7 @@
                 pgRoad.setActive(0);
                 pgRoadManager.save(pgRoad);
                 msg="道路删除成功";
+                code="200";
                 result="true";
             }
         }
@@ -168,6 +177,7 @@
             e.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -184,26 +194,29 @@
         Map<String,Object> resultMap=new HashMap<String, Object>();
         String msg="";
         String result="";
+        String code="0";
 
         List<PgPartitionDto> pgPartitionDtoList=null;
         try{
             PgRoad pgRoad=pgRoadManager.getPgRoadByName(roadName);
             if(pgRoad==null)
                 msg="不存在道路信息";
-            else
-            {
-                pgPartitionDtoList=pgPartitionManager.getPgPartitonDtoByRoad(pgRoad);
-                if(pgPartitionDtoList==null||pgPartitionDtoList.size()==0)
-                    msg="该道路没有分区信息";
-                else
-                    msg="分区信息获取成功";
+            else {
+                pgPartitionDtoList = pgPartitionManager.getPgPartitonDtoByRoad(pgRoad);
+                if (pgPartitionDtoList == null || pgPartitionDtoList.size() == 0)
+                    msg = "该道路没有分区信息";
+                else {
+                    code="200";
+                    msg = "分区信息获取成功";
+                }
             }
         }
         catch (Exception e)
         {
+            e.printStackTrace();
             msg="分区信息获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgPartitionDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java b/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java
index 90d709a..7a713bf 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java
@@ -42,17 +42,21 @@
     public Map<String,Object> getRoleList() {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgRoleDto> pgRoleDtoList = new ArrayList<PgRoleDto>();
         try {
             pgRoleDtoList = pgRoleManager.getPgRoleDtoList();
             if (pgRoleDtoList == null)
                 msg = "不存在角色信息";
-            else
+            else {
+                code="200";
                 msg = "角色信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "角色信息获取是失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgRoleDtoList);
         return resultMap;
@@ -69,6 +73,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try{
             PgAuthority pgAuthority=pgAuthorityManager.getAuthorityByAuthority(authority);
@@ -79,6 +84,7 @@
 
             pgRoleManager.save(pgRole);
             msg="用户角色保存成功";
+            code="200";
             result="true";
         }
         catch(Exception e) {
@@ -86,6 +92,7 @@
             msg = "新增角色失败";
             result = "false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -104,6 +111,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         try {
             PgRole pgRole = pgRoleManager.get(Long.valueOf(id));
 
@@ -112,6 +120,7 @@
             pgRole.setPgAuthorityId(pgAuthority);
             pgRoleManager.save(pgRole);
 
+            code="200";
             msg="角色保存成功";
             result="true";
         }
@@ -122,6 +131,7 @@
             result="false";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -138,7 +148,8 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
-        String result="false";
+        String result="";
+        String code="0";
 
         try {
             PgRole pgRole= pgRoleManager.get(Long.valueOf(id));
@@ -152,12 +163,14 @@
                 pgRoleManager.save(pgRole);
                 msg="删除角色成功";
                 result="true";
+                code="200";
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="删除角色失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java b/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java
index 0e413b8..d146811 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java
@@ -38,6 +38,7 @@
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
         String result="";
+        String code="0";
         PgRoad pgRoad=pgRoadManager.getPgRoadByName(road);
 
         try{
@@ -55,13 +56,14 @@
             pgSectionManager.save(pgSection);
             msg="截面信息保存成功";
             result="true";
+            code="200";
         }
         catch(Exception ex){
             msg="界面信息保存失败";
             result="false";
             ex.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -77,6 +79,7 @@
 
         String msg="";
         String result="";
+        String code="0";
 
         try{
             PgSection pgSection=pgSectionManager.get(id);
@@ -84,6 +87,7 @@
             pgSection.setActive(false);
             pgSectionManager.save(pgSection);
 
+            code="200";
             msg="截面删除成功";
             result="true";
         }
@@ -92,7 +96,7 @@
             result="false";
             ex.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -107,16 +111,19 @@
         Map<String,Object> resultMap=new HashMap<>();
         List<PgLineType> pgLineTypeList=new ArrayList<>();
         String msg="";
+        String code="0";
 
         try{
             pgLineTypeList=pgSectionManager.getLineType();
             msg="获取成功";
+            code="200";
         }
         catch(Exception ex){
             ex.printStackTrace();
             msg="获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgLineTypeList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgShRs.java b/src/main/java/com/casic/PgInterface/rs/PgShRs.java
index 1e35f4b..323c82f 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgShRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgShRs.java
@@ -45,23 +45,27 @@
                                                      @FormParam("endDate") String endDate)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgHistoryDataDto> pgHistoryDataDtoList=new ArrayList<>();
 
         try {
             PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
                 msg="设备不存在";
-            else{
-                pgHistoryDataDtoList=pgShManager.getAllShData(pgDevice, startDate, endDate);
-                if(pgHistoryDataDtoList==null)
-                    msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+            else {
+                pgHistoryDataDtoList = pgShManager.getAllShData(pgDevice, startDate, endDate);
+                if (pgHistoryDataDtoList == null)
+                    msg = "没有满足要求的数据";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgHistoryDataDtoList);
         return resultMap;
@@ -77,23 +81,27 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         PgShDto pgShDto=new PgShDto(null);
 
         try {
             PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
                 msg="设备不存在";
-            else{
-                pgShDto=pgShManager.getNewestShData(pgDevice);
-                if(pgShDto==null)
-                    msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+            else {
+                pgShDto = pgShManager.getNewestShData(pgDevice);
+                if (pgShDto == null)
+                    msg = "没有满足要求的数据";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgShDto);
         return resultMap;
@@ -111,6 +119,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
@@ -128,6 +137,7 @@
 
                 pgShManager.save(pgSh);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
         } catch (Exception e) {
@@ -135,9 +145,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java b/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java
index a23b2da..76023a9 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java
@@ -43,23 +43,27 @@
                                                       @FormParam("endDate") String endDate)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgHistoryTempDto> pgHistoryTempDtoList=new ArrayList<>();
 
         try {
             PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
                 msg="设备不存在";
-            else{
-                pgHistoryTempDtoList=pgTempHumManager.getAllTempHumData(pgDevice, startDate, endDate);
-                if(pgHistoryTempDtoList==null)
-                    msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+            else {
+                pgHistoryTempDtoList = pgTempHumManager.getAllTempHumData(pgDevice, startDate, endDate);
+                if (pgHistoryTempDtoList == null)
+                    msg = "没有满足要求的数据";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgHistoryTempDtoList);
         return resultMap;
@@ -75,23 +79,27 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         PgTempHumDto pgTempHumDto=new PgTempHumDto(null);
 
         try {
             PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
                 msg="设备不存在";
-            else{
-                pgTempHumDto=pgTempHumManager.getNewestTempHumData(pgDevice);
-                if(pgTempHumDto==null)
-                    msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+            else {
+                pgTempHumDto = pgTempHumManager.getNewestTempHumData(pgDevice);
+                if (pgTempHumDto == null)
+                    msg = "没有满足要求的数据";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgTempHumDto);
         return resultMap;
@@ -110,6 +118,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         try {
@@ -127,6 +136,7 @@
 
                 pgTempHumManager.save(pgTempHum);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
         } catch (Exception e) {
@@ -135,8 +145,10 @@
             e.printStackTrace();
         }
 
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
+
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgUserRs.java b/src/main/java/com/casic/PgInterface/rs/PgUserRs.java
index 73895f5..ff814a1 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgUserRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgUserRs.java
@@ -42,17 +42,21 @@
     public Map<String, Object> getUserList()throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgUserDto> pgUserDtoList=new ArrayList<PgUserDto>();
         try {
             pgUserDtoList = pgUserManager.getAllUser();
             if(pgUserDtoList.size()==0)
                 msg="没有找到人员信息";
-            else
-                msg="获取成功";
+            else {
+                code="200";
+                msg = "获取成功";
+            }
         }catch(Exception e){
             e.printStackTrace();
             msg="获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgUserDtoList);
         return resultMap;
@@ -74,6 +78,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             PgRole pgRole=pgRoleManager.getPgRoleByRole(role);
@@ -94,10 +99,10 @@
                 else
                     pgUser.setRoleId(pgRole.getId());
                 pgUser.setActive(1);
-                logger.info("成功保存");
 
                 pgUserManager.save(pgUser);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
         } catch (Exception e) {
@@ -106,6 +111,7 @@
             e.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -129,6 +135,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
         try {
 
             PgRole pgRole=pgRoleManager.getPgRoleByRole(role);
@@ -145,8 +152,8 @@
                 pgUser.setRoleId(pgRole.getId());
             pgUserManager.save(pgUser);
             result = "true";
+            code="200";
             msg = "编辑成功";
-            //}
         } catch (Exception e) {
             result = "false";
             msg = "编辑失败";
@@ -166,9 +173,10 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> deleteUser(@FormParam("id") String id)throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
-        String result="false";
+        String result="";
+        String code="0";
 
         try {
             PgUser pgUser= pgUserManager.get(Long.valueOf(id));
@@ -180,6 +188,7 @@
             {
                 pgUser.setActive(0);
                 pgUserManager.save(pgUser);
+                code="200";
                 msg="删除人员成功";
                 result="true";
             }
@@ -188,6 +197,7 @@
             msg="删除人员失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -204,13 +214,14 @@
         Map<String,Object> resultMap=new HashMap<String, Object>();
         String msg="";
         String result="";
-
+        String code="0";
         try{
             PgUserDto pgUserDto=pgUserManager.signIn(userName,passWord);
 
             if(pgUserDto==null)
                 msg="false";
             else {
+                code="200";
                 msg="true";
                 result=pgUserDto.getRole();
             }
@@ -220,6 +231,7 @@
             e.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java b/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java
index 71ad0ae..3998c67 100644
--- a/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java
@@ -45,6 +45,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         PipeGallery pipeGallery = new PipeGallery();
         try {
 
@@ -58,6 +59,7 @@
                 logger.info("成功保存");
                 pipeGalleryManager.save(pipeGallery);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
 
@@ -67,6 +69,7 @@
             e.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -85,6 +88,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         PipeGallery pipeGallery=new PipeGallery();
         try {
@@ -97,12 +101,14 @@
 
             pipeGalleryManager.save(pipeGallery);
             result = "true";
+            code="200";
             msg = "编辑成功";
         } catch (Exception e) {
             result = "false";
             msg = "编辑失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("result",result);
         resultMap.put("msg",msg);
         return resultMap;
@@ -118,7 +124,8 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
-        String result="false";
+        String result="";
+        String code="0";
 
         try {
             PipeGallery pipeGallery=pipeGalleryManager.get(Long.valueOf(id));
@@ -132,12 +139,14 @@
                 pipeGalleryManager.save(pipeGallery);
                 msg="管廊删除成功";
                 result="true";
+                code="200";
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="管廊删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -151,13 +160,15 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> getPgLengthStatic()
     {
-        Map<String,Object> resultMap=new HashMap<String, Object>();
+        Map<String,Object> resultMap=new HashMap<>();
         List<PipeGalleryStatic> pipeGalleryStaticList=new ArrayList<PipeGalleryStatic>();
         String msg="";
+        String code="0";
 
         try{
             pipeGalleryStaticList=pipeGalleryManager.getPgLengthByName();
 
+            code="200";
             msg="仓体长度获取成功";
         }
         catch(Exception e)
@@ -165,7 +176,7 @@
             e.printStackTrace();
             msg="仓体长度获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pipeGalleryStaticList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java b/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java
index 5c95409..0ce205f 100644
--- a/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java
@@ -43,14 +43,12 @@
 
         try {
 
-
             msg = "获取成功";
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
         resultMap.put("msg", msg);
-        //resultMap.put("result", );
         return resultMap;
     }
     /*
@@ -88,16 +86,18 @@
             throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=new ArrayList<PgDeviceTypeStatisticDto>();
 
         try {
             pgDeviceTypeStatisticDtoList=pgDeviceManager.getDeviceStatisticByDevType();
-
+            code="200";
             msg = "获取成功";
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceTypeStatisticDtoList);
         return resultMap;
diff --git "a/~$\350\257\264\346\230\21620191207.docx" "b/~$\350\257\264\346\230\21620191207.docx"
new file mode 100644
index 0000000..d6477af
--- /dev/null
+++ "b/~$\350\257\264\346\230\21620191207.docx"
Binary files differ

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 25ded8a..283d7ab 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,20 +7,56 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" 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/construction/manager/PgCsDocumentManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/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/manager/PgAlarmManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/~$说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/~$说明20191207.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.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$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/接口说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明20191207.docx" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
@@ -51,7 +87,7 @@
         <counts>
           <entry key="class" value="4" />
           <entry key="iml" value="2" />
-          <entry key="java" value="707" />
+          <entry key="java" value="820" />
           <entry key="properties" value="14" />
           <entry key="xml" value="7" />
         </counts>
@@ -60,7 +96,7 @@
         <counts>
           <entry key="CLASS" value="4" />
           <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="707" />
+          <entry key="JAVA" value="820" />
           <entry key="Properties" value="14" />
           <entry key="XML" value="7" />
         </counts>
@@ -68,32 +104,32 @@
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
           <entry key="dummy" value="38" />
-          <entry key="java" value="30161" />
+          <entry key="java" value="40859" />
           <entry key="properties" value="100" />
-          <entry key="txt" value="176" />
+          <entry key="txt" value="186" />
           <entry key="xml" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="30161" />
-          <entry key="PLAIN_TEXT" value="214" />
+          <entry key="JAVA" value="40859" />
+          <entry key="PLAIN_TEXT" value="224" />
           <entry key="Properties" value="100" />
           <entry key="XML" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="48" />
+          <entry key="project.closed" value="51" />
           <entry key="project.open.time.1" value="5" />
           <entry key="project.open.time.12" value="2" />
           <entry key="project.open.time.13" value="1" />
           <entry key="project.open.time.15" value="1" />
           <entry key="project.open.time.16" value="1" />
           <entry key="project.open.time.17" value="1" />
-          <entry key="project.open.time.2" value="1" />
+          <entry key="project.open.time.2" value="2" />
           <entry key="project.open.time.20" value="1" />
-          <entry key="project.open.time.23" value="1" />
+          <entry key="project.open.time.23" value="2" />
           <entry key="project.open.time.24" value="2" />
           <entry key="project.open.time.251" value="1" />
           <entry key="project.open.time.27" value="2" />
@@ -106,8 +142,8 @@
           <entry key="project.open.time.36" value="1" />
           <entry key="project.open.time.37" value="1" />
           <entry key="project.open.time.39" value="2" />
-          <entry key="project.open.time.4" value="2" />
-          <entry key="project.open.time.40" value="1" />
+          <entry key="project.open.time.4" value="3" />
+          <entry key="project.open.time.40" value="2" />
           <entry key="project.open.time.41" value="2" />
           <entry key="project.open.time.42" value="2" />
           <entry key="project.open.time.43" value="2" />
@@ -122,23 +158,25 @@
           <entry key="project.open.time.6" value="3" />
           <entry key="project.open.time.63" value="2" />
           <entry key="project.open.time.64" value="1" />
+          <entry key="project.open.time.66" value="1" />
           <entry key="project.open.time.71" value="2" />
+          <entry key="project.open.time.74" value="1" />
           <entry key="project.open.time.76" value="1" />
           <entry key="project.open.time.8" value="2" />
           <entry key="project.open.time.9" value="1" />
           <entry key="project.open.time.97" value="1" />
-          <entry key="project.opened" value="78" />
+          <entry key="project.opened" value="84" />
         </counts>
       </usages-collector>
     </session>
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+            <state relative-caret-position="396">
+              <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
               <folding>
                 <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
                 <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -147,73 +185,6 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <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="99">
-              <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-              <folding>
-                <element signature="imports" expanded="true" />
-                <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-                <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-1170">
-              <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state>
-              <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
-              <folding>
-                <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-                <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="true">
-        <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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-              <folding>
-                <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-                <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>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <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="352">
-              <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -225,18 +196,9 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>inCriteria</find>
-      <find>getPgPlanResulList</find>
-      <find>getPileAcuListByPileAcuStr</find>
-      <find>distinct</find>
-      <find>order</find>
-      <find>canPlanLine</find>
-      <find>isExistLine</find>
-      <find>getPlanResult</find>
       <find>pgPipeLine</find>
       <find>getPipeLineBylineName</find>
       <find>StringU</find>
-      <find>getAllAlarm</find>
       <find>getAlarmList</find>
       <find>getPgInPersonListByDay</find>
       <find>getDayInPgStatistic</find>
@@ -254,7 +216,16 @@
       <find>getPgContructionByNameOrType</find>
       <find>&quot;&quot;,&quot;&quot;,</find>
       <find>getPgContructionDtoByNameOrType</find>
+      <find>addConstruction</find>
+      <find>getPgLineAcuHole</find>
+      <find>getPlanResult</find>
       <find>getConstruction</find>
+      <find>addPipeLine</find>
+      <find>未找到入廊数据</find>
+      <find>getCurrentHoleByAcu</find>
+      <find>getAllAlarm</find>
+      <find>getPgDeviceDtoListByPartition</find>
+      <find>getPgDeviceByDevType</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -263,57 +234,57 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlan.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPileAcu.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPileAcuDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgSectionDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileHoleManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanTask.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgLineHole.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateGenericDao.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/planData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/PlanData.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
       </list>
     </option>
   </component>
@@ -359,7 +330,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -421,53 +391,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="dto" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="manager" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -479,29 +402,6 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="reservePlan" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="casic" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="rs" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -516,6 +416,7 @@
         </subPane>
       </pane>
       <pane id="Scope" />
+      <pane id="PackagesPane" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -710,7 +611,13 @@
       <workItem from="1574902733573" duration="1829000" />
       <workItem from="1574998240004" duration="7016000" />
       <workItem from="1575247959683" duration="6997000" />
-      <workItem from="1575704345590" duration="40473000" />
+      <workItem from="1575704345590" duration="69381000" />
+      <workItem from="1575869479666" duration="721000" />
+      <workItem from="1575947104878" duration="6101000" />
+      <workItem from="1576128264436" duration="3347000" />
+      <workItem from="1576208571543" duration="22000" />
+      <workItem from="1576227513917" duration="862000" />
+      <workItem from="1576293721220" duration="18246000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -817,11 +724,18 @@
       <option name="project" value="LOCAL" />
       <updated>1575775489149</updated>
     </task>
-    <option name="localTasksCounter" value="16" />
+    <task id="LOCAL-00016" summary="整改施工信息">
+      <created>1575791780774</created>
+      <option name="number" value="00016" />
+      <option name="presentableId" value="LOCAL-00016" />
+      <option name="project" value="LOCAL" />
+      <updated>1575791780774</updated>
+    </task>
+    <option name="localTasksCounter" value="17" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="452131000" />
+    <option name="totallyTimeSpent" value="510338000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -834,9 +748,8 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
-    <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.24205749" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2647504" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -847,7 +760,7 @@
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.3295082" />
       <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.4819672" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49848714" weight="0.65737706" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.3295082" />
@@ -939,7 +852,8 @@
     <MESSAGE value="重新设计智能规划部分" />
     <MESSAGE value="完成智能规划对接" />
     <MESSAGE value="修改报警统计" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改报警统计" />
+    <MESSAGE value="整改施工信息" />
+    <option name="LAST_COMMIT_MESSAGE" value="整改施工信息" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -951,16 +865,10 @@
           <option name="timeStamp" value="3" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java</url>
-          <line>69</line>
+          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java</url>
+          <line>40</line>
           <properties />
-          <option name="timeStamp" value="21" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java</url>
-          <line>96</line>
-          <properties />
-          <option name="timeStamp" value="38" />
+          <option name="timeStamp" value="122" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
@@ -970,394 +878,452 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <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="2068">
-          <caret line="154" column="35" selection-start-line="154" selection-start-column="35" selection-end-line="154" selection-end-column="35" />
-        </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="3300">
-          <caret line="297" column="22" selection-start-line="297" selection-start-column="22" selection-end-line="297" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/StringUtils.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResult.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
-          <caret line="13" column="48" lean-forward="true" selection-start-line="13" selection-start-column="48" selection-end-line="13" selection-end-column="48" />
+          <caret line="11" column="5" selection-start-line="11" selection-start-column="5" selection-end-line="11" selection-end-column="5" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="78" lean-forward="true" selection-start-line="78" selection-end-line="78" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="616">
-          <caret line="41" column="1" selection-start-line="41" selection-start-column="1" selection-end-line="41" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/domain/PgSection.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="110">
-          <caret line="12" column="23" selection-start-line="12" selection-start-column="23" selection-end-line="12" selection-end-column="23" />
+        <state relative-caret-position="516">
+          <caret line="114" column="12" selection-start-line="114" selection-start-column="12" selection-end-line="114" selection-end-column="12" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="164">
-          <caret line="56" lean-forward="true" selection-start-line="56" selection-end-line="56" />
+        <state relative-caret-position="418">
+          <caret line="33" column="44" selection-start-line="33" selection-start-column="44" selection-end-line="33" selection-end-column="44" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgSectionManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgLineHoleDTO.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="258">
-          <caret line="27" column="12" lean-forward="true" selection-start-line="27" selection-start-column="12" selection-end-line="27" selection-end-column="12" />
+        <state relative-caret-position="132">
+          <caret line="11" column="20" lean-forward="true" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="20" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanParams.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="-12">
-          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        <state relative-caret-position="516">
+          <caret line="142" column="54" selection-start-line="142" selection-start-column="54" selection-end-line="142" selection-end-column="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="858">
-          <caret line="55" column="27" lean-forward="true" selection-start-line="55" selection-start-column="27" selection-end-line="55" selection-end-column="27" />
+        <state relative-caret-position="66">
+          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="58">
+          <caret line="18" column="28" selection-start-line="18" selection-start-column="19" selection-end-line="18" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="305">
+          <caret line="24" column="31" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="714">
+          <caret line="58" column="5" lean-forward="true" selection-start-line="58" selection-start-column="5" selection-end-line="58" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="924">
+          <caret line="134" column="92" selection-start-line="134" selection-start-column="92" selection-end-line="134" selection-end-column="92" />
+          <folding>
+            <element signature="method#linkDevice#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkPartitionCamera#0;class#PgAlarmLinkRs#0" />
+            <element signature="method#linkReservePlan#0;class#PgAlarmLinkRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1066">
+          <caret line="90" lean-forward="true" selection-start-line="90" selection-end-line="90" />
+          <folding>
+            <element signature="method#getTjResultByAlarmType#0;class#PgAlarmTjRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="946">
+          <caret line="148" column="11" lean-forward="true" selection-start-line="148" selection-start-column="11" selection-end-line="148" selection-end-column="11" />
+          <folding>
+            <element signature="method#getAlarmTypeList#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#addAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#editAlarmType#0;class#PgAlarmTypeRs#0" />
+            <element signature="method#deleteAlarmType#0;class#PgAlarmTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="208">
+          <caret line="46" column="23" lean-forward="true" selection-start-line="46" selection-start-column="23" selection-end-line="46" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="113" column="9" lean-forward="true" selection-start-line="113" selection-start-column="9" selection-end-line="113" selection-end-column="9" />
+          <folding>
+            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
+            <element signature="method#getNewestCh4InfoByDev#0;class#PgCh4Rs#0" />
+            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="145" column="6" lean-forward="true" selection-start-line="145" selection-start-column="6" selection-end-line="145" selection-end-column="6" />
+          <folding>
+            <element signature="method#addAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#editAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#deleteAuthority#0;class#PgAuthorityRs#0" />
+            <element signature="method#getAuthorityList#0;class#PgAuthorityRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="58" column="1" lean-forward="true" selection-start-line="58" selection-start-column="1" selection-end-line="58" selection-end-column="1" />
+          <folding>
+            <element signature="method#getPgAssetPlanList#0;class#PgAssetPlanRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="370">
+          <caret line="371" column="66" selection-start-line="371" selection-start-column="66" selection-end-line="371" selection-end-column="66" />
+          <folding>
+            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#searchConstruction#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstructionDev#0;class#PgConstructionRs#0" />
+            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="139" column="13" lean-forward="true" selection-start-line="139" selection-start-column="13" selection-end-line="139" selection-end-column="13" />
+          <folding>
+            <element signature="method#getCoInfoByDevAndDate#0;class#PgCoRs#0" />
+            <element signature="method#getNewestCoInfoByDev#0;class#PgCoRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="540">
+          <caret line="223" column="5" lean-forward="true" selection-start-line="223" selection-start-column="5" selection-end-line="223" selection-end-column="5" />
+          <folding>
+            <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="682">
+          <caret line="100" lean-forward="true" selection-start-line="100" selection-end-line="100" />
+          <folding>
+            <element signature="method#getDeviceTpeyList#0;class#PgDeviceTypeRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceTypeRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="377">
+          <caret line="225" column="35" selection-start-line="225" selection-start-column="35" selection-end-line="225" selection-end-column="35" />
+          <folding>
+            <element signature="method#addEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#addEquipment#1;class#PgEquipmentRs#0" />
+            <element signature="method#getEquipment#0;class#PgEquipmentRs#0" />
+            <element signature="method#deleteEquipment#0;class#PgEquipmentRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="406">
+          <caret line="109" lean-forward="true" selection-start-line="109" selection-end-line="109" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="154">
+          <caret line="28" column="19" selection-start-line="28" selection-start-column="19" selection-end-line="28" selection-end-column="19" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="748">
-          <caret line="49" column="5" lean-forward="true" selection-start-line="49" selection-start-column="5" selection-end-line="49" selection-end-column="5" />
+        <state relative-caret-position="296">
+          <caret line="161" column="35" selection-start-line="161" selection-start-column="35" selection-end-line="161" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="384">
+          <caret line="99" column="5" lean-forward="true" selection-start-line="99" selection-start-column="5" selection-end-line="99" selection-end-column="5" />
+        </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="362">
+          <caret line="340" column="35" selection-start-line="340" selection-start-column="35" selection-end-line="340" selection-end-column="35" />
+          <folding>
+            <element signature="method#addInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPerson#0;class#PgInPgPersonRs#0" />
+            <element signature="method#getInPgPersonInPg#0;class#PgInPgPersonRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-606">
+          <caret line="76" column="20" lean-forward="true" selection-start-line="76" selection-start-column="20" selection-end-line="76" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="65" column="35" selection-start-line="65" selection-start-column="35" selection-end-line="65" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="101" column="35" selection-start-line="101" selection-start-column="35" selection-end-line="101" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="84" column="35" selection-start-line="84" selection-start-column="35" selection-end-line="84" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="59" lean-forward="true" selection-start-line="59" selection-end-line="59" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="60" column="1" lean-forward="true" selection-start-line="60" selection-start-column="1" selection-end-line="60" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="145" column="35" selection-start-line="145" selection-start-column="35" selection-end-line="145" selection-end-column="35" />
+        </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="274">
+          <caret line="350" column="35" selection-start-line="350" selection-start-column="35" selection-end-line="350" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="121" column="39" selection-start-line="121" selection-start-column="39" selection-end-line="121" selection-end-column="39" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="28" column="8" lean-forward="true" selection-start-line="28" selection-start-column="8" selection-end-line="28" selection-end-column="8" />
+        <state relative-caret-position="340">
+          <caret line="103" selection-start-line="103" selection-end-line="103" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="226" column="35" selection-start-line="226" selection-start-column="35" selection-end-line="226" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="203" column="35" selection-start-line="203" selection-start-column="35" selection-end-line="203" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="241" column="35" selection-start-line="241" selection-start-column="35" selection-end-line="241" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="516">
+          <caret line="225" column="1" lean-forward="true" selection-start-line="225" selection-start-column="1" selection-end-line="225" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="176" column="5" lean-forward="true" selection-start-line="176" selection-start-column="5" selection-end-line="176" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="296">
+          <caret line="178" column="35" lean-forward="true" selection-start-line="178" selection-start-column="35" selection-end-line="178" selection-end-column="35" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="516">
-          <caret line="94" column="53" selection-start-line="94" selection-start-column="53" selection-end-line="94" selection-end-column="53" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="814">
-          <caret line="52" column="9" lean-forward="true" selection-start-line="52" selection-start-column="9" selection-end-line="52" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="182">
-          <caret line="58" column="12" lean-forward="true" selection-start-line="58" selection-start-column="12" selection-end-line="58" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="34" lean-forward="true" selection-start-line="34" selection-end-line="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="32" lean-forward="true" selection-start-line="32" selection-end-line="32" />
-          <folding>
-            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" />
-            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="185">
-          <caret line="63" column="13" selection-start-line="63" selection-start-column="13" selection-end-line="63" selection-end-column="13" />
-          <folding>
-            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
-            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
-            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="e#6319#6324#0" />
-            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
-          </folding>
+          <caret line="240" lean-forward="true" selection-start-line="240" selection-end-line="240" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
-          <caret line="58" column="28" lean-forward="true" selection-start-line="58" selection-start-column="28" selection-end-line="58" selection-end-column="28" />
-          <folding>
-            <element signature="method#addTempHumData#0;class#PgTempHumRs#0" />
-          </folding>
+        <state relative-caret-position="340">
+          <caret line="148" column="34" selection-start-line="148" selection-start-column="34" selection-end-line="148" selection-end-column="34" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
+        <state relative-caret-position="458">
+          <caret line="99" column="35" selection-start-line="99" selection-start-column="35" selection-end-line="99" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+        <state relative-caret-position="384">
+          <caret line="145" column="32" lean-forward="true" selection-start-line="145" selection-start-column="32" selection-end-line="145" selection-end-column="32" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="414">
-          <caret line="22" column="46" lean-forward="true" selection-start-line="22" selection-start-column="46" selection-end-line="22" selection-end-column="46" />
-        </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="396">
-          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" column="83" selection-start-line="11" selection-start-column="83" selection-end-line="11" selection-end-column="83" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="26">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
-          <folding>
-            <element signature="method#getPgInPgStatusByPerson#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNumByName#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getInPgNum#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPersonListByDay#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgInPgStatusManager#0" />
-            <element signature="method#getPgInPgStatusByPgInPgPerson#0;class#PgInPgStatusManager#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="44">
-          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-12">
-          <caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="87" lean-forward="true" selection-start-line="87" selection-end-line="87" />
-          <folding>
-            <element signature="method#getConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#addConstructionType#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionTypeRs#0" />
-            <element signature="method#deleteConstructionType#0;class#PgConstructionTypeRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
-          <folding>
-            <element signature="method#getConstructionTypeByType#0;class#PgConstructionTypeManager#0" />
-            <element signature="method#getAllConstructionTypeDto#0;class#PgConstructionTypeManager#0" />
-          </folding>
-        </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="145">
-          <caret line="258" column="9" lean-forward="true" selection-start-line="258" selection-start-column="9" selection-end-line="258" selection-end-column="9" />
-          <folding>
-            <element signature="method#getMonthInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekInPgPersonNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayInPgStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getTodayInPgInfo#0;class#PgOverViewRs#0" />
-            <element signature="method#getAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getMonthAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getWeekAlarmNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getDayAlarmStatistic#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionNum#0;class#PgOverViewRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgOverViewRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="103">
-          <caret line="105" column="50" lean-forward="true" selection-start-line="105" selection-start-column="50" selection-end-line="105" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/hibernate/HibernateBasicDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="99">
-          <caret line="125" selection-start-line="125" selection-end-line="125" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="190">
-          <caret line="24" column="35" lean-forward="true" selection-start-line="24" selection-start-column="35" selection-end-line="24" selection-end-column="35" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="436">
-          <caret line="24" lean-forward="true" selection-start-line="24" selection-end-line="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" lean-forward="true" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="300">
-          <caret line="34" column="31" lean-forward="true" selection-start-line="34" selection-start-column="31" selection-end-line="34" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="42" column="13" lean-forward="true" selection-start-line="42" selection-start-column="13" selection-end-line="42" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="120" column="72" lean-forward="true" selection-start-line="120" selection-start-column="72" selection-end-line="120" selection-end-column="72" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="293">
-          <caret line="58" column="73" lean-forward="true" selection-start-line="58" selection-start-column="73" selection-end-line="58" selection-end-column="73" />
-          <folding>
-            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
-            <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
-          </folding>
-        </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="307">
-          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
+        <state relative-caret-position="758">
+          <caret line="130" column="5" lean-forward="true" selection-start-line="130" selection-start-column="5" selection-end-line="130" selection-end-column="5" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1170">
-          <caret line="117" column="29" selection-start-line="117" selection-start-column="29" selection-end-line="117" selection-end-column="29" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="51" lean-forward="true" selection-start-column="51" selection-end-column="51" />
+        <state relative-caret-position="494">
+          <caret line="86" column="62" lean-forward="true" selection-start-line="86" selection-start-column="62" selection-end-line="86" selection-end-column="62" />
           <folding>
-            <element signature="method#downloadFile#0;class#PgCsDocumentManager#0" />
-            <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+            <element signature="method#getAllDevice#0;class#PgDeviceManager#0" />
+            <element signature="method#getAllDev#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
+            <element signature="method#getPgCameraListByPosition#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="195" column="28" lean-forward="true" selection-start-line="195" selection-start-column="28" selection-end-line="195" selection-end-column="28" />
+        <state relative-caret-position="166">
+          <caret line="174" column="13" lean-forward="true" selection-start-line="174" selection-start-column="13" selection-end-line="174" selection-end-column="13" />
           <folding>
-            <element signature="method#getAlarmByTypeAndTime#0;class#PgAlarmManager#0" />
-            <element signature="method#getAlarmNum#0;class#PgAlarmManager#0" />
             <element signature="method#getDayAlarmStatistic#0;class#PgAlarmManager#0" />
+            <element signature="method#getAlarmList#0;class#PgAlarmManager#0" />
             <element signature="method#createDTO#0;class#PgAlarmManager#0" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="364">
+          <caret line="46" column="56" lean-forward="true" selection-start-line="46" selection-start-column="56" selection-end-line="46" selection-end-column="56" />
+          <folding>
+            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
+            <element signature="method#getPgDev#0;class#PgDeviceRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
+            <element signature="docComment;method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByOldDAssetCodeCode#0;class#PgDeviceRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="51" column="54" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
+        <state relative-caret-position="396">
+          <caret line="37" column="7" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
           <folding>
             <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
             <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" />
@@ -1365,52 +1331,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="239">
-          <caret line="21" column="33" lean-forward="true" selection-start-line="21" selection-start-column="33" selection-end-line="21" selection-end-column="33" />
-        </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="352">
-          <caret line="19" column="29" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="29" />
-        </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="99">
-          <caret line="208" column="68" selection-start-line="208" selection-start-column="68" selection-end-line="208" selection-end-column="68" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="method#addConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#editConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#delConstruction#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionByType#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-          </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="55" column="73" lean-forward="true" selection-start-line="55" selection-start-column="73" selection-end-line="55" selection-end-column="73" />
-          <folding>
-            <element signature="method#getConstructionByTimeAndStatus#0;class#PgConstructionManager#0" />
-            <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>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
index c436c93..e913155 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
@@ -132,7 +132,10 @@
             this.setAlarmType("");
         else
             this.setAlarmType(pgAlarm.getAlarmTypeId().getAlarmType());
-        this.setAlarmValue(pgAlarm.getAlarmValue());
+        if(pgAlarm.getAlarmValue()==null)
+            this.setAlarmValue("");
+        else
+            this.setAlarmValue(pgAlarm.getAlarmValue());
         if (pgAlarm.getAlarmDate() != null)
             this.setAlarmDate(sdf.format(pgAlarm.getAlarmDate()));
         else
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
index a43965c..565cb41 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -159,11 +159,21 @@
     }
 
     //获取历史报警消息列表
-    public List<PgAlarmDto> getAllAlarm(String alarmType,String startDay,String endDay,String isNew,int page,int rows) {
-        try {
+    public  Map<String, Object> getAllAlarm(String alarmType,String partition,String startDay,String endDay,String isNew,int page,int rows) {
 
+        Map<String, Object> resultMap = new HashMap<>();
+        String msg="";
+
+        try {
             Criteria criteria = createCriteria(PgAlarm.class);
 
+            if (StringUtils.isNotBlank(partition)) {
+                DetachedCriteria inCriteria = DetachedCriteria.forClass(PgDevice.class);
+                inCriteria.add(Restrictions.eq("partition", partition));
+                inCriteria.setProjection(Property.forName("id"));
+                criteria.add(Property.forName("alarmDevId").in(inCriteria));
+            }
+
             if (StringUtils.isNotBlank(alarmType)&&!alarmType.contains("全部")&&pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
                 criteria.add(Restrictions.eq("alarmTypeId", pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)));
 
@@ -190,8 +200,16 @@
             for (PgAlarm pgAlarm : pgAlarmList) {
                 pgAlarmDtoList.add(new PgAlarmDto(pgAlarm));
             }
-
-            return pgAlarmDtoList;
+            if(pgAlarmDtoList==null||pgAlarmDtoList.size()==0) {
+                resultMap.put("msg", "没有报警信息");
+                resultMap.put("code","0");
+            }else {
+                resultMap.put("code","200");
+                resultMap.put("msg", "报警信息获取成功");
+            }
+            resultMap.put("count",pg.getTotalCount());
+            resultMap.put("result",pgAlarmDtoList);
+            return resultMap;
         }
         catch(Exception ex){
             ex.printStackTrace();
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index 7547560..654f49e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -24,11 +24,11 @@
 
         Criteria criteria = createCriteria(PgDevice.class);
 
-        if(road!=null)
+        if(StringUtils.isNotBlank(road))
             criteria.add(Restrictions.eq("road",road));
-        if(partition!=null)
+        if(StringUtils.isNotBlank(partition))
             criteria.add(Restrictions.eq("partition",partition));
-        if(devType!=null)
+        if(StringUtils.isNotBlank(devType))
             criteria.add(Restrictions.eq("devType",devType));
 
         criteria.add(Restrictions.eq("active", 1));
@@ -43,6 +43,29 @@
         return pgDeviceDtoList;
     }
 
+    public List<PgDeviceDto> getAllDev(String road,String partition,String devType) {
+
+        Criteria criteria = createCriteria(PgDevice.class);
+
+        if(StringUtils.isNotBlank(road))
+            criteria.add(Restrictions.eq("road",road));
+        if(StringUtils.isNotBlank(partition))
+            criteria.add(Restrictions.eq("partition",partition));
+        if(StringUtils.isNotBlank(devType))
+            criteria.add(Restrictions.like("devType","%"+devType+"%"));
+
+        criteria.add(Restrictions.eq("active", 1));
+        criteria.addOrder(Order.desc("id"));
+        List<PgDevice> pgDeviceList = criteria.list();
+
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
+        for (PgDevice pgDevice : pgDeviceList) {
+            pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
+        }
+
+        return pgDeviceDtoList;
+    }
+
     //根据名字获取当前设备
     public PgDevice getDeviceByAssetCode(String assetCode) {
         Criteria criteria=createCriteria(PgDevice.class);
@@ -56,9 +79,9 @@
     }
 
     //根据类型获取设备列表
-    public List<PgDeviceDto> getDeviceByDevTypee(String devType) {
+    public List<PgDeviceDto> getDeviceByDevType(String devType) {
         Criteria criteria=createCriteria(PgDevice.class);
-        criteria.add(Restrictions.eq("devType",devType));
+        criteria.add(Restrictions.like("devType","%"+devType+"%"));
 
         List<PgDevice> pgDeviceList=criteria.list();
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
@@ -106,7 +129,7 @@
         criteria.add(Restrictions.eq("partition",partition));
 
         List<PgDevice> pgDeviceList=criteria.list();
-        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<PgDeviceDto>();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
 
         for (PgDevice pgDevice : pgDeviceList) {
             pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
index 3a3bccd..595730e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
@@ -1,10 +1,13 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.devTable.domain.PgAlarmType;
 import com.casic.PgInterface.devTable.domain.PgPartition;
 import com.casic.PgInterface.devTable.domain.PgRoad;
 import com.casic.PgInterface.devTable.domain.PipeGallery;
 import com.casic.PgInterface.devTable.dto.PgPartitionDto;
+import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
@@ -12,7 +15,9 @@
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Created by yxw on 2017/11/4.
@@ -21,7 +26,8 @@
 public class PgPartitionManager extends HibernateEntityDao<PgPartition> {
 
     @Resource
-    PgRoadManager pgRoadManager;
+    private PgRoadManager pgRoadManager;
+
 
     public PgPartition getPartitionByParName(String parName) {
         Criteria criteria = getSession().createCriteria(PgPartition.class);
@@ -99,4 +105,5 @@
         return pgPartitionDtoList;
     }
 
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
index f216360..a6928f1 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/dto/PgPlanResultRe.java
@@ -5,6 +5,7 @@
 public class PgPlanResultRe {
 
     private String taskKey;
+    private List<String> pileAcuList;
     private List<PgPlanResult> pgPlanResultList;
 
     public String getTaskKey() {
@@ -15,6 +16,14 @@
         this.taskKey = taskKey;
     }
 
+    public List<String> getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(List<String> pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+
     public List<PgPlanResult> getPgPlanResultList() {
         return pgPlanResultList;
     }
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
index 71ea765..47eea07 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgLineHoleManager.java
@@ -54,9 +54,7 @@
 
         List<PgLineHole> pgLineHoleList=criteria.list();
         List<PgLineHoleDTO> pgLineHoleDTOList=new ArrayList<>();
-        if(pgLineHoleList==null||pgLineHoleList.size()==0)
-            return null;
-        else
+        if(pgLineHoleList!=null&&pgLineHoleList.size()!=0)
             pgLineHoleDTOList=PgLineHoleDTO.ConvertToDTOList(pgLineHoleList,pgPileAcuManager,pgRoadManager);
         return pgLineHoleDTOList;
     }
diff --git a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
index 0fd9e1f..841a386 100644
--- a/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
+++ b/src/main/java/com/casic/PgInterface/intelPlan/manager/PgPileAcuManager.java
@@ -1,12 +1,15 @@
 package com.casic.PgInterface.intelPlan.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.devTable.domain.PgPartition;
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
 import com.casic.PgInterface.intelPlan.domain.PgLineHole;
 import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
 import com.casic.PgInterface.intelPlan.domain.PgSection;
 import com.casic.PgInterface.intelPlan.dto.PgPlanResult;
 import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
 import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -22,6 +25,9 @@
     @Resource
     private PgLineHoleManager pgLineHoleManager;
 
+    @Resource
+    private PgRoadManager pgRoadManager;
+
     public PgPileAcu getPgPileAcuByCode(String acuCode){
         List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
 
@@ -58,7 +64,9 @@
         for(PgPlanTask pgPlanTask:pgPlanTaskList){
             List<PgPlanResult> pgPlanResultList=getPgPlanResultByPlantask(pgPlanTask);
             PgPlanResultRe pgPlanResultRe=new PgPlanResultRe();
+
             pgPlanResultRe.setTaskKey(pgPlanTask.getTaskKey());
+            pgPlanResultRe.setPileAcuList(pgPlanTask.getPileAcuList());
             pgPlanResultRe.setPgPlanResultList(pgPlanResultList);
 
             pgPlanResultReList.add(pgPlanResultRe);
@@ -142,4 +150,57 @@
         return length;
     }
 
+    private PgPileAcu getPgPileAcuByAcuCode(String acuCode){
+        List<PgPileAcu> pgPileAcuList=this.findBy("acuCode",acuCode);
+
+        if(pgPileAcuList==null||pgPileAcuList.size()==0)
+            return null;
+        else
+            return pgPileAcuList.get(0);
+    }
+
+    public List<PgAcuTask> getACUTask(String pileAcuList){
+        String[] acuArray=pileAcuList.split(",");
+        List<PgAcuTask> pgAcuTaskList=new ArrayList<>();
+
+        for(String acu:acuArray){
+            PgPileAcu pgPileAcu=this.getPgPileAcuByCode(acu);
+            String roadName=pgRoadManager.get(pgPileAcu.getRoadId()).getRoadName();
+
+            if(!containRoad(roadName,pgAcuTaskList))
+            {
+                PgAcuTask pgAcuTask=new PgAcuTask();
+                pgAcuTask.setRoadName(roadName);
+                pgAcuTask.setPileAcuList(acu);
+                pgAcuTaskList.add(pgAcuTask);
+            }
+            else{
+                PgAcuTask pgAcuTask=getIndexRoad(roadName,pgAcuTaskList);
+                if(pgAcuTask!=null)
+                    pgAcuTask.setPileAcuList(pgAcuTask.getPileAcuList()+","+acu);
+            }
+        }
+
+        return pgAcuTaskList;
+    }
+
+    private boolean containRoad(String roadName,List<PgAcuTask> pgAcuTaskList){
+        if(pgAcuTaskList==null||pgAcuTaskList.size()==0) return false;
+        for(PgAcuTask pgAcuTask:pgAcuTaskList){
+            if(pgAcuTask.getRoadName().equals(roadName))
+                return true;
+        }
+
+        return false;
+    }
+
+    private PgAcuTask getIndexRoad(String roadName, List<PgAcuTask> pgAcuTaskList){
+        for(PgAcuTask pgAcuTask:pgAcuTaskList){
+            if(pgAcuTask.getRoadName().equals(roadName))
+                return pgAcuTask;
+        }
+
+        return null;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java
new file mode 100644
index 0000000..323f7ef
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgAcuTask.java
@@ -0,0 +1,25 @@
+package com.casic.PgInterface.reservePlan.dto;
+
+import java.util.List;
+
+public class PgAcuTask {
+
+    private String roadName;//道路
+    private String pileAcuList;//acu分区
+
+    public String getRoadName() {
+        return roadName;
+    }
+
+    public void setRoadName(String roadName) {
+        this.roadName = roadName;
+    }
+
+    public String getPileAcuList() {
+        return pileAcuList;
+    }
+
+    public void setPileAcuList(String pileAcuList) {
+        this.pileAcuList = pileAcuList;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
index c25e926..c7d7693 100644
--- a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
@@ -70,9 +70,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(Long.valueOf(inPgPersonId));
         PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("hostName",pgInPgPerson.getAssetCode());
-//        PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode());
-//        long maxId = pgTagPositionManager.getMaxId(pgTagMac.getTagMac());
-//        PGTagPosition pgTagPosition = pgTagPositionManager.get(maxId);
+
         PGTagPosition pgTagPosition = tagmacRun.GetTagStatus(pgTagMac);
         boolean bExist = false;
         bExist = pgTagPositionManager.findTagPosition(pgTagPosition.getPositionUpdatetime(),pgTagPosition.getHostId());
@@ -104,8 +102,7 @@
         PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(Long.valueOf(inPgPersonId));
         PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pgInPgPersonId",pgInPgPerson);
         System.out.println("time:"+pgInPgStatus.getInTime());
-//        PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pgInPgPersonId",inPgPersonId);
-//        PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode());
+
         PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("hostName",pgInPgPerson.getAssetCode());
 
         Map<Object,Object> mapPosition = new HashMap<>();
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
index 082ba5d..3eed00a 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
@@ -48,6 +48,7 @@
     public Map<String, Object> linkDevice(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         PgDeviceDto pgDeviceDto = null;
         try {
@@ -62,6 +63,7 @@
                     else {
                         pgDeviceDto = new PgDeviceDto(pgDevice);
                         msg = "报警关联设备获取成功";
+                        code="200";
                     }
                 }
             }
@@ -71,6 +73,7 @@
             e.printStackTrace();
             msg = "获取关联设备失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceDto);
 
@@ -86,6 +89,7 @@
     public Map<String, Object> linkPartitionCamera(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
         try {
@@ -106,6 +110,7 @@
 
                         pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(partition,position);
                         msg = "关联设备获取成功";
+                        code="200";
                     }
                 }
             }
@@ -115,6 +120,7 @@
             e.printStackTrace();
             msg = "分区设备关联失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceDtoList);
         return resultMap;
@@ -129,6 +135,7 @@
     public Map<String, Object> linkReservePlan(@FormParam("id") String id) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgReservePlanDto> pgReservePlanDtoList=new ArrayList<>();
         try{
@@ -139,10 +146,12 @@
                 else {
                     pgReservePlanDtoList = pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
 
-                    if(pgReservePlanDtoList==null||pgReservePlanDtoList.size()==0)
-                        msg="不存在关联的报警预案";
-                    else
+                    if (pgReservePlanDtoList == null || pgReservePlanDtoList.size() == 0)
+                        msg = "不存在关联的报警预案";
+                    else {
                         msg = "关联预案获取成功";
+                        code="200";
+                    }
                 }
             }
             else
@@ -153,6 +162,7 @@
             e.printStackTrace();
             msg="预案关联失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgReservePlanDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
index 0ddbc4d..0ce886b 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
@@ -41,25 +41,19 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getAlarmList(@FormParam("alarmType") String alarmType,
                                             @FormParam("startDay") String startDay,
+                                            @FormParam("partition") String partition,
                                             @FormParam("endDay") String endDay,
                                             @FormParam("isNew") String isNew,
                                             @FormParam("page") int page,
                                             @FormParam("rows") int rows) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
         try {
-            pgAlarmDtoList = pgAlarmManager.getAllAlarm(alarmType,startDay,endDay,isNew,page,rows);
-            if (pgAlarmDtoList==null||pgAlarmDtoList.size() == 0)
-                msg = "没有报警信息";
-            else
-                msg = "报警信息获取成功";
+            resultMap = pgAlarmManager.getAllAlarm(alarmType,partition,startDay,endDay,isNew,page,rows);
+
         } catch (Exception e) {
             e.printStackTrace();
-            msg = "报警信息获取失败";
         }
-        resultMap.put("msg", msg);
-        resultMap.put("result", pgAlarmDtoList);
         return resultMap;
     }
 
@@ -71,9 +65,10 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> clearAlarmList(@FormParam("id") String id) throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        String result = "false";
+        String result = "";
+        String code="0";
 
         try {
             PgAlarm pgAlarm = new PgAlarm();
@@ -86,12 +81,14 @@
                 pgAlarmManager.save(pgAlarm);
                 msg = "报警信息清除成功";
                 result = "true";
+                code = "200";
             }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警信息清除失败";
             result = "false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
@@ -106,21 +103,26 @@
     public Map<String, Object> getAlarmByTypeOrTime(@FormParam("alarmType") String alarmType,
                                                     @FormParam("startTime") String startTime,
                                                     @FormParam("endTime") String endTime) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
-        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<PgAlarmDto>();
+        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
         try {
             pgAlarmDtoList = pgAlarmManager.getAlarmByTypeAndTime(alarmType, startTime, endTime);
             if (pgAlarmDtoList == null || pgAlarmDtoList.size() == 0)
                 msg = "报警信息不存在";
             else
+            {
                 msg = "报警信息获取成功";
+                code="200";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警信息获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
index 29ce8a4..ed0bf34 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
@@ -39,8 +39,8 @@
     public Map<String, Object> getAlarmRule(@FormParam("devType") String devType) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
-        System.out.println("devType:"+devType);
         List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<>();
         try {
             pgAlarmRuleDtoList = pgAlarmRuleManager.getAlarmRuleDto(devType);
@@ -52,6 +52,7 @@
             e.printStackTrace();
             msg = "报警阈值信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmRuleDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
index 24ab894..abef1b1 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
@@ -39,16 +39,21 @@
                                                      @FormParam("endDate") String endDate)throws Exception{
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
+
         List<PgAlarmTjDto> pgAlarmTjDtoList=null;
         try{
             pgAlarmTjDtoList=pgAlarmTjManager.getAlarmTjResultByType(startDate,endDate);
             msg="获取成功";
+            code="200";
         }
         catch(Exception ex) {
             msg = "统计失败";
         }
-        resultMap.put("result",pgAlarmTjDtoList);
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
+        resultMap.put("result",pgAlarmTjDtoList);
+
         return resultMap;
     }
 
@@ -61,23 +66,27 @@
     public Map<String, Object> getAlarmByTime(@FormParam("startTime") String startTime,
                                               @FormParam("endTime") String endTime,
                                               @FormParam("statisticType") String statisticType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code = "0";
 
-        List<PgAlarmTjDto> pgAlarmTjDtoList = new ArrayList<PgAlarmTjDto>();
+        List<PgAlarmTjDto> pgAlarmTjDtoList = new ArrayList<>();
         try {
             pgAlarmTjDtoList = pgAlarmTjManager.getAlarmByTime(startTime, endTime, statisticType);
             if(pgAlarmTjDtoList==null)
                 msg="报警统计信息获取失败";
-            else
-                msg="报警统计信息获取成功";
+            else {
+                msg = "报警统计信息获取成功";
+                code="200";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警统计信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmTjDtoList);
         return resultMap;
     }
 
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
index 28bc811..b6278a9 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
@@ -30,7 +30,6 @@
     @Resource
     private PgAlarmTypeManager pgAlarmTypeManager;
 
-
     /**
      * 获取报警类型
      */
@@ -38,19 +37,24 @@
     @Path("getAlarmType")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getAlarmTypeList()throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
-        List<PgAlarmTypeDto> pgAlarmTypeDtoList=new ArrayList<PgAlarmTypeDto>();
+        String code="";
+
+        List<PgAlarmTypeDto> pgAlarmTypeDtoList=new ArrayList<>();
         try {
             pgAlarmTypeDtoList = pgAlarmTypeManager.getAllAlarmTypeDto();
             if(pgAlarmTypeDtoList.size()==0)
                 msg="没有报警类型信息";
-            else
-                msg="报警类型信息获取成功";
+            else {
+                code="200";
+                msg = "报警类型信息获取成功";
+            }
         }catch(Exception e){
             e.printStackTrace();
             msg="报警类型信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAlarmTypeDtoList);
         return resultMap;
@@ -66,6 +70,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
@@ -83,6 +88,7 @@
                 logger.info("成功保存");
                 result = "true";
                 msg = "保存成功";
+                code="200";
             }
         } catch (Exception e) {
             result = "false";
@@ -90,6 +96,7 @@
             e.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -106,6 +113,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try{
             if(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null)
@@ -119,6 +127,7 @@
                 pgAlarmTypeManager.save(pgAlarmType);
                 result = "true";
                 msg = "编辑成功";
+                code="200";
             }
         }
         catch(Exception e)
@@ -128,6 +137,7 @@
             e.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("result",result);
         resultMap.put("msg",msg);
 
@@ -146,6 +156,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
         String result="false";
+        String code="0";
 
         try {
             PgAlarmType pgAlarmType=pgAlarmTypeManager.get(Long.valueOf(id));
@@ -157,6 +168,7 @@
             {
                 pgAlarmType.setActive(0);
                 pgAlarmTypeManager.save(pgAlarmType);
+                code="200";
                 msg="报警类型删除成功";
                 result="true";
             }
@@ -165,6 +177,7 @@
             msg="报警类型删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
index 4533e1a..85940bb 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
@@ -33,12 +33,15 @@
                                                  @FormParam("inSpectionPlace") String inSpectionPlace){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
         List<PgAssetPlanDto> pgAssetPlanDtoList=new ArrayList<>();
         try{
             pgAssetPlanDtoList=pgAssetPlanManager.getPgAssetPlanDtoList(startDay,endDay,inSpectionPlace);
-            if(pgAssetPlanDtoList!=null&&pgAssetPlanDtoList.size()!=0)
-                msg="巡检信息获取成功";
+            if(pgAssetPlanDtoList!=null&&pgAssetPlanDtoList.size()!=0) {
+                code="200";
+                msg = "巡检信息获取成功";
+            }
             else
                 msg="不存在巡检信息";
         }
@@ -47,6 +50,7 @@
             msg="巡检信息获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAssetPlanDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
index 47ef9d1..5cbdfcb 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
@@ -30,12 +30,15 @@
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
         String result="";
+        String code="0";
 
         List<PgAssetPlanStatic> pgAssetPlanStaticList = null;
         try{
             pgAssetPlanStaticList=pgAssetPlanManager.getPgAssetPlanStaticLisByTime(startTime,endTime,staticType);
-            if(pgAssetPlanStaticList!=null&&pgAssetPlanStaticList.size()!=0)
-                msg="巡检统计信息获取成功";
+            if(pgAssetPlanStaticList!=null&&pgAssetPlanStaticList.size()!=0) {
+                code = "200";
+                msg = "巡检统计信息获取成功";
+            }
             else
                 msg="统计信息获取失败";
         }
@@ -44,6 +47,7 @@
             msg="统计失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAssetPlanStaticList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
index 26f5d6a..503bfe3 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java
@@ -40,6 +40,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="";
 
         try{
             PgAuthority pgAuthority=new PgAuthority();
@@ -50,6 +51,7 @@
 
             pgAuthorityManager.save(pgAuthority);
             msg="用户权限保存成功";
+            code="200";
             result="true";
         }
         catch(Exception e) {
@@ -57,6 +59,7 @@
             msg = "新增权限失败";
             result = "false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -65,22 +68,25 @@
 
     /*
        *编辑角权限信息
-        */
+    */
     @POST
     @Path("editAuthority")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> editAuthority(@FormParam("id") String id,
                                        @FormParam("authority") String authority,
                                        @FormParam("concent") String concent) throws Exception{
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
+
         try {
             PgAuthority pgAuthority=pgAuthorityManager.get(Long.valueOf(id));
             pgAuthority.setAuthority(authority);
             pgAuthority.setConcent(concent);
 
             pgAuthorityManager.save(pgAuthority);
+            code="200";
             msg="权限保存成功";
             result="true";
         }
@@ -90,7 +96,7 @@
             msg="权限编辑失败";
             result="false";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -105,9 +111,10 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> deleteAuthority(@FormParam("id") String id)throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
-        String result="false";
+        String result="";
+        String code="0";
 
         try {
             PgAuthority pgAuthority= pgAuthorityManager.get(Long.valueOf(id));
@@ -119,6 +126,7 @@
             {
                 pgAuthority.setActive(0);
                 pgAuthorityManager.save(pgAuthority);
+                code="200";
                 msg="删除权限成功";
                 result="true";
             }
@@ -127,37 +135,40 @@
             msg="删除权限失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
     }
 
     /*
-* 获取权限信息
- */
+    * 获取权限信息
+    */
     @POST
     @Path("getAuthorityList")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> getAuthorityList() {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgAuthorityDto> pgAuthorityDtoList = new ArrayList<PgAuthorityDto>();
         try {
             pgAuthorityDtoList = pgAuthorityManager.getAuthorityList();
             if (pgAuthorityDtoList == null)
                 msg = "不存在权限信息";
-            else
+            else {
+                code = "200";
                 msg = "权限信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "权限信息获取是失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgAuthorityDtoList);
         return resultMap;
     }
 
 
-
-
 }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
index a9ef521..a74ecc7 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
@@ -45,6 +45,7 @@
                                                @FormParam("endDate") String endDate)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgHistoryDataDto> pgHistoryDataDtoList=new ArrayList<>();
 
         try {
@@ -55,13 +56,16 @@
                 pgHistoryDataDtoList=pgCh4Manager.getAllCH4Data(pgDevice,startDate,endDate);
                 if(pgHistoryDataDtoList==null)
                     msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+                else {
+                    code = "200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgHistoryDataDtoList);
         return resultMap;
@@ -75,8 +79,9 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getNewestCh4InfoByDev(@FormParam("assetCode") String assetCode)throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
+        String code="0";
         PgCh4Dto pgCh4Dto=new PgCh4Dto(null);
 
         try {
@@ -87,13 +92,17 @@
                 pgCh4Dto=pgCh4Manager.getNewestCH4Data(pgDevice);
                 if(pgCh4Dto==null)
                     msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgCh4Dto);
         return resultMap;
@@ -111,6 +120,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
@@ -127,6 +137,7 @@
                 pgCh4.setPgDeviceId(pgDevice);
 
                 pgCh4Manager.save(pgCh4);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -135,7 +146,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
index a7eac39..dfc8ca5 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
@@ -43,23 +43,27 @@
                                                       @FormParam("endDate") String endDate)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgHistoryDataDto> pgHistoryDataDtoList=new ArrayList<>();
 
         try {
             PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
                 msg="设备不存在";
-            else{
-                pgHistoryDataDtoList=pgCoManager.getAllCoData(pgDevice, startDate, endDate);
-                if(pgHistoryDataDtoList==null)
-                    msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+            else {
+                pgHistoryDataDtoList = pgCoManager.getAllCoData(pgDevice, startDate, endDate);
+                if (pgHistoryDataDtoList == null)
+                    msg = "没有满足要求的数据";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgHistoryDataDtoList);
         return resultMap;
@@ -75,6 +79,7 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         PgCoDto pgCoDto=new PgCoDto(null);
 
         try {
@@ -85,13 +90,16 @@
                 pgCoDto=pgCoManager.getNewestCoData(pgDevice);
                 if(pgCoDto==null)
                     msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgCoDto);
         return resultMap;
@@ -110,6 +118,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         try {
@@ -126,6 +135,7 @@
 
                 pgCoManager.save(pgCo);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
         } catch (Exception e) {
@@ -133,7 +143,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
index b4b826e..9af98a3 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
@@ -60,6 +60,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         try {
 
@@ -80,8 +81,8 @@
                 pgConstruction.setPgConstructionTypeId(pgConstructionType.getId());
                 pgConstruction.setActive(1);
                 pgConstruction.setParName(parName);
-                logger.info("保存成功");
                 pgConstructionManager.save(pgConstruction);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -90,6 +91,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("success", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -116,6 +118,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
@@ -140,6 +143,7 @@
                 pgConstruction.setParName(parName);
 
                 pgConstructionManager.save(pgConstruction);
+                code="200";
                 result = "true";
                 msg = "编辑成功";
             }
@@ -150,7 +154,7 @@
             e.printStackTrace();
 
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -167,6 +171,8 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
+
         try {
             PgConstruction pgConstruction = pgConstructionManager.get(Long.valueOf(id));
             if (pgConstruction == null)
@@ -177,6 +183,7 @@
             {
                 pgConstruction.setActive(0);
                 pgConstructionManager.save(pgConstruction);
+                code="200";
                 result = "true";
                 msg = "成功删除信息";
             }
@@ -185,6 +192,7 @@
             result = "false";
             msg = "删除失败";
         }
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -204,9 +212,11 @@
                                                   @FormParam("rows") int rows)throws Exception{
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
         List<PgConstructionDto> pgConstructionDtoList=new ArrayList<>();
         try{
             pgConstructionDtoList=pgConstructionManager.getPgContructionDto(cs_name,cs_type,startTime,endTime,page,rows);
+            code="200";
             msg="信息获取成功";
         }
         catch(Exception e)
@@ -214,6 +224,7 @@
             e.printStackTrace();
             msg="查询失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
 
@@ -231,18 +242,22 @@
                                                               @FormParam("statisticType") String statisticType) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgConstructionStiatistic> pgConstructionStiatisticList=new ArrayList<>();
         try {
             pgConstructionStiatisticList = pgConstructionManager.getConstructionByTimeAndStatus(startTime, endTime, statisticType);
             if(pgConstructionStiatisticList==null)
                 msg="施工统计信息获取失败";
-            else
-                msg="施工统计信息获取成功";
+            else {
+                code="200";
+                msg = "施工统计信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "施工统计信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgConstructionStiatisticList);
         return resultMap;
@@ -257,6 +272,7 @@
     public Map<String, Object> getConstructionByType(@FormParam("statisticType") String statisticType){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
         List<PgConstructionStiatistic> pgConstructionStiatisticList=new ArrayList<>();
 
         try{
@@ -268,6 +284,7 @@
                 resultMap.put("result",null);
             }
             else {
+                code="200";
                 msg = "统计信息获取成功";
                 resultMap.put("result", pgConstructionStiatisticList);
             }
@@ -278,6 +295,7 @@
             msg="统计失败";
             resultMap.put("result",null);
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         return resultMap;
     }
@@ -291,9 +309,11 @@
     public Map<String, Object> getConstructionToday() throws Exception{
         Map<String,Object> resultMap=new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgConstructionDto> pgConstructionDtoList=new ArrayList<PgConstructionDto>();
         try {
             pgConstructionDtoList = pgConstructionManager.getConstructionToday();
+            code="200";
             msg = "当天施工信息获取成功";
         }
         catch(Exception e)
@@ -301,7 +321,7 @@
             e.printStackTrace();
             msg="获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
         return resultMap;
@@ -316,6 +336,7 @@
     public Map<String, Object> getConstructionDev(@FormParam("id") String id) throws Exception{
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
         List<PgDeviceDto> pgDeviceDtoList =new ArrayList<>();
         try{
@@ -325,14 +346,17 @@
 
             if(pgDeviceDtoList==null)
                 msg="信息获取失败";
-            else
-                msg="信息获取成功";
+            else {
+                code="200";
+                msg = "信息获取成功";
+            }
         }
         catch(Exception e)
         {
             e.printStackTrace();
-            msg="设备信息获取成功";
+            msg="信息获取是被";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgDeviceDtoList);
 
@@ -346,17 +370,21 @@
     @Path("getConstruction")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getConstruction() throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
-        List<PgConstructionDto> pgConstructionDtoList=new ArrayList<PgConstructionDto>();
+        String code="0";
+
+        List<PgConstructionDto> pgConstructionDtoList=new ArrayList<>();
 
         try{
             pgConstructionDtoList=pgConstructionManager.getPgConstructionList();
             if(pgConstructionDtoList==null||pgConstructionDtoList.size()==0)
                 msg="不存在施工记录";
-            else
-                msg="施工信息获取成功";
+            else {
+                code = "200";
+                msg = "施工信息获取成功";
+            }
         }
         catch(Exception e)
         {
@@ -364,6 +392,7 @@
             msg="施工信息获取失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java
index fd3d53e..2019502 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java
@@ -39,12 +39,12 @@
         try {
             pgConstructionTypeDtoList = pgConstructionTypeManager.getAllConstructionTypeDto();
             if (pgConstructionTypeDtoList.size() == 0)
-                msg = "没有项目类型信息";
+                msg = "获取失败";
             else
-                msg = "项目类型获取成功";
+                msg = "获取成功";
         } catch (Exception e) {
             e.printStackTrace();
-            msg = "项目类型信息获取失败";
+            msg = "获取失败";
         }
         resultMap.put("msg", msg);
         resultMap.put("result", pgConstructionTypeDtoList);
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
index 90d001c..037a399 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
@@ -51,6 +51,7 @@
 
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if (StringUtils.isBlank(construct_doc)||StringUtils.isBlank(doc_name))
@@ -65,6 +66,7 @@
             pgCsDocument.setActive(1);
             pgCsDocumentManager.save(pgCsDocument);
 
+            code="200";
             result = "true";
             msg = "保存成功";
 
@@ -74,6 +76,7 @@
             ex.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("success", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -90,6 +93,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             PgCsDocument pgCsDocument = pgCsDocumentManager.get(Long.valueOf(id));
@@ -103,6 +107,7 @@
 
                 pgCsDocumentManager.save(pgCsDocument);
 
+                code="200";
                 result = "true";
                 msg = "编辑成功";
             }
@@ -112,6 +117,7 @@
             msg = "编辑失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -125,9 +131,9 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
         String result="";
+        String code="0";
 
         try{
-
             PgCsDocument pgCsDocument = pgCsDocumentManager.get(Long.valueOf(id));
             if(pgCsDocument==null)
             {
@@ -137,6 +143,7 @@
             else{
                 pgCsDocument.setActive(0);
                 pgCsDocumentManager.save(pgCsDocument);
+                code="200";
                 result="true";
                 msg="删除成功";
             }
@@ -147,7 +154,7 @@
             msg="预案删除失败";
             result="false";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -168,18 +175,21 @@
 
         String msg="";
         String result="";
+        String code="0";
 
         try {
             pgCsDocumentDtoList = pgCsDocumentManager.getAllDocData(cs_name);
-            if (pgCsDocumentDtoList != null)
+            if (pgCsDocumentDtoList != null) {
+                code="200";
                 msg = "获取数据成功";
+            }
             else
                 msg = "没有满足条件的数据";
         }catch (Exception e){
             e.printStackTrace();
             msg = "获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgCsDocumentDtoList);
         return resultMap;
@@ -192,20 +202,22 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
 
         String msg = "";
+        String code="0";
         ResponseEntity<byte[]> path = null;
         try {
             PgCsDocument pgCsDocument = pgCsDocumentManager.get(Long.valueOf(id));
             path = pgCsDocumentManager.downloadFile(pgCsDocument);
             if (path == null)
                 msg = "不存在该文档";
-            else
+            else {
+                code = "200";
                 msg = "下载成功";
-
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "下载失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("result", path.getBody());
         resultMap.put("msg", msg);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
index 94c5c84..ffc8b95 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
@@ -41,22 +41,24 @@
     public Map<String, Object> getPgDeviceByDevType(@FormParam("devType") String devType) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
         try {
-            pgDeviceDtoList = pgDeviceManager.getDeviceByDevTypee(devType);
+            pgDeviceDtoList = pgDeviceManager.getDeviceByDevType(devType);
             if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0){
                 msg="不存在满足要求的数据";
-                resultMap.put("result",null);
             }
             else{
-                resultMap.put("result", pgDeviceDtoList);
+                code="200";
                 msg = "获取成功";
             }
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", pgDeviceDtoList);
         return resultMap;
     }
 
@@ -69,25 +71,26 @@
     public Map<String, Object> getPgDeviceByAssetCode(@FormParam("assetCode") String assetCode) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         PgDeviceDto pgDeviceDto=null;
         try {
             PgDevice pgDevice = pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
             {
                 msg="不存在设备信息";
-                resultMap.put("result",null);
             }
             else {
                 pgDeviceDto = new PgDeviceDto(pgDevice);
                 msg = "获取成功";
-                resultMap.put("result", pgDeviceDto);
+                code="200";
             }
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", pgDeviceDto);
         return resultMap;
     }
 
@@ -102,27 +105,61 @@
                                              @FormParam("devType") String devType)throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
         try {
             pgDeviceDtoList = pgDeviceManager.getAllDevice(road,partition,devType);
             if(pgDeviceDtoList.size()==0) {
                 msg = "没有找到设备信息";
-                resultMap.put("result",null);
             }
             else {
                 msg = "设备信息获取成功";
-                resultMap.put("result", pgDeviceDtoList);
+                code="200";
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result", pgDeviceDtoList);
         return resultMap;
     }
 
     /**
+     * 显示设备列表
+     */
+    @POST
+    @Path("getPgDev")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String, Object> getPgDev(@FormParam("road") String road,
+                                             @FormParam("partition") String partition,
+                                             @FormParam("devType") String devType)throws Exception {
+        Map<String, Object> resultMap = new HashMap<>();
+        String msg="";
+        String code="0";
+        List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
+        try {
+            pgDeviceDtoList = pgDeviceManager.getAllDev(road,partition,devType);
+            if(pgDeviceDtoList.size()==0) {
+                msg = "没有找到设备信息";
+            }
+            else {
+                code="200";
+                msg = "设备信息获取成功";
+            }
+        }catch(Exception e){
+            e.printStackTrace();
+            msg="设备信息获取失败";
+        }
+        resultMap.put("code",code);
+        resultMap.put("msg",msg);
+        resultMap.put("result", pgDeviceDtoList);
+        return resultMap;
+    }
+
+
+    /**
      * 新增设备
      */
     @POST
@@ -145,6 +182,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if (pgDeviceManager.getDeviceByAssetCode(assetCode)!=null) {
@@ -169,6 +207,7 @@
 
                 pgDeviceManager.save(pgDevice);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
 
@@ -177,10 +216,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -208,14 +246,9 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
-            /*
-            if (pgDeviceManager.getDeviceByAssetCode(assetCode)!=null) {
-                result = "false";
-                msg = "已存在同名设备";
-            } else {
-            */
             PgDevice pgDevice = pgDeviceManager.get(Long.valueOf(id));
             pgDevice.setPipeGallery(pipeGallery);
             pgDevice.setPartition(partition);
@@ -233,14 +266,14 @@
 
             pgDeviceManager.save(pgDevice);
             result = "true";
+            code="200";
             msg = "编辑成功";
-            //}
         } catch (Exception e) {
             result = "false";
             msg = "编辑失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("result",result);
         resultMap.put("msg",msg);
         return resultMap;
@@ -256,7 +289,8 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
-        String result="false";
+        String result="";
+        String code="0";
 
         try {
             PgDevice pgDevice=pgDeviceManager.get(Long.valueOf(id));
@@ -268,6 +302,7 @@
             {
                 pgDevice.setActive(0);
                 pgDeviceManager.save(pgDevice);
+                code="200";
                 msg="设备删除成功";
                 result="true";
             }
@@ -276,6 +311,7 @@
             msg="设备删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -291,18 +327,18 @@
     {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         PgDeviceDto pgDeviceDto=null;
 
         try{
             PgDevice pgDevice=pgDeviceManager.getDeviceBydevCode(devCode);
             if(pgDevice==null) {
                 msg = "设备信息获取失败";
-                resultMap.put("result",null);
             }
             else{
                 pgDeviceDto = new PgDeviceDto(pgDevice);
                 msg = "设备信息获取成功";
-                resultMap.put("result",pgDeviceDto);
+                code="200";
             }
         }
         catch(Exception ex)
@@ -310,8 +346,9 @@
             ex.printStackTrace();
             msg="设备状态获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgDeviceDto);
         return resultMap;
     }
 
@@ -324,17 +361,17 @@
     public Map<String,Object> getDeviceByPartition(@FormParam("partition") String partition) throws Exception{
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<PgDeviceDto>();
 
         try{
             pgDeviceDtoList=pgDeviceManager.getPgDeviceDtoListByPartition(partition);
             if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0) {
                 msg = "设备信息获取失败";
-                resultMap.put("result",null);
             }
             else {
+                code="200";
                 msg = "设备信息获取成功";
-                resultMap.put("result",pgDeviceDtoList);
             }
         }
         catch(Exception e)
@@ -342,8 +379,9 @@
             e.printStackTrace();
             msg="设备信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgDeviceDtoList);
         return resultMap;
     }
 
@@ -353,17 +391,16 @@
     public Map<String,Object> getDeviceByOldDAssetCodeCode(@FormParam("assetCode") String assetCode) throws Exception{
         Map<String, Object> resultMap = new HashMap<>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
 
         try{
             pgDeviceDtoList=pgDeviceManager.getDeviceByOldDAssetCodeCode(assetCode);
-            if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0) {
-                msg = "设备信息获取失败";;
-                resultMap.put("result",null);
-            }
+            if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0)
+                msg = "设备信息获取失败";
             else {
                 msg = "设备信息获取成功";
-                resultMap.put("result",pgDeviceDtoList);
+                code="200";
             }
         }
         catch(Exception e)
@@ -372,8 +409,9 @@
             msg="设备信息获取失败";
             resultMap.put("result",null);
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgDeviceDtoList);
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java
index 421d249..f6f167d 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java
@@ -38,17 +38,21 @@
     public Map<String, Object> getDeviceTpeyList()throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgDeviceTypeDto> pgDeviceTypeDtoList=new ArrayList<PgDeviceTypeDto>();
         try {
             pgDeviceTypeDtoList = pgDeviceTypeManager.getAllDeviceType();
             if(pgDeviceTypeDtoList.size()==0)
                 msg="没有找到设备类型信息";
-            else
-                msg="设备类型信息获取成功";
+            else {
+                code="200";
+                msg = "设备类型信息获取成功";
+            }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备类型信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgDeviceTypeDtoList);
         return resultMap;
@@ -66,6 +70,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             if (pgDeviceTypeManager.getDeviceTypeByDeType(devType)!=null) {
@@ -79,6 +84,7 @@
 
                 pgDeviceTypeManager.save(pgDeviceType);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
 
@@ -87,10 +93,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
index c276fb3..c789960 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
@@ -44,6 +44,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 
         try {
@@ -62,6 +63,7 @@
                 pgEquipment.setActive(1);
 
                 pgEquipmentManager.save(pgEquipment);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -70,9 +72,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -89,9 +91,10 @@
                                             @FormParam("ownerUnit") String ownerUnit,
                                             @FormParam("enterDate") String enterDate,
                                             @FormParam("curUser") String curUser) {
-        HashMap<String, Object> resultMap = new HashMap<String, Object>();
+        HashMap<String, Object> resultMap = new HashMap<>();
         String msg = "";
         String result = "";
+        String code="0";
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 
         try {
@@ -111,6 +114,7 @@
                 pgEquipment.setEnterDate(sdf.parse(enterDate));
 
                 pgEquipmentManager.save(pgEquipment);
+                code="200";
                 msg="编辑成功";
                 result="true";
             }
@@ -119,9 +123,9 @@
             result = "false";
             msg = "编辑失败";
         }
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
-
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -134,16 +138,19 @@
     public Map<String, Object> getEquipment(@FormParam("eqName") String eqName,
                                             @FormParam("eqCode") String eqCode,
                                             @FormParam("eqType") String eqType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        List<PgEquipmentDto> pgEquipmentDtoList=new ArrayList<PgEquipmentDto>();
+        String code="0";
+        List<PgEquipmentDto> pgEquipmentDtoList=new ArrayList<>();
 
         try{
             pgEquipmentDtoList=pgEquipmentManager.getEquipmentDtiList(eqName,eqCode,eqType);
             if(pgEquipmentDtoList==null||pgEquipmentDtoList.size()==0)
                 msg="不存在工器具记录";
-            else
-                msg="维获取成功";
+            else {
+                code = "200";
+                msg = "维获取成功";
+            }
         }
         catch(Exception e)
         {
@@ -166,6 +173,7 @@
         HashMap<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
         String result = "";
+        String code="";
 
         try {
             PgEquipment pgEquipment=pgEquipmentManager.get(Long.valueOf(id));
@@ -178,6 +186,7 @@
             {
                 pgEquipment.setActive(0);
                 pgEquipmentManager.save(pgEquipment);
+                code="200";
                 msg="删除成功";
                 result="true";
             }
@@ -186,6 +195,7 @@
             msg="设备信息获取失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -201,16 +211,19 @@
             throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=new ArrayList<PgDeviceTypeStatisticDto>();
 
         try {
             pgDeviceTypeStatisticDtoList=pgEquipmentManager.getDeviceStatisticByDevType(eqType);
 
+            code="200";
             msg = "获取成功";
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceTypeStatisticDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
index 05a9709..a90fd6c 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInNewPlanRs.java
@@ -4,9 +4,9 @@
 import com.casic.PgInterface.intelPlan.dto.PgPlanResultRe;
 import com.casic.PgInterface.intelPlan.dto.PgPlanTask;
 import com.casic.PgInterface.intelPlan.manager.PgPileAcuManager;
+import com.casic.PgInterface.reservePlan.dto.PgAcuTask;
 import com.casic.PgInterface.test.PlanData;
 import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.ModelAttribute;
 
 import javax.annotation.Resource;
 import javax.ws.rs.FormParam;
@@ -32,23 +32,25 @@
     public Map<String,Object> getPlanResult(@FormParam("planParamStr") String planParamStr){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
-        //List<PgPlanTask> pgPlanTaskList=pgPlanParams.getPgPlanTaskList();
         List<PgPlanTask> pgPlanTaskList=new PgPlanParams().getPgPlanParamsByString(planParamStr);
         List<PgPlanResultRe> pgPlanResultReList=new ArrayList<>();
 
-        try{
-                pgPlanResultReList=pgPileAcuManager.getPgPlanResultList(pgPlanTaskList);
-                if(pgPlanResultReList==null)
-                    msg="管线智能规划出错";
-                else
-                    msg="管线智能规划完成";
+        try {
+            pgPlanResultReList = pgPileAcuManager.getPgPlanResultList(pgPlanTaskList);
+            if (pgPlanResultReList == null)
+                msg = "管线智能规划出错";
+            else {
+                code="200";
+                msg = "管线智能规划完成";
+            }
         }
         catch(Exception ex){
             msg="智能规划出错";
             ex.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgPlanResultReList);
 
@@ -80,4 +82,30 @@
         return resultMap;
     }
 
+    @POST
+    @Path("getPlanTask")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getACUTask(@FormParam("pileAcuList") String pileAcuList){
+
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        String code="0";
+        List<PgAcuTask> pgAcuTaskList=new ArrayList<>();
+
+        try{
+            pgAcuTaskList=pgPileAcuManager.getACUTask(pileAcuList);
+            code="200";
+            msg="任务获取成功";
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            msg="任务获取失败";
+        }
+        resultMap.put("code",code);
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgAcuTaskList);
+
+        return resultMap;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
index ff85c61..66eec76 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
@@ -55,13 +55,13 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         try {
             PgInPgPerson pgInPgPerson = null;//pgInPgPersonManager.getPersonByUserName(userName);
             int iHostName = pgTagMacManager.getCount("select count(1) from PGTagMac where hostname = ?",assetCode);
-//            int iTagMac = pgTagMacManager.getCount("select count(1) from PGTagMac where tagmac = ?",assetCode.toUpperCase());
             if (0==iHostName)
             {
                 result = "false";
@@ -92,9 +92,8 @@
 
                 pgInPgStatusManager.save(pgInPgStatus);
 
-//                String syResult=pgInPgPersonManager.synchorizedInPgInfo(assetCode,userCode,userName,personType);
+                code="200";
                 result = "true";
-//                msg = "人员注册保存成功"+syResult;
                 msg = "人员注册保存成功";
             }
             else {
@@ -106,6 +105,7 @@
             msg = "保存失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -120,6 +120,7 @@
     public Map<String, Object> getInPgPerson() throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<>();
         try {
@@ -127,11 +128,15 @@
             if (pgInPgInfoDtoList == null || pgInPgInfoDtoList.size() == 0)
                 msg = "没有找到入廊人员信息";
             else
+            {
+                code="200";
                 msg = "入廊人员信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "入廊人员信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
         return resultMap;
@@ -146,18 +151,22 @@
     public Map<String, Object> getInPgPersonInPg() throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
 
-        List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<PgInPgInfoDto>();
+        List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<>();
         try {
             pgInPgInfoDtoList = pgInPgPersonManager.getPgInPersonList(1);
             if (pgInPgInfoDtoList == null || pgInPgInfoDtoList.size() == 0)
                 msg = "没有找到入廊人员信息";
-            else
+            else {
+                code="200";
                 msg = "入廊人员信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "入廊人员信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
         return resultMap;
@@ -172,6 +181,7 @@
     public Map<String, Object> getInPgPersonByName(@FormParam("userName") String userName) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
 
         PgInPgPerson pgInPgPerson = null;
         PgInPgPersonDto pgInPgPersonDto=null;
@@ -184,12 +194,13 @@
                 pgInPgPersonDto=new PgInPgPersonDto(pgInPgPerson);
                 pgInPgPersonDtoList.add(pgInPgPersonDto);
                 msg = "人员信息获取成功";
+                code="200";
             }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "人员信息获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgPersonDtoList);
         return resultMap;
@@ -206,6 +217,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             PgInPgPerson pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName);
@@ -221,6 +233,7 @@
                     pgInPgPersonManager.save(pgInPgPerson);
                     result = "true";
                     msg = "编辑成功";
+                    code="200";
                 }
             }
         } catch (Exception e) {
@@ -228,9 +241,9 @@
             msg = "编辑失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -244,10 +257,12 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         int inPgNum=0;
         String msg = "";
+        String code="0";
 
         try{
             inPgNum=pgInPgStatusManager.getInPgNum();
 
+            code="200";
             msg="人员入廊次数获取成功";
         }
         catch(Exception e)
@@ -255,6 +270,7 @@
             e.printStackTrace();
             msg="人员入廊次数获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",inPgNum);
 
@@ -272,18 +288,22 @@
                                                    @FormParam("statisticType") String statisticType) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
 
         List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<PgInPgInfoDto>();
         try {
             pgInPgInfoDtoList = pgInPgPersonManager.getPgInPersonListByTime(startTime, endTime, statisticType);
             if(pgInPgInfoDtoList==null)
                 msg="入廊人员统计信息获取失败";
-            else
-                msg="入廊人员统计信息获取成功";
+            else {
+                code="200";
+                msg = "入廊人员统计信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "入廊人员统计信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
         return resultMap;
@@ -296,6 +316,7 @@
 
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
         List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
 
         try {
@@ -304,8 +325,10 @@
                 pgDeviceDtoList=pgDeviceManager.getPgCameraListByPosition("",apCodeStr);
                 if(pgDeviceDtoList==null)
                     msg="不存在关联摄像机";
-                else
-                    msg="关联摄像机获取成功";
+                else {
+                    code="200";
+                    msg = "关联摄像机获取成功";
+                }
             } else {
                 msg="请输入Ap编号";
             }
@@ -315,6 +338,7 @@
             msg="关联摄像机获取成功";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgDeviceDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java
index 507b3fe..b43f077 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java
@@ -34,6 +34,7 @@
 
         String result="";
         String msg="";
+        String code="";
         try{
             PgInPgStatus pgInPgStatus=new PgInPgStatus();
 
@@ -44,6 +45,7 @@
             pgInPgStatusManager.save(pgInPgStatus);
             msg="入廊时间提交成功";
             result="true";
+            code="200";
         }
         catch (Exception e){
             e.printStackTrace();
@@ -51,6 +53,7 @@
             result="false";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -66,6 +69,7 @@
 
         String result="";
         String msg="";
+        String code="0";
         try{
             PgInPgPerson pgInPgPerson=pgInPgPersonManager.getPgInPgPersonByAssetCode(assetCode);
 
@@ -79,6 +83,7 @@
             pgInPgStatusManager.save(pgInPgStatus);
 
             msg="出廊时间提交成功";
+            code="200";
             result="true";
         }
         catch (Exception e){
@@ -87,6 +92,7 @@
             result="false";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
index 9def330..9c0ba1f 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java
@@ -33,17 +33,20 @@
                                             @FormParam("existNum") String existNum) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         String result="";
 
         try {
             pgIntelPlanManager.savePgIntelPlan(parName,lineName,maxNum,existNum);
             msg="规划数据保存成功";
+            code="200";
             result="true";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "规划数据保存失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
@@ -55,15 +58,18 @@
     public Map<String, Object> getIntelLineType() throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgIntelPlanTypeDto> pgIntelPlanTypeDtoList=new ArrayList<>();
         try {
             pgIntelPlanTypeDtoList=pgIntelPlanManager.getIntelPlanType();
+            code="200";
             msg="获取排线类型成功";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "获取排线类型失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgIntelPlanTypeDtoList);
         return resultMap;
@@ -76,6 +82,7 @@
                                             @FormParam("partitionStr") String partitionStr) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgIntelPlanDto> pgIntelPlanDtoList = new ArrayList<>();
 
@@ -83,8 +90,10 @@
             pgIntelPlanDtoList = pgIntelPlanManager.getPgIntelPlanListByPartion(lineName, partitionStr);
             if(pgIntelPlanDtoList==null||pgIntelPlanDtoList.size()==0)
                 msg="请输入正确的规划参数";
-            else
-                msg="规划数据获取成功";
+            else {
+                code="200";
+                msg = "规划数据获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "规划数据获取失败";
@@ -103,10 +112,12 @@
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
         String result="";
+        String code="0";
 
         try {
             boolean bl=pgIntelPlanManager.addLineUse(lineName,partitionStr,num);
             if(bl){
+                code="200";
                 msg="排线入廊成功";
                 result="true";
             }
@@ -119,6 +130,7 @@
             msg = "排线入廊失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
@@ -132,6 +144,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
         String result="";
+        String code="0";
 
         try {
             PgIntelPlan pgIntelPlan=pgIntelPlanManager.getPgIntelPlanByParNameAndLine(lineName,parName);
@@ -140,11 +153,13 @@
             pgIntelPlanManager.save(pgIntelPlan);
             msg="规划数据删除成功";
             result="true";
+            code="200";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "规划数据删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", result);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java b/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java
index 378af00..9c39523 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgLineHoleRs.java
@@ -1,5 +1,6 @@
 package com.casic.PgInterface.rs;
 
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
 import com.casic.PgInterface.intelPlan.domain.PgPileAcu;
 import com.casic.PgInterface.intelPlan.dto.PgLineHoleDTO;
 import com.casic.PgInterface.intelPlan.manager.PgLineHoleManager;
@@ -27,6 +28,9 @@
     @Resource
     private PgPileAcuManager pgPileAcuManager;
 
+    @Resource
+    private PgRoadManager pgRoadManager;
+
     @POST
     @Path("getPgLineAcuHole")
     @Produces(MediaType.APPLICATION_JSON)
@@ -34,23 +38,32 @@
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
         String result="";
+        String code="0";
         List<PgLineHoleDTO> pgLineHoleDTOList=new ArrayList<>();
 
         try {
             PgPileAcu pgPileAcu=pgPileAcuManager.getPgPileAcuByCode(acuCode);
             if(pgPileAcu==null){
                 msg="不存在分区";
-            }else{
-                pgLineHoleDTOList=pgLineHoleManager.getCurrentHoleByAcu(pgPileAcu.getId());
-                if(pgLineHoleDTOList!=null&&pgLineHoleDTOList.size()!=0)
-                    msg="获取成功";
-                else
-                    msg="未找到入廊数据";
+            }else {
+                pgLineHoleDTOList = pgLineHoleManager.getCurrentHoleByAcu(pgPileAcu.getId());
+                if (pgLineHoleDTOList != null && pgLineHoleDTOList.size() != 0)
+                {
+                    code="200";
+                    msg = "获取成功";
+                }
+                else {
+                    PgLineHoleDTO pgLineHoleDTO=new PgLineHoleDTO();
+                    pgLineHoleDTO.setRoad(pgRoadManager.get(pgPileAcu.getRoadId()).getRoadName());
+                    pgLineHoleDTOList.add(pgLineHoleDTO);
+                    msg = "未找到入廊数据";
+                }
             }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgLineHoleDTOList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgLogRs.java b/src/main/java/com/casic/PgInterface/rs/PgLogRs.java
index 39cff52..30db63b 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgLogRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgLogRs.java
@@ -45,6 +45,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         PgLog pgLog=new PgLog();
         try {
             PgUser pgUser = new PgUser();
@@ -60,14 +61,15 @@
             pgLogManager.save(pgLog);
             result = "true";
             msg = "保存成功";
-
+            code="200";
         } catch (Exception e) {
             result = "false";
             msg = "保存失败";
             e.printStackTrace();
         }
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
         return resultMap;
     }
 
@@ -83,17 +85,21 @@
             throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgLogDto> pgLogDtoList = new ArrayList<PgLogDto>();
         try {
             pgLogDtoList = pgLogManager.getAllLogs(userName, startTime, endTime);
             if (pgLogDtoList == null || pgLogDtoList.size() == 0)
                 msg = "没有找到日志信息";
-            else
+            else {
+                code="200";
                 msg = "日志信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "日志信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgLogDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java
index 9fd0a5f..37b72f6 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java
@@ -36,19 +36,23 @@
         Map<String,Object> resultMap=new HashMap<>();
 
         String msg = "";
+        String code="0";
         List<PgMaintainType> pgMaintainTypeList=new ArrayList<>();
         try{
             pgMaintainTypeList=pgMaintainTypeManager.getMaintainType();
             if(pgMaintainTypeList!=null&&pgMaintainTypeList.size()!=0)
                 msg="不存在运维类别";
-            else
-                msg="运维类别获取成功";
+            else {
+                code="200";
+                msg = "运维类别获取成功";
+            }
         }
         catch(Exception ex)
         {
             ex.printStackTrace();
             msg="运维类别获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgMaintainTypeList);
 
@@ -65,10 +69,11 @@
         Map<String,Object> resultMap=new HashMap<>();
 
         String msg = "";
+        String code="0";
         List<PgMaintainTypeDto> pgMaintainTypeDtoList=new ArrayList<PgMaintainTypeDto>();
         try{
             pgMaintainTypeDtoList=pgMaintainTypeManager.getMaintainTypeModel(type);
-
+            code="200";
             msg="维护类型获取成功";
         }
         catch(Exception ex)
@@ -77,9 +82,9 @@
             msg="维护类型获取失败";
         }
 
-        resultMap.put("result",pgMaintainTypeDtoList);
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
-
+        resultMap.put("result",pgMaintainTypeDtoList);
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java
index d735cc9..82ffca4 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java
@@ -33,12 +33,16 @@
                                                  @FormParam("endTime") String endTime){
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
+        String code="0";
 
         List<PgMaintanceRecordHeadDto> pgMaintanceRecordHeadDtoList=new ArrayList<>();
         try{
             pgMaintanceRecordHeadDtoList=pgMaintanceRecordHeadManager.getPgMaintanceRecordHeadLsit(repairMan,startTime,endTime);
             if(pgMaintanceRecordHeadDtoList!=null&&pgMaintanceRecordHeadDtoList.size()!=0)
+            {
+                code="200";
                 msg="维护信息获取成功";
+            }
             else
                 msg="不存在维护信息";
         }
@@ -47,6 +51,7 @@
             msg="巡检信息获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgMaintanceRecordHeadDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java
index effc9df..9f46fc8 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.java
@@ -32,12 +32,16 @@
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
         String result="";
+        String code="0";
 
         List<PgMaintanceRecordHeadStatic> pgMaintanceRecordHeadStaticList=new ArrayList<>();
         try{
             pgMaintanceRecordHeadStaticList=pgMaintanceRecordHeadManager.getPgMaintanceRecordHeadStaticLisByTime(startTime,endTime,staticType);
             if(pgMaintanceRecordHeadStaticList!=null&&pgMaintanceRecordHeadStaticList.size()!=0)
+            {
+                code="200";
                 msg="维护统计信息获取成功";
+            }
             else
                 msg="维护统计失败";
         }
@@ -46,7 +50,7 @@
             ex.printStackTrace();
             msg="统计失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgMaintanceRecordHeadStaticList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java b/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java
index 3a67bf3..6a5f4dc 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java
@@ -39,27 +39,31 @@
     @Path("getO2InfoByDevAndDate")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getO2InfoByDevAndDate(@FormParam("assetCode") String assetCode,
-                                                      @FormParam("startDate") String startDate,
-                                                      @FormParam("endDate") String endDate)throws Exception {
+                                                     @FormParam("startDate") String startDate,
+                                                     @FormParam("endDate") String endDate)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgHistoryDataDto> pgHistoryDataDtoList=new ArrayList<>();
 
         try {
             PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
                 msg="设备不存在";
-            else{
-                pgHistoryDataDtoList=pgO2Manager.getAllO2Data(pgDevice, startDate, endDate);
-                if(pgHistoryDataDtoList==null)
-                    msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+            else {
+                pgHistoryDataDtoList = pgO2Manager.getAllO2Data(pgDevice, startDate, endDate);
+                if (pgHistoryDataDtoList == null)
+                    msg = "没有满足要求的数据";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgHistoryDataDtoList);
         return resultMap;
@@ -75,23 +79,27 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         PgO2Dto pgO2Dto=new PgO2Dto(null);
 
         try {
             PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
                 msg="设备不存在";
-            else{
-                pgO2Dto=pgO2Manager.getNewestO2Data(pgDevice);
-                if(pgO2Dto==null)
-                    msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+            else {
+                pgO2Dto = pgO2Manager.getNewestO2Data(pgDevice);
+                if (pgO2Dto == null)
+                    msg = "没有满足要求的数据";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgO2Dto);
         return resultMap;
@@ -104,11 +112,12 @@
     @Path("addO2Data")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> addO2Data(@FormParam("devCode") String devCode,
-                                          @FormParam("upTime") String upTime,
-                                          @FormParam("o2") String o2)throws Exception {
+                                         @FormParam("upTime") String upTime,
+                                         @FormParam("o2") String o2)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
@@ -125,6 +134,7 @@
                 pgO2.setPgDeviceId(pgDevice);
 
                 pgO2Manager.save(pgO2);
+                code="200";
                 result = "true";
                 msg = "保存成功";
             }
@@ -133,9 +143,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java b/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java
index 6217cde..70b3b41 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java
@@ -30,8 +30,6 @@
 public class PgOverViewRs {
 
     @Resource
-    private PgInPgPersonManager pgInPgPersonManager;
-    @Resource
     private PgInPgStatusManager pgInPgStatusManager;
     @Resource
     private PgAlarmManager pgAlarmManager;
@@ -46,18 +44,21 @@
     @Path("getPersonNumInPgByMonth")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<Object, String> getMonthInPgPersonNum() throws Exception {
-        Map<Object, String> resultMap = new HashMap<Object, String>();
+        Map<Object, String> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         int inNum = 0;
 
         try {
             inNum = pgInPgStatusManager.getMonthInPgPersonNum();
+            code="200";
             msg = "本月入廊人员次数获取成功";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "本月入廊人员次数获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", String.valueOf(inNum));
 
@@ -73,15 +74,18 @@
     public Map<Object, String> getWeekInPgPersonNum() throws Exception {
         Map<Object, String> resultMap = new HashMap<Object, String>();
         String msg = "";
+        String code="0";
         int inNum = 0;
         try {
             inNum = pgInPgStatusManager.getWeekInPgPersonNum();
+            code="200";
             msg = "本周入廊人员次数获取成功";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "本周入廊人员次数获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", String.valueOf(inNum));
 
@@ -97,19 +101,22 @@
     public Map<String, Object> getDayInPgStatistic() throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<>();
         try {
             pgInPgInfoDtoList = pgInPgStatusManager.getPgInPersonListByDay();
             if (pgInPgInfoDtoList == null)
                 msg = "信息获取失败";
-            else
+            else {
+                code="200";
                 msg = "信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "信息获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
         return resultMap;
@@ -124,18 +131,23 @@
     public Map<String, Object> getTodayInPgInfo() throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
 
         List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<PgInPgInfoDto>();
         try {
             pgInPgInfoDtoList = pgInPgStatusManager.getTodayInPgInfo();
             if(pgInPgInfoDtoList!=null||pgInPgInfoDtoList.size()!=0)
+            {
+                code="200";
                 msg = "信息获取成功";
+            }
             else
                 msg="当天没有入廊人员信息";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgInPgInfoDtoList);
 
@@ -149,18 +161,22 @@
     public Map<String, Object> getAlarmNum(@FormParam("isDevFault") String isDevFault) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         int num = 0;
 
         try {
             if(isDevFault!=null){
                 num = pgAlarmManager.getAlarmNum(isDevFault);
-                msg = "报警数量获取成功";}
+                msg = "报警数量获取成功";
+                code="200";
+            }
             else
                 msg="请输入统计参数";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警数量统计失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", num);
 
@@ -176,16 +192,18 @@
     public Map<Object, String> getMonthAlarmNum(@FormParam("isDevFault") String isDevFault) throws Exception {
         Map<Object, String> resultMap = new HashMap<Object, String>();
         String msg = "";
+        String code="0";
         int inNum = 0;
 
         try {
-                inNum = pgAlarmManager.getMonthAlarmNum(isDevFault);
-                msg = "报警次数获取成功";
+            inNum = pgAlarmManager.getMonthAlarmNum(isDevFault);
+            code="200";
+            msg = "报警次数获取成功";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警次数获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", String.valueOf(inNum));
 
@@ -201,15 +219,17 @@
     public Map<Object, String> getWeekAlarmNum(@FormParam("isDevFault") String isDevFault) throws Exception {
         Map<Object, String> resultMap = new HashMap<Object, String>();
         String msg = "";
+        String code="0";
         int inNum = 0;
         try {
             inNum = pgAlarmManager.getWeekAlarmNum(isDevFault);
+            code="200";
             msg = "报警次数获取成功";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "报警次数获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", String.valueOf(inNum));
 
@@ -225,14 +245,17 @@
     public Map<String, Object> getDayAlarmStatistic() throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
 
         List<PgAlarmTjDto> pgAlarmTjDtoList = new ArrayList<PgAlarmTjDto>();
         try {
             pgAlarmTjDtoList = pgAlarmManager.getDayAlarmStatistic();
             if (pgAlarmTjDtoList == null)
                 msg = "信息获取失败";
-            else
+            else {
+                code="200";
                 msg = "信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "信息获取失败";
@@ -252,9 +275,11 @@
     public Map<String, Object> getAlarmList(@FormParam("isDevFault") String isDevFault) throws Exception{
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         List<PgAlarmDto> pgAlarmDtoList=new ArrayList<>();
         try{
             pgAlarmDtoList=pgAlarmManager.getAlarmList(isDevFault);
+            code="200";
             msg="信息获取成功";
         }
         catch(Exception e)
@@ -262,6 +287,7 @@
             e.printStackTrace();
             msg="信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgAlarmDtoList);
 
@@ -278,17 +304,19 @@
     public Map<String,Object> getConstructionNum() throws Exception{
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgConstructionTypeNumStatisticDto> pgConstructionTypeNumDtoList=new ArrayList<PgConstructionTypeNumStatisticDto>();
         try{
             pgConstructionTypeNumDtoList=pgConstructionManager.getConstructionNum();
             msg="施工数量获取成功";
+            code="200";
         }
         catch(Exception e)
         {
             e.printStackTrace();
             msg="施工数量统计";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionTypeNumDtoList);
 
@@ -302,21 +330,25 @@
     @Path("getConstructionToday")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> getConstructionToday() throws Exception{
-        Map<String,Object > resultMap = new HashMap<String,Object>();
+        Map<String,Object > resultMap = new HashMap<>();
         String msg = "";
-        List<PgConstructionDto> pgConstructionDtoList=new ArrayList<PgConstructionDto>();
+        String code="0";
+        List<PgConstructionDto> pgConstructionDtoList=new ArrayList<>();
         try {
             pgConstructionDtoList = pgConstructionManager.getConstructionToday();
-            if (pgConstructionDtoList == null&&pgConstructionDtoList.size()==0)
+            if (pgConstructionDtoList == null && pgConstructionDtoList.size() == 0)
                 msg = "不存在施工信息";
-            else
+            else {
+                code="200";
                 msg = "施工信息获取成功";
+            }
         }
         catch(Exception e)
         {
             e.printStackTrace();
             msg="施工信息获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgConstructionDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java b/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java
index d3c10d4..31ffcfc 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java
@@ -48,6 +48,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 
         try {
@@ -66,9 +67,9 @@
                 pgPartition.setMaterial(material);
                 pgPartition.setActive(1);
 
-                logger.info("成功保存");
                 pgPartitionManager.save(pgPartition);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
         } catch (Exception e) {
@@ -76,9 +77,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
         return resultMap;
     }
     /*
@@ -100,6 +101,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         PgPartition partition = new PgPartition();
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
@@ -122,6 +124,7 @@
 
                 pgPartitionManager.save(pgPartition);
                 result = "true";
+                code="200";
                 msg = "编辑成功";
             }
 
@@ -131,8 +134,10 @@
             e.printStackTrace();
         }
 
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
+
         return resultMap;
     }
 
@@ -147,7 +152,8 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
-        String result="false";
+        String result="";
+        String code="0";
 
         try {
             PgPartition pgPartition=pgPartitionManager.get(Long.valueOf(id));
@@ -161,12 +167,14 @@
                 pgPartitionManager.save(pgPartition);
                 msg="分区删除成功";
                 result="true";
+                code="200";
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="分区删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -181,14 +189,17 @@
     public Map<String, Object> getPartition() throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgPartitionDto> pgPartitionDtoList = new ArrayList<PgPartitionDto>();
         try {
             pgPartitionDtoList = pgPartitionManager.getPgPartitionDtoList();
+            code="200";
             msg = "获取成功";
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgPartitionDtoList);
         return resultMap;
@@ -203,14 +214,17 @@
     public Map<String, Object> getPartitionListByName(@FormParam("parName") String parName) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgPartitionDto> pgPartitionDtoList = new ArrayList<PgPartitionDto>();
         try {
             pgPartitionDtoList = pgPartitionManager.getPartitionByName(parName);
+            code="200";
             msg = "获取成功";
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgPartitionDtoList);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java b/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java
index 883adf9..cf81b72 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgPileAcuRs.java
@@ -37,6 +37,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
         PgRoad pgRoad=pgRoadManager.getPgRoadByName(road);
         try {
             PgPileAcu pgPileAcu=new PgPileAcu();
@@ -49,6 +50,7 @@
             pgPileAcu.setActive(true);
 
             pgPileAcuManager.save(pgPileAcu);
+            code="200";
             result="true";
             msg="保存成功";
         } catch (Exception e) {
@@ -56,9 +58,10 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
+
         return resultMap;
     }
 
@@ -73,6 +76,7 @@
 
         String result="";
         String msg="";
+        String code="0";
         try{
             PgPileAcu pgPileAcu=pgPileAcuManager.get(id);
             if(pgPileAcu==null){
@@ -83,7 +87,7 @@
             {
                 pgPileAcu.setActive(false);
                 pgPileAcuManager.save(pgPileAcu);
-
+                code="200";
                 result="true";
                 msg="桩号删除成功";
             }
@@ -94,8 +98,9 @@
             ex.printStackTrace();
         }
 
-        resultMap.put("result",result);
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
+        resultMap.put("result",result);
 
         return resultMap;
     }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPileRs.java b/src/main/java/com/casic/PgInterface/rs/PgPileRs.java
index cf62954..c9999ac 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgPileRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgPileRs.java
@@ -33,6 +33,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             PgPile pgPile=new PgPile();
@@ -40,6 +41,7 @@
             pgPile.setActive(true);
 
             pgPileManager.save(pgPile);
+            code="200";
             result="true";
             msg="保存成功";
         } catch (Exception e) {
@@ -47,9 +49,10 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
+
         return resultMap;
     }
 
@@ -64,9 +67,10 @@
         Map<String,Object> resultMap=new HashMap<>();
         List<PgPileDTO> pgPileDTOList=new ArrayList<>();
         String msg="";
+        String code="0";
         try{
             pgPileDTOList=pgPileManager.getPgPileDTOList();
-
+            code="200";
             msg="获取成功";
         }
         catch(Exception ex){
@@ -74,8 +78,9 @@
             msg="获取成失败";
             ex.printStackTrace();
         }
-        resultMap.put("result",pgPileDTOList);
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
+        resultMap.put("result",pgPileDTOList);
 
         return resultMap;
     }
@@ -91,6 +96,7 @@
 
         String result="";
         String msg="";
+        String code="0";
         try{
             PgPile pgPile=pgPileManager.get(id);
             if(pgPile==null){
@@ -101,7 +107,7 @@
             {
                 pgPile.setActive(false);
                 pgPileManager.save(pgPile);
-
+                code="200";
                 result="true";
                 msg="桩号删除成功";
             }
@@ -111,9 +117,9 @@
             msg="桩号删除失败";
             ex.printStackTrace();
         }
-
-        resultMap.put("result",result);
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
+        resultMap.put("result",result);
 
         return resultMap;
     }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
index 6ee63ff..63b5597 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
@@ -53,10 +53,12 @@
         try {
                resultMap = pgPipeLineManager.addPipeLine(lineCode,lineType,secRow,secColumn,pileAcuList);
                resultMap.put("msg","提交成功");
+               resultMap.put("code","200");
                resultMap.put("result","true");
 
         } catch (Exception e) {
             e.printStackTrace();
+            resultMap.put("code","0");
             resultMap.put("result","false");
             resultMap.put("msg","提交失败");
             return  resultMap;
@@ -74,14 +76,17 @@
     public Map<String, Object> getPipeLineByLineType(@FormParam("lineType") String lineType) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgPipeLineDto> pgPipeLineDtoList=new ArrayList<PgPipeLineDto>();
         try {
             pgPipeLineDtoList = pgPipeLineManager.getPipeLineByLineType(lineType);
+            code="200";
             msg = "获取成功";
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgPipeLineDtoList);
         return resultMap;
@@ -96,6 +101,7 @@
     public Map<String, Object> getPipeLineByName(@FormParam("lineCode") String lineCode) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         PgPipeLineDto pgPipeLineDto=null;
         try {
             PgPipeLine pgPipeLine = pgPipeLineManager.getPipeLineBylineName(lineCode);
@@ -103,12 +109,14 @@
                 msg="不存在："+lineCode;
             else {
                 pgPipeLineDto = new PgPipeLineDto(pgPipeLine);
+                code="200";
                 msg = "获取成功";
             }
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgPipeLineDto);
         return resultMap;
@@ -123,15 +131,18 @@
     public Map<String,Object> getPipeLengthStatic()throws Exception{
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
+        String code="0";
         List<PgPipeLineLengthStatic> pgPipeLineLengthStaticList=new ArrayList<PgPipeLineLengthStatic>();
         try {
             pgPipeLineLengthStaticList = pgPipeLineManager.getPipeLengthByName();
+            code="200";
             msg="管线长度获取成功";
         }catch(Exception e)
         {
             e.printStackTrace();
             msg="管线长度统计失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgPipeLineLengthStaticList);
 
@@ -147,14 +158,17 @@
     public Map<String, Object> getPipeLineType() throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgPipeLineTypeDto> pgPipeLineTypeDtoList=new ArrayList<PgPipeLineTypeDto>();
         try {
             pgPipeLineTypeDtoList = pgPipeLineManager.getPipeType();
+            code="200";
             msg = "获取成功";
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgPipeLineTypeDtoList);
         return resultMap;
@@ -170,20 +184,24 @@
         Map<String,Object> resultMap=new HashMap<String, Object>();
 
         String msg="";
+        String code="0";
         List<PgPipeLineTypeNumDto> pgPipeLineTypeNumDtoList=new ArrayList<PgPipeLineTypeNumDto>();
 
-        try{
-            pgPipeLineTypeNumDtoList=pgPipeLineManager.getPipeTypeNum();
+        try {
+            pgPipeLineTypeNumDtoList = pgPipeLineManager.getPipeTypeNum();
 
-            if(pgPipeLineTypeNumDtoList==null)
-                msg="不存在管线类型占比";
-            else
-                msg="管线占比获取成功";
+            if (pgPipeLineTypeNumDtoList == null)
+                msg = "不存在管线类型占比";
+            else {
+                code="200";
+                msg = "管线占比获取成功";
+            }
         }
         catch (Exception e){
             msg="管线占比数量获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgPipeLineTypeNumDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java
index 672b376..7042994 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java
@@ -43,17 +43,21 @@
     public Map<String,Object> getReservePlan() {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgReservePlanDto> pgReservePlanDtoList = new ArrayList<PgReservePlanDto>();
         try {
             pgReservePlanDtoList = pgReservePlanManager.getPgReservePlanDto();
             if (pgReservePlanDtoList == null)
                 msg = "不存在预案信息";
-            else
+            else {
+                code="200";
                 msg = "预案信息获取成功";
-        } catch (Exception e) {
+            }
+        }catch (Exception e) {
             e.printStackTrace();
             msg = "预案信息获取是失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgReservePlanDtoList);
         return resultMap;
@@ -66,6 +70,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
 
         String msg = "";
+        String code="0";
         ResponseEntity<byte[]> path = null;
         try {
             PgReservePlan pgReservePlan = pgReservePlanManager.get(Long.valueOf(id));
@@ -73,15 +78,17 @@
 
             if (path == null)
                 msg = "不存在该文档";
-            else
+            else {
+                code="200";
                 msg = "下载成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "下载失败";
         }
-
-        resultMap.put("result", path.getBody());
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", path.getBody());
         return resultMap;
     }
     /*
@@ -99,6 +106,7 @@
         Map<String,Object> resultMap=new HashMap<String, Object>();
         String msg="";
         String result="";
+        String code="0";
 
         try {
             PgReservePlan pgReservePlan = new PgReservePlan();
@@ -124,6 +132,7 @@
                 pgReservePlanManager.save(pgReservePlan);
                 msg = "新增成功";
                 result = "true";
+                code="200";
             }
         }
         catch(Exception e)
@@ -133,6 +142,7 @@
             result="false";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -152,6 +162,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             PgReservePlan pgReservePlan=pgReservePlanManager.get(Long.valueOf(id));
@@ -177,6 +188,7 @@
 
                     pgReservePlanManager.save(pgReservePlan);
 
+                    code="200";
                     result = "true";
                     msg = "编辑成功";
                 }
@@ -187,6 +199,7 @@
             msg = "编辑失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -201,6 +214,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
         String result="";
+        String code="0";
 
         try{
 
@@ -214,6 +228,7 @@
                 pgReservePlan.setActive(0);;
                 pgReservePlanManager.save(pgReservePlan);
                 result="true";
+                code="200";
                 msg="删除成功";
             }
         }
@@ -224,6 +239,7 @@
             result="false";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java b/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java
index 8f049c8..3c48a8d 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java
@@ -42,19 +42,22 @@
         Map<String,Object> resultMap=new HashMap<String, Object>();
 
         String msg="";
+        String code="0";
         List<PgRoadDto> pgRoadDtoList=new ArrayList<PgRoadDto>();
-        try{
+        try {
             pgRoadDtoList = pgRoadManager.getAllRoad();
             if (pgRoadDtoList.size() == 0)
                 msg = "没有道路信息";
-            else
+            else {
+                code="200";
                 msg = "道路信息获取成功";
+            }
         }
         catch(Exception e){
             msg="道路信息获取失败";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgRoadDtoList);
 
@@ -71,6 +74,7 @@
         Map<String,Object> resultMap=new HashMap<String, Object>();
         String msg="";
         String result="";
+        String code="0";
 
         try{
             PgRoad pgRoad=new PgRoad();
@@ -78,7 +82,7 @@
             pgRoad.setActive(1);
 
             pgRoadManager.save(pgRoad);
-
+            code="200";
             msg="新增道路成功";
             result="true";
         }
@@ -87,7 +91,7 @@
             result="true";
             e.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -107,6 +111,7 @@
 
         String msg="";
         String result="";
+        String code="0";
 
         try {
             PgRoad pgRoad=pgRoadManager.get(Long.valueOf(id));
@@ -123,6 +128,7 @@
                 pgRoadManager.save(pgRoad);
                 msg="道路信息保存成功";
                 result="true";
+                code="200";
             }
         }
         catch(Exception e){
@@ -130,6 +136,7 @@
             result="false";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -147,6 +154,7 @@
 
         String msg="";
         String result="";
+        String code="0";
         PgRoad pgRoad=null;
 
         try{
@@ -159,6 +167,7 @@
                 pgRoad.setActive(0);
                 pgRoadManager.save(pgRoad);
                 msg="道路删除成功";
+                code="200";
                 result="true";
             }
         }
@@ -168,6 +177,7 @@
             e.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -184,26 +194,29 @@
         Map<String,Object> resultMap=new HashMap<String, Object>();
         String msg="";
         String result="";
+        String code="0";
 
         List<PgPartitionDto> pgPartitionDtoList=null;
         try{
             PgRoad pgRoad=pgRoadManager.getPgRoadByName(roadName);
             if(pgRoad==null)
                 msg="不存在道路信息";
-            else
-            {
-                pgPartitionDtoList=pgPartitionManager.getPgPartitonDtoByRoad(pgRoad);
-                if(pgPartitionDtoList==null||pgPartitionDtoList.size()==0)
-                    msg="该道路没有分区信息";
-                else
-                    msg="分区信息获取成功";
+            else {
+                pgPartitionDtoList = pgPartitionManager.getPgPartitonDtoByRoad(pgRoad);
+                if (pgPartitionDtoList == null || pgPartitionDtoList.size() == 0)
+                    msg = "该道路没有分区信息";
+                else {
+                    code="200";
+                    msg = "分区信息获取成功";
+                }
             }
         }
         catch (Exception e)
         {
+            e.printStackTrace();
             msg="分区信息获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgPartitionDtoList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java b/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java
index 90d709a..7a713bf 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java
@@ -42,17 +42,21 @@
     public Map<String,Object> getRoleList() {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgRoleDto> pgRoleDtoList = new ArrayList<PgRoleDto>();
         try {
             pgRoleDtoList = pgRoleManager.getPgRoleDtoList();
             if (pgRoleDtoList == null)
                 msg = "不存在角色信息";
-            else
+            else {
+                code="200";
                 msg = "角色信息获取成功";
+            }
         } catch (Exception e) {
             e.printStackTrace();
             msg = "角色信息获取是失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgRoleDtoList);
         return resultMap;
@@ -69,6 +73,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try{
             PgAuthority pgAuthority=pgAuthorityManager.getAuthorityByAuthority(authority);
@@ -79,6 +84,7 @@
 
             pgRoleManager.save(pgRole);
             msg="用户角色保存成功";
+            code="200";
             result="true";
         }
         catch(Exception e) {
@@ -86,6 +92,7 @@
             msg = "新增角色失败";
             result = "false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -104,6 +111,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         try {
             PgRole pgRole = pgRoleManager.get(Long.valueOf(id));
 
@@ -112,6 +120,7 @@
             pgRole.setPgAuthorityId(pgAuthority);
             pgRoleManager.save(pgRole);
 
+            code="200";
             msg="角色保存成功";
             result="true";
         }
@@ -122,6 +131,7 @@
             result="false";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -138,7 +148,8 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
-        String result="false";
+        String result="";
+        String code="0";
 
         try {
             PgRole pgRole= pgRoleManager.get(Long.valueOf(id));
@@ -152,12 +163,14 @@
                 pgRoleManager.save(pgRole);
                 msg="删除角色成功";
                 result="true";
+                code="200";
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="删除角色失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
diff --git a/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java b/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java
index 0e413b8..d146811 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgSectionRs.java
@@ -38,6 +38,7 @@
         Map<String,Object> resultMap=new HashMap<>();
         String msg="";
         String result="";
+        String code="0";
         PgRoad pgRoad=pgRoadManager.getPgRoadByName(road);
 
         try{
@@ -55,13 +56,14 @@
             pgSectionManager.save(pgSection);
             msg="截面信息保存成功";
             result="true";
+            code="200";
         }
         catch(Exception ex){
             msg="界面信息保存失败";
             result="false";
             ex.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -77,6 +79,7 @@
 
         String msg="";
         String result="";
+        String code="0";
 
         try{
             PgSection pgSection=pgSectionManager.get(id);
@@ -84,6 +87,7 @@
             pgSection.setActive(false);
             pgSectionManager.save(pgSection);
 
+            code="200";
             msg="截面删除成功";
             result="true";
         }
@@ -92,7 +96,7 @@
             result="false";
             ex.printStackTrace();
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
@@ -107,16 +111,19 @@
         Map<String,Object> resultMap=new HashMap<>();
         List<PgLineType> pgLineTypeList=new ArrayList<>();
         String msg="";
+        String code="0";
 
         try{
             pgLineTypeList=pgSectionManager.getLineType();
             msg="获取成功";
+            code="200";
         }
         catch(Exception ex){
             ex.printStackTrace();
             msg="获取失败";
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgLineTypeList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgShRs.java b/src/main/java/com/casic/PgInterface/rs/PgShRs.java
index 1e35f4b..323c82f 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgShRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgShRs.java
@@ -45,23 +45,27 @@
                                                      @FormParam("endDate") String endDate)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgHistoryDataDto> pgHistoryDataDtoList=new ArrayList<>();
 
         try {
             PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
                 msg="设备不存在";
-            else{
-                pgHistoryDataDtoList=pgShManager.getAllShData(pgDevice, startDate, endDate);
-                if(pgHistoryDataDtoList==null)
-                    msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+            else {
+                pgHistoryDataDtoList = pgShManager.getAllShData(pgDevice, startDate, endDate);
+                if (pgHistoryDataDtoList == null)
+                    msg = "没有满足要求的数据";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgHistoryDataDtoList);
         return resultMap;
@@ -77,23 +81,27 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         PgShDto pgShDto=new PgShDto(null);
 
         try {
             PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
                 msg="设备不存在";
-            else{
-                pgShDto=pgShManager.getNewestShData(pgDevice);
-                if(pgShDto==null)
-                    msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+            else {
+                pgShDto = pgShManager.getNewestShData(pgDevice);
+                if (pgShDto == null)
+                    msg = "没有满足要求的数据";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgShDto);
         return resultMap;
@@ -111,6 +119,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
@@ -128,6 +137,7 @@
 
                 pgShManager.save(pgSh);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
         } catch (Exception e) {
@@ -135,9 +145,9 @@
             msg = "保存失败";
             e.printStackTrace();
         }
-
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java b/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java
index a23b2da..76023a9 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java
@@ -43,23 +43,27 @@
                                                       @FormParam("endDate") String endDate)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgHistoryTempDto> pgHistoryTempDtoList=new ArrayList<>();
 
         try {
             PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
                 msg="设备不存在";
-            else{
-                pgHistoryTempDtoList=pgTempHumManager.getAllTempHumData(pgDevice, startDate, endDate);
-                if(pgHistoryTempDtoList==null)
-                    msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+            else {
+                pgHistoryTempDtoList = pgTempHumManager.getAllTempHumData(pgDevice, startDate, endDate);
+                if (pgHistoryTempDtoList == null)
+                    msg = "没有满足要求的数据";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgHistoryTempDtoList);
         return resultMap;
@@ -75,23 +79,27 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         PgTempHumDto pgTempHumDto=new PgTempHumDto(null);
 
         try {
             PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
             if(pgDevice==null)
                 msg="设备不存在";
-            else{
-                pgTempHumDto=pgTempHumManager.getNewestTempHumData(pgDevice);
-                if(pgTempHumDto==null)
-                    msg="没有满足要求的数据";
-                else
-                    msg="数据获取成功";
+            else {
+                pgTempHumDto = pgTempHumManager.getNewestTempHumData(pgDevice);
+                if (pgTempHumDto == null)
+                    msg = "没有满足要求的数据";
+                else {
+                    code="200";
+                    msg = "数据获取成功";
+                }
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="设备监测数据获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgTempHumDto);
         return resultMap;
@@ -110,6 +118,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         try {
@@ -127,6 +136,7 @@
 
                 pgTempHumManager.save(pgTempHum);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
         } catch (Exception e) {
@@ -135,8 +145,10 @@
             e.printStackTrace();
         }
 
-        resultMap.put("result", result);
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
+        resultMap.put("result", result);
+
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgUserRs.java b/src/main/java/com/casic/PgInterface/rs/PgUserRs.java
index 73895f5..ff814a1 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgUserRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgUserRs.java
@@ -42,17 +42,21 @@
     public Map<String, Object> getUserList()throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
+        String code="0";
         List<PgUserDto> pgUserDtoList=new ArrayList<PgUserDto>();
         try {
             pgUserDtoList = pgUserManager.getAllUser();
             if(pgUserDtoList.size()==0)
                 msg="没有找到人员信息";
-            else
-                msg="获取成功";
+            else {
+                code="200";
+                msg = "获取成功";
+            }
         }catch(Exception e){
             e.printStackTrace();
             msg="获取失败";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pgUserDtoList);
         return resultMap;
@@ -74,6 +78,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
 
         try {
             PgRole pgRole=pgRoleManager.getPgRoleByRole(role);
@@ -94,10 +99,10 @@
                 else
                     pgUser.setRoleId(pgRole.getId());
                 pgUser.setActive(1);
-                logger.info("成功保存");
 
                 pgUserManager.save(pgUser);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
         } catch (Exception e) {
@@ -106,6 +111,7 @@
             e.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -129,6 +135,7 @@
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
+        String code="0";
         try {
 
             PgRole pgRole=pgRoleManager.getPgRoleByRole(role);
@@ -145,8 +152,8 @@
                 pgUser.setRoleId(pgRole.getId());
             pgUserManager.save(pgUser);
             result = "true";
+            code="200";
             msg = "编辑成功";
-            //}
         } catch (Exception e) {
             result = "false";
             msg = "编辑失败";
@@ -166,9 +173,10 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> deleteUser(@FormParam("id") String id)throws Exception {
 
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg="";
-        String result="false";
+        String result="";
+        String code="0";
 
         try {
             PgUser pgUser= pgUserManager.get(Long.valueOf(id));
@@ -180,6 +188,7 @@
             {
                 pgUser.setActive(0);
                 pgUserManager.save(pgUser);
+                code="200";
                 msg="删除人员成功";
                 result="true";
             }
@@ -188,6 +197,7 @@
             msg="删除人员失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -204,13 +214,14 @@
         Map<String,Object> resultMap=new HashMap<String, Object>();
         String msg="";
         String result="";
-
+        String code="0";
         try{
             PgUserDto pgUserDto=pgUserManager.signIn(userName,passWord);
 
             if(pgUserDto==null)
                 msg="false";
             else {
+                code="200";
                 msg="true";
                 result=pgUserDto.getRole();
             }
@@ -220,6 +231,7 @@
             e.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java b/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java
index 71ad0ae..3998c67 100644
--- a/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java
@@ -45,6 +45,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
         PipeGallery pipeGallery = new PipeGallery();
         try {
 
@@ -58,6 +59,7 @@
                 logger.info("成功保存");
                 pipeGalleryManager.save(pipeGallery);
                 result = "true";
+                code="200";
                 msg = "保存成功";
             }
 
@@ -67,6 +69,7 @@
             e.printStackTrace();
         }
 
+        resultMap.put("code",code);
         resultMap.put("result", result);
         resultMap.put("msg", msg);
         return resultMap;
@@ -85,6 +88,7 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
+        String code="0";
 
         PipeGallery pipeGallery=new PipeGallery();
         try {
@@ -97,12 +101,14 @@
 
             pipeGalleryManager.save(pipeGallery);
             result = "true";
+            code="200";
             msg = "编辑成功";
         } catch (Exception e) {
             result = "false";
             msg = "编辑失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("result",result);
         resultMap.put("msg",msg);
         return resultMap;
@@ -118,7 +124,8 @@
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg="";
-        String result="false";
+        String result="";
+        String code="0";
 
         try {
             PipeGallery pipeGallery=pipeGalleryManager.get(Long.valueOf(id));
@@ -132,12 +139,14 @@
                 pipeGalleryManager.save(pipeGallery);
                 msg="管廊删除成功";
                 result="true";
+                code="200";
             }
         }catch(Exception e){
             e.printStackTrace();
             msg="管廊删除失败";
             result="false";
         }
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",result);
         return resultMap;
@@ -151,13 +160,15 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String,Object> getPgLengthStatic()
     {
-        Map<String,Object> resultMap=new HashMap<String, Object>();
+        Map<String,Object> resultMap=new HashMap<>();
         List<PipeGalleryStatic> pipeGalleryStaticList=new ArrayList<PipeGalleryStatic>();
         String msg="";
+        String code="0";
 
         try{
             pipeGalleryStaticList=pipeGalleryManager.getPgLengthByName();
 
+            code="200";
             msg="仓体长度获取成功";
         }
         catch(Exception e)
@@ -165,7 +176,7 @@
             e.printStackTrace();
             msg="仓体长度获取失败";
         }
-
+        resultMap.put("code",code);
         resultMap.put("msg",msg);
         resultMap.put("result",pipeGalleryStaticList);
 
diff --git a/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java b/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java
index 5c95409..0ce205f 100644
--- a/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java
@@ -43,14 +43,12 @@
 
         try {
 
-
             msg = "获取成功";
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
         resultMap.put("msg", msg);
-        //resultMap.put("result", );
         return resultMap;
     }
     /*
@@ -88,16 +86,18 @@
             throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
+        String code="0";
         List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=new ArrayList<PgDeviceTypeStatisticDto>();
 
         try {
             pgDeviceTypeStatisticDtoList=pgDeviceManager.getDeviceStatisticByDevType();
-
+            code="200";
             msg = "获取成功";
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
+        resultMap.put("code",code);
         resultMap.put("msg", msg);
         resultMap.put("result", pgDeviceTypeStatisticDtoList);
         return resultMap;
diff --git "a/~$\350\257\264\346\230\21620191207.docx" "b/~$\350\257\264\346\230\21620191207.docx"
new file mode 100644
index 0000000..d6477af
--- /dev/null
+++ "b/~$\350\257\264\346\230\21620191207.docx"
Binary files differ
diff --git "a/\346\216\245\345\217\243\350\257\264\346\230\21620191207.docx" "b/\346\216\245\345\217\243\350\257\264\346\230\21620191207.docx"
index 81b60ae..d3b233d 100644
--- "a/\346\216\245\345\217\243\350\257\264\346\230\21620191207.docx"
+++ "b/\346\216\245\345\217\243\350\257\264\346\230\21620191207.docx"
Binary files differ